1.10.0-beta7

Signed-off-by: David VIEJO <dviejo@kungfusoftware.es>
kfsoftware · Jan 25, 2024 · fd53ab8 · fd53ab8
1 parent 04f1ba3
commit fd53ab8
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 73 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.10.0-beta5
+version: 1.10.0-beta7
 
 # 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_fabricchaincodetemplates.yaml b/chart/hlf-operator/templates/crds/hlf.kungfusoftware.es_fabricchaincodetemplates.yaml
@@ -884,77 +884,6 @@ spec:
                 items:
                   type: string
                 type: array
-              credentials:
-                nullable: true
-                properties:
-                  cahost:
-                    type: string
-                  caname:
-                    type: string
-                  caport:
-                    type: integer
-                  catls:
-                    properties:
-                      cacert:
-                        type: string
-                      secretRef:
-                        nullable: true
-                        properties:
-                          key:
-                            type: string
-                          name:
-                            type: string
-                          namespace:
-                            type: string
-                        required:
-                        - key
-                        - name
-                        - namespace
-                        type: object
-                    required:
-                    - cacert
-                    type: object
-                  csr:
-                    properties:
-                      cn:
-                        type: string
-                      hosts:
-                        items:
-                          type: string
-                        type: array
-                    type: object
-                  enrollid:
-                    type: string
-                  enrollsecret:
-                    type: string
-                  external:
-                    nullable: true
-                    properties:
-                      certificateKey:
-                        type: string
-                      privateKeyKey:
-                        type: string
-                      rootCertificateKey:
-                        type: string
-                      secretName:
-                        type: string
-                      secretNamespace:
-                        type: string
-                    required:
-                    - certificateKey
-                    - privateKeyKey
-                    - rootCertificateKey
-                    - secretName
-                    - secretNamespace
-                    type: object
-                required:
-                - cahost
-                - caname
-                - caport
-                - catls
-                - enrollid
-                - enrollsecret
-                type: object
               env:
                 items:
                   description: EnvVar represents an environment variable present in

diff --git a/chart/hlf-operator/templates/deployment.yaml b/chart/hlf-operator/templates/deployment.yaml
@@ -48,6 +48,16 @@ spec:
   {{ if .Values.certificates.renewal.identity.enabled }}
             - --auto-renew-identity-certificates=true
             - --auto-renew-identity-certificates-delta={{ .Values.certificates.renewal.identity.delta }}
+  {{- end }}
+  {{ if  .Values.helm.wait }}
+            - --helm-chart-wait=true
+            - --helm-chart-wait-timeout={{ .Values.helm.waitTimeout }}
+  {{- end }}
+  {{ if .Values.helm.maxHistory}}
+            - --helm-max-history={{ .Values.helm.maxHistory }}
+  {{- end }}
+  {{ if .Values.maxReconciles }}
+            - --max-reconciles={{ .Values.maxReconciles }}
   {{- end }}
           command:
             - /hlf-operator

diff --git a/chart/hlf-operator/values.yaml b/chart/hlf-operator/values.yaml
@@ -8,7 +8,14 @@ image:
   repository: quay.io/kfsoftware/hlf-operator
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "v1.10.0-beta5"
+  tag: "v1.10.0-beta7"
+
+maxReconciles: 10
+
+helm:
+  wait: false
+  maxHistory: 10
+  waitTimeout: "5m" # only needed if wait is enabled
 
 certificates:
   renewal: