Merge f68415f into 0c896f1

kfsoftware · Mar 8, 2023 · 7fd025a · 7fd025a
2 parents 0c896f1 + f68415f
commit 7fd025a
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 2 deletions.
diff --git a/chart/hlf-operator/Chart.yaml b/chart/hlf-operator/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.8.4
+version: 1.9.0-beta3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/chart/hlf-operator/templates/crds/hlf.kungfusoftware.es_fabricorderernodes.yaml b/chart/hlf-operator/templates/crds/hlf.kungfusoftware.es_fabricorderernodes.yaml
@@ -1267,6 +1267,20 @@ spec:
                           enrollsecret:
                             minLength: 1
                             type: string
+                          external:
+                            nullable: true
+                            properties:
+                              certificateKey:
+                                type: string
+                              privateKeyKey:
+                                type: string
+                              secretName:
+                                type: string
+                            required:
+                            - certificateKey
+                            - privateKeyKey
+                            - secretName
+                            type: object
                         required:
                         - cahost
                         - caname

diff --git a/chart/hlf-operator/templates/crds/hlf.kungfusoftware.es_fabricorderingservices.yaml b/chart/hlf-operator/templates/crds/hlf.kungfusoftware.es_fabricorderingservices.yaml
@@ -70,6 +70,20 @@ spec:
                       enrollsecret:
                         minLength: 1
                         type: string
+                      external:
+                        nullable: true
+                        properties:
+                          certificateKey:
+                            type: string
+                          privateKeyKey:
+                            type: string
+                          secretName:
+                            type: string
+                        required:
+                        - certificateKey
+                        - privateKeyKey
+                        - secretName
+                        type: object
                     required:
                     - cahost
                     - caname

diff --git a/chart/hlf-operator/templates/crds/hlf.kungfusoftware.es_fabricpeers.yaml b/chart/hlf-operator/templates/crds/hlf.kungfusoftware.es_fabricpeers.yaml
@@ -1528,6 +1528,20 @@ spec:
                           enrollsecret:
                             minLength: 1
                             type: string
+                          external:
+                            nullable: true
+                            properties:
+                              certificateKey:
+                                type: string
+                              privateKeyKey:
+                                type: string
+                              secretName:
+                                type: string
+                            required:
+                            - certificateKey
+                            - privateKeyKey
+                            - secretName
+                            type: object
                         required:
                         - cahost
                         - caname

diff --git a/chart/hlf-operator/values.yaml b/chart/hlf-operator/values.yaml
@@ -8,7 +8,7 @@ image:
   repository: quay.io/kfsoftware/hlf-operator
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "v1.8.4"
+  tag: "v1.9.0-beta3"
 
 imagePullSecrets: []
 nameOverride: ""