appscode-cloud · tamalsaha · Dec 18, 2023 · Dec 17, 2023
diff --git a/charts/ace-installer/README.md b/charts/ace-installer/README.md
@@ -74,7 +74,7 @@ The following table lists the configurable parameters of the `ace-installer` cha
 | helm.releases.external-dns-operator.enabled           |                         | <code>true</code>                                                                                                                                                                                                                                                                    |
 | helm.releases.external-dns-operator.version           |                         | <code>"v2023.10.1"</code>                                                                                                                                                                                                                                                            |
 | helm.releases.flux2.enabled                           |                         | <code>false</code>                                                                                                                                                                                                                                                                   |
-| helm.releases.flux2.version                           |                         | <code>"2.11.1"</code>                                                                                                                                                                                                                                                                |
+| helm.releases.flux2.version                           |                         | <code>"2.12.1"</code>                                                                                                                                                                                                                                                                |
 | helm.releases.kube-prometheus-stack.enabled           |                         | <code>true</code>                                                                                                                                                                                                                                                                    |
 | helm.releases.kube-prometheus-stack.version           |                         | <code>"52.1.0"</code>                                                                                                                                                                                                                                                                |
 | helm.releases.kube-ui-server.enabled                  |                         | <code>true</code>                                                                                                                                                                                                                                                                    |

diff --git a/charts/ace-installer/crds/helm.toolkit.fluxcd.io_helmreleases.yaml b/charts/ace-installer/crds/helm.toolkit.fluxcd.io_helmreleases.yaml
diff --git a/charts/ace-installer/crds/source.toolkit.fluxcd.io_helmrepositories.yaml b/charts/ace-installer/crds/source.toolkit.fluxcd.io_helmrepositories.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.8.0
+    controller-gen.kubebuilder.io/version: v0.12.0
   name: helmrepositories.source.toolkit.fluxcd.io
 spec:
   group: source.toolkit.fluxcd.io
@@ -90,7 +90,7 @@ spec:
                 description: The name of the secret containing authentication credentials
                   for the Helm repository. For HTTP/S basic auth the secret must contain
                   username and password fields. For TLS the secret must contain a
-                  certFile and keyFile, and/or caCert fields.
+                  certFile and keyFile, and/or caFile fields.
                 properties:
                   name:
                     description: Name of the referent.
@@ -295,8 +295,32 @@ spec:
                 required:
                 - namespaceSelectors
                 type: object
+              certSecretRef:
+                description: "CertSecretRef can be given the name of a Secret containing
+                  either or both of \n - a PEM-encoded client certificate (`tls.crt`)
+                  and private key (`tls.key`); - a PEM-encoded CA certificate (`ca.crt`)
+                  \n and whichever are supplied, will be used for connecting to the
+                  registry. The client cert and key are useful if you are authenticating
+                  with a certificate; the CA cert is useful if you are using a self-signed
+                  server certificate. The Secret must be of type `Opaque` or `kubernetes.io/tls`.
+                  \n It takes precedence over the values specified in the Secret referred
+                  to by `.spec.secretRef`."
+                properties:
+                  name:
+                    description: Name of the referent.
+                    type: string
+                required:
+                - name
+                type: object
+              insecure:
+                description: Insecure allows connecting to a non-TLS HTTP container
+                  registry. This field is only taken into account if the .spec.type
+                  field is set to 'oci'.
+                type: boolean
               interval:
-                description: Interval at which to check the URL for updates.
+                description: Interval at which the HelmRepository URL is checked for
+                  updates. This interval is approximate and may be subject to jitter
+                  to ensure efficient use of resources.
                 pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$
                 type: string
               passCredentials:
@@ -322,8 +346,9 @@ spec:
               secretRef:
                 description: SecretRef specifies the Secret containing authentication
                   credentials for the HelmRepository. For HTTP/S basic auth the secret
-                  must contain 'username' and 'password' fields. For TLS the secret
-                  must contain a 'certFile' and 'keyFile', and/or 'caCert' fields.
+                  must contain 'username' and 'password' fields. Support for TLS auth
+                  using the 'certFile' and 'keyFile', and/or 'caFile' keys is deprecated.
+                  Please use `.spec.certSecretRef` instead.
                 properties:
                   name:
                     description: Name of the referent.
@@ -336,10 +361,10 @@ spec:
                   of this HelmRepository.
                 type: boolean
               timeout:
-                default: 60s
                 description: Timeout is used for the index fetch operation for an
                   HTTPS helm repository, and for remote OCI Repository operations
-                  like pulling for an OCI helm repository. Its default value is 60s.
+                  like pulling for an OCI helm chart by the associated HelmChart.
+                  Its default value is 60s.
                 pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m))+$
                 type: string
               type:
@@ -352,9 +377,9 @@ spec:
               url:
                 description: URL of the Helm repository, a valid URL contains at least
                   a protocol and host.
+                pattern: ^(http|https|oci)://.*$
                 type: string
             required:
-            - interval
             - url
             type: object
           status:
@@ -366,8 +391,9 @@ spec:
                 description: Artifact represents the last successful HelmRepository
                   reconciliation.
                 properties:
-                  checksum:
-                    description: Checksum is the SHA256 checksum of the Artifact file.
+                  digest:
+                    description: Digest is the digest of the file in the form of '<algorithm>:<checksum>'.
+                    pattern: ^[a-z0-9]+(?:[.+_-][a-z0-9]+)*:[a-zA-Z0-9=_-]+$
                     type: string
                   lastUpdateTime:
                     description: LastUpdateTime is the timestamp corresponding to
@@ -400,7 +426,9 @@ spec:
                       the Artifact contents.
                     type: string
                 required:
+                - lastUpdateTime
                 - path
+                - revision
                 - url
                 type: object
               conditions:

diff --git a/charts/ace-installer/templates/apps/ace/ace.yaml b/charts/ace-installer/templates/apps/ace/ace.yaml
@@ -1,7 +1,7 @@
 {{- with (index .Values "helm" "releases" "ace") }}
 {{- if .enabled }}
 
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: ace

diff --git a/charts/ace-installer/templates/apps/cert-manager/cert-manager-csi-driver-cacerts.yaml b/charts/ace-installer/templates/apps/cert-manager/cert-manager-csi-driver-cacerts.yaml
@@ -6,7 +6,7 @@
 {{ $vals := dig "values" dict . }}
 {{ $vals = mergeOverwrite $vals $overrides }}
 
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: cert-manager-csi-driver-cacerts

diff --git a/charts/ace-installer/templates/apps/cert-manager/cert-manager-webhook-ace.yaml b/charts/ace-installer/templates/apps/cert-manager/cert-manager-webhook-ace.yaml
@@ -6,7 +6,7 @@
 {{ $vals := dig "values" dict . }}
 {{ $vals = mergeOverwrite $vals $overrides }}
 
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: cert-manager-webhook-ace

diff --git a/charts/ace-installer/templates/apps/cert-manager/cert-manager.yaml b/charts/ace-installer/templates/apps/cert-manager/cert-manager.yaml
@@ -19,7 +19,7 @@ cainjector:
 {{ $vals := dig "values" dict . }}
 {{ $vals = mergeOverwrite $vals $overrides }}
 
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: cert-manager

diff --git a/charts/ace-installer/templates/apps/kubedb/kubedb.yaml b/charts/ace-installer/templates/apps/kubedb/kubedb.yaml
@@ -10,7 +10,7 @@ global:
 {{ $vals := dig "values" dict . }}
 {{ $vals = mergeOverwrite $vals $overrides }}
 
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: kubedb

diff --git a/charts/ace-installer/templates/apps/kubeops/docker-machine-operator.yaml b/charts/ace-installer/templates/apps/kubeops/docker-machine-operator.yaml
@@ -6,7 +6,7 @@
 {{ $vals := dig "values" dict . }}
 {{ $vals = mergeOverwrite $vals $overrides }}
 
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: docker-machine-operator

diff --git a/charts/ace-installer/templates/apps/kubeops/external-dns-operator.yaml b/charts/ace-installer/templates/apps/kubeops/external-dns-operator.yaml
@@ -6,7 +6,7 @@
 {{ $vals := dig "values" dict . }}
 {{ $vals = mergeOverwrite $vals $overrides }}
 
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: external-dns-operator

diff --git a/charts/ace-installer/templates/apps/kubeops/kube-ui-server.yaml b/charts/ace-installer/templates/apps/kubeops/kube-ui-server.yaml
@@ -6,7 +6,7 @@
 {{ $vals := dig "values" dict . }}
 {{ $vals = mergeOverwrite $vals $overrides }}
 
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: kube-ui-server

diff --git a/charts/ace-installer/templates/apps/kubeops/license-proxyserver.yaml b/charts/ace-installer/templates/apps/kubeops/license-proxyserver.yaml
@@ -6,7 +6,7 @@
 {{ $vals := dig "values" dict . }}
 {{ $vals = mergeOverwrite $vals $overrides }}
 
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: license-proxyserver

diff --git a/charts/ace-installer/templates/apps/kubeops/reloader.yaml b/charts/ace-installer/templates/apps/kubeops/reloader.yaml
@@ -11,7 +11,7 @@ reloader:
 {{ $vals := dig "values" dict . }}
 {{ $vals = mergeOverwrite $vals $overrides }}
 
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: reloader

diff --git a/charts/ace-installer/templates/apps/monitoring/kube-prometheus-stack.yaml b/charts/ace-installer/templates/apps/monitoring/kube-prometheus-stack.yaml
@@ -86,7 +86,7 @@ grafana:
 {{ $vals := dig "values" dict . }}
 {{ $vals = mergeOverwrite $vals $alertmanager $prometheusOperator $prometheus $thanosRuler $ksm $node $grafana }}
 
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: kube-prometheus-stack

diff --git a/charts/ace-installer/templates/apps/monitoring/panopticon.yaml b/charts/ace-installer/templates/apps/monitoring/panopticon.yaml
@@ -6,7 +6,7 @@
 {{ $vals := dig "values" dict . }}
 {{ $vals = mergeOverwrite $vals $overrides }}
 
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: panopticon

diff --git a/charts/ace-installer/templates/apps/opscenter-features/opscenter-features.yaml b/charts/ace-installer/templates/apps/opscenter-features/opscenter-features.yaml
@@ -9,7 +9,7 @@
 {{ $vals := dig "values" dict . }}
 {{ $vals = mergeOverwrite $vals $overrides }}
 
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: opscenter-features

diff --git a/charts/ace-installer/templates/apps/stash/stash.yaml b/charts/ace-installer/templates/apps/stash/stash.yaml
@@ -15,7 +15,7 @@ stash-enterprise:
 {{ $vals := dig "values" dict . }}
 {{ $vals = mergeOverwrite $vals $overrides }}
 
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: stash

diff --git a/charts/ace-installer/values.yaml b/charts/ace-installer/values.yaml
@@ -68,7 +68,7 @@ helm:
       version: "v2023.10.1"
     flux2:
       enabled: false
-      version: "2.11.1"
+      version: "2.12.1"
     kube-prometheus-stack:
       enabled: true
       version: "52.1.0"

diff --git a/charts/ace-ocm-addons/templates/manifestrelicaset.yaml b/charts/ace-ocm-addons/templates/manifestrelicaset.yaml
@@ -87,7 +87,7 @@ spec:
         {{ $vals := dig "values" dict . }}
         {{ $vals = mergeOverwrite $vals $overrides }}
 
-        - apiVersion: helm.toolkit.fluxcd.io/v2beta1
+        - apiVersion: helm.toolkit.fluxcd.io/v2beta2
           kind: HelmRelease
           metadata:
             name: opscenter-features
@@ -131,7 +131,7 @@ spec:
         {{ $vals := dig "values" dict . }}
         {{ $vals = mergeOverwrite $vals $overrides }}
 
-        - apiVersion: helm.toolkit.fluxcd.io/v2beta1
+        - apiVersion: helm.toolkit.fluxcd.io/v2beta2
           kind: HelmRelease
           metadata:
             name: license-proxyserver
@@ -179,7 +179,7 @@ spec:
         {{ $vals := dig "values" dict . }}
         {{ $vals = mergeOverwrite $vals $overrides }}
 
-        - apiVersion: helm.toolkit.fluxcd.io/v2beta1
+        - apiVersion: helm.toolkit.fluxcd.io/v2beta2
           kind: HelmRelease
           metadata:
             name: kube-ui-server

diff --git a/charts/ace/crds/cloud.bytebuilders.dev_credentials.yaml b/charts/ace/crds/cloud.bytebuilders.dev_credentials.yaml
@@ -94,10 +94,6 @@ spec:
                 properties:
                   accessToken:
                     type: string
-                  clientID:
-                    type: string
-                  clientSecret:
-                    type: string
                   expiry:
                     format: int64
                     type: integer
@@ -109,8 +105,6 @@ spec:
                     type: array
                 required:
                 - accessToken
-                - clientID
-                - clientSecret
                 type: object
               linode:
                 properties:

diff --git a/charts/ace/crds/cluster.bytebuilders.dev_clusteruserauths.yaml b/charts/ace/crds/cluster.bytebuilders.dev_clusteruserauths.yaml
@@ -109,19 +109,13 @@ spec:
                 properties:
                   accessToken:
                     type: string
-                  clientID:
-                    type: string
-                  clientSecret:
-                    type: string
                   expiry:
                     format: int64
                     type: integer
                   refreshToken:
                     type: string
                 required:
                 - accessToken
-                - clientID
-                - clientSecret
                 type: object
               impersonate:
                 description: Impersonate is the username to act-as.

diff --git a/charts/opscenter-features/README.md b/charts/opscenter-features/README.md
@@ -69,7 +69,7 @@ The following table lists the configurable parameters of the `opscenter-features
 | helm.releases.external-dns-operator.version           |                         | <code>"v2023.10.1"</code>                  |
 | helm.releases.falco.version                           |                         | <code>"3.8.4"</code>                       |
 | helm.releases.falco-ui-server.version                 |                         | <code>"v2023.10.1"</code>                  |
-| helm.releases.flux2.version                           |                         | <code>"2.11.1"</code>                      |
+| helm.releases.flux2.version                           |                         | <code>"2.12.1"</code>                      |
 | helm.releases.gatekeeper.version                      |                         | <code>"3.13.3"</code>                      |
 | helm.releases.gatekeeper-grafana-dashboards.version   |                         | <code>"v2023.10.1"</code>                  |
 | helm.releases.gatekeeper-library.version              |                         | <code>"v2023.10.1"</code>                  |