feat: Upgrade flux to 2.1.0

Signed-off-by: York Chen <ychen@d2iq.com>
mesosphere · Sep 18, 2023 · a753427 · a753427
1 parent cf689b0
commit a753427
Show file tree

Hide file tree

Showing 39 changed files with 109 additions and 55 deletions.
diff --git a/.tool-versions b/.tool-versions
@@ -1,5 +1,5 @@
 awscli 2.9.0
-flux2 2.0.1
+flux2 2.1.0
 github-cli 2.20.2
 golang 1.19.3
 kustomize 4.5.7

diff --git a/...ces/kommander-flux/2.0.1/defaults/cm.yaml → ...ces/kommander-flux/2.1.0/defaults/cm.yaml b/...ces/kommander-flux/2.0.1/defaults/cm.yaml → ...ces/kommander-flux/2.1.0/defaults/cm.yaml
@@ -4,5 +4,5 @@ data:
     ---
 kind: ConfigMap
 metadata:
-  name: kommander-flux-2.0.1-d2iq-defaults
+  name: kommander-flux-2.1.0-d2iq-defaults
   namespace: ${releaseNamespace}
diff --git a/...er-flux/2.0.1/defaults/kustomization.yaml → ...er-flux/2.1.0/defaults/kustomization.yaml b/...er-flux/2.0.1/defaults/kustomization.yaml → ...er-flux/2.1.0/defaults/kustomization.yaml
diff --git a/...s/kommander-flux/2.0.1/kustomization.yaml → ...s/kommander-flux/2.1.0/kustomization.yaml b/...s/kommander-flux/2.0.1/kustomization.yaml → ...s/kommander-flux/2.1.0/kustomization.yaml
diff --git a/...nder-flux/2.0.1/patch-proxy-env-vars.yaml → ...nder-flux/2.1.0/patch-proxy-env-vars.yaml b/...nder-flux/2.0.1/patch-proxy-env-vars.yaml → ...nder-flux/2.1.0/patch-proxy-env-vars.yaml
diff --git a/...0.1/patch-source-ctrl-network-policy.yaml → ...1.0/patch-source-ctrl-network-policy.yaml b/...0.1/patch-source-ctrl-network-policy.yaml → ...1.0/patch-source-ctrl-network-policy.yaml
diff --git a/...lerts.notification.toolkit.fluxcd.io.yaml → ...lerts.notification.toolkit.fluxcd.io.yaml b/...lerts.notification.toolkit.fluxcd.io.yaml → ...lerts.notification.toolkit.fluxcd.io.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/component: notification-controller
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v2.0.1
+    app.kubernetes.io/version: v2.1.0
   name: alerts.notification.toolkit.fluxcd.io
 spec:
   group: notification.toolkit.fluxcd.io

diff --git a/...ion_buckets.source.toolkit.fluxcd.io.yaml → ...ion_buckets.source.toolkit.fluxcd.io.yaml b/...ion_buckets.source.toolkit.fluxcd.io.yaml → ...ion_buckets.source.toolkit.fluxcd.io.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/component: source-controller
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v2.0.1
+    app.kubernetes.io/version: v2.1.0
   name: buckets.source.toolkit.fluxcd.io
 spec:
   group: source.toolkit.fluxcd.io
@@ -330,7 +330,9 @@ spec:
                 description: Insecure allows connecting to a non-TLS HTTP Endpoint.
                 type: boolean
               interval:
-                description: Interval at which to check the Endpoint for updates.
+                description: Interval at which the Bucket Endpoint 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
               provider:

diff --git a/...epositories.source.toolkit.fluxcd.io.yaml → ...epositories.source.toolkit.fluxcd.io.yaml b/...epositories.source.toolkit.fluxcd.io.yaml → ...epositories.source.toolkit.fluxcd.io.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/component: source-controller
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v2.0.1
+    app.kubernetes.io/version: v2.1.0
   name: gitrepositories.source.toolkit.fluxcd.io
 spec:
   group: source.toolkit.fluxcd.io
@@ -91,9 +91,21 @@ spec:
                   type: object
                 type: array
               interval:
-                description: Interval at which to check the GitRepository for updates.
+                description: Interval at which the GitRepository 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
+              proxySecretRef:
+                description: ProxySecretRef specifies the Secret containing the proxy
+                  configuration to use while communicating with the Git server.
+                properties:
+                  name:
+                    description: Name of the referent.
+                    type: string
+                required:
+                - name
+                type: object
               recurseSubmodules:
                 description: RecurseSubmodules enables the initialization of all submodules
                   within the GitRepository as cloned from the URL, using their default
@@ -160,10 +172,16 @@ spec:
                   Git commit signature(s).
                 properties:
                   mode:
-                    description: Mode specifies what Git object should be verified,
-                      currently ('head').
+                    default: HEAD
+                    description: "Mode specifies which Git object(s) should be verified.
+                      \n The variants \"head\" and \"HEAD\" both imply the same thing,
+                      i.e. verify the commit that the HEAD of the Git repository points
+                      to. The variant \"head\" solely exists to ensure backwards compatibility."
                     enum:
                     - head
+                    - HEAD
+                    - Tag
+                    - TagAndHEAD
                     type: string
                   secretRef:
                     description: SecretRef specifies the Secret containing the public
@@ -176,7 +194,6 @@ spec:
                     - name
                     type: object
                 required:
-                - mode
                 - secretRef
                 type: object
             required:
@@ -399,6 +416,10 @@ spec:
                 description: ObservedRecurseSubmodules is the observed resource submodules
                   configuration used to produce the current Artifact.
                 type: boolean
+              sourceVerificationMode:
+                description: SourceVerificationMode is the last used verification
+                  mode indicating which Git object(s) have been verified.
+                type: string
             type: object
         type: object
     served: true

diff --git a/..._helmcharts.source.toolkit.fluxcd.io.yaml → ..._helmcharts.source.toolkit.fluxcd.io.yaml b/..._helmcharts.source.toolkit.fluxcd.io.yaml → ..._helmcharts.source.toolkit.fluxcd.io.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/component: source-controller
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v2.0.1
+    app.kubernetes.io/version: v2.1.0
   name: helmcharts.source.toolkit.fluxcd.io
 spec:
   group: source.toolkit.fluxcd.io
@@ -350,8 +350,9 @@ spec:
                   at in the SourceRef.
                 type: string
               interval:
-                description: Interval is the interval at which to check the Source
-                  for updates.
+                description: Interval at which the HelmChart SourceRef 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
               reconcileStrategy:

diff --git a/..._helmreleases.helm.toolkit.fluxcd.io.yaml → ..._helmreleases.helm.toolkit.fluxcd.io.yaml b/..._helmreleases.helm.toolkit.fluxcd.io.yaml → ..._helmreleases.helm.toolkit.fluxcd.io.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/component: helm-controller
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v2.0.1
+    app.kubernetes.io/version: v2.1.0
   name: helmreleases.helm.toolkit.fluxcd.io
 spec:
   group: helm.toolkit.fluxcd.io
@@ -286,7 +286,9 @@ spec:
                     type: string
                 type: object
               interval:
-                description: Interval at which to reconcile the Helm release.
+                description: Interval at which to reconcile the Helm release. 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
               kubeConfig:

diff --git a/...epositories.source.toolkit.fluxcd.io.yaml → ...epositories.source.toolkit.fluxcd.io.yaml b/...epositories.source.toolkit.fluxcd.io.yaml → ...epositories.source.toolkit.fluxcd.io.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/component: source-controller
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v2.0.1
+    app.kubernetes.io/version: v2.1.0
   name: helmrepositories.source.toolkit.fluxcd.io
 spec:
   group: source.toolkit.fluxcd.io
@@ -300,8 +300,27 @@ 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
               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:
@@ -327,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 'caFile' 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.

diff --git a/...izations.kustomize.toolkit.fluxcd.io.yaml → ...izations.kustomize.toolkit.fluxcd.io.yaml b/...izations.kustomize.toolkit.fluxcd.io.yaml → ...izations.kustomize.toolkit.fluxcd.io.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/component: kustomize-controller
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v2.0.1
+    app.kubernetes.io/version: v2.1.0
   name: kustomizations.kustomize.toolkit.fluxcd.io
 spec:
   group: kustomize.toolkit.fluxcd.io
@@ -174,6 +174,8 @@ spec:
                 type: array
               interval:
                 description: The interval at which to reconcile the Kustomization.
+                  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
               kubeConfig:

diff --git a/...epositories.source.toolkit.fluxcd.io.yaml → ...epositories.source.toolkit.fluxcd.io.yaml b/...epositories.source.toolkit.fluxcd.io.yaml → ...epositories.source.toolkit.fluxcd.io.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/component: source-controller
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v2.0.1
+    app.kubernetes.io/version: v2.1.0
   name: ocirepositories.source.toolkit.fluxcd.io
 spec:
   group: source.toolkit.fluxcd.io
@@ -54,13 +54,15 @@ spec:
             description: OCIRepositorySpec defines the desired state of OCIRepository
             properties:
               certSecretRef:
-                description: "CertSecretRef can be given the name of a secret containing
-                  either or both of \n - a PEM-encoded client certificate (`certFile`)
-                  and private key (`keyFile`); - a PEM-encoded CA certificate (`caFile`)
+                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."
+                  server certificate. The Secret must be of type `Opaque` or `kubernetes.io/tls`.
+                  \n Note: Support for the `caFile`, `certFile` and `keyFile` keys
+                  have been deprecated."
                 properties:
                   name:
                     description: Name of the referent.
@@ -79,7 +81,9 @@ spec:
                   registry.
                 type: boolean
               interval:
-                description: The interval at which to check for image updates.
+                description: Interval at which the OCIRepository 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
               layerSelector:

diff --git a/...iders.notification.toolkit.fluxcd.io.yaml → ...iders.notification.toolkit.fluxcd.io.yaml b/...iders.notification.toolkit.fluxcd.io.yaml → ...iders.notification.toolkit.fluxcd.io.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/component: notification-controller
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v2.0.1
+    app.kubernetes.io/version: v2.1.0
   name: providers.notification.toolkit.fluxcd.io
 spec:
   group: notification.toolkit.fluxcd.io
@@ -240,8 +240,9 @@ spec:
                 maxLength: 2048
                 type: string
               certSecretRef:
-                description: CertSecretRef specifies the Secret containing a PEM-encoded
-                  CA certificate (`caFile`).
+                description: "CertSecretRef specifies the Secret containing a PEM-encoded
+                  CA certificate (in the `ca.crt` key). \n Note: Support for the `caFile`
+                  key has been deprecated."
                 properties:
                   name:
                     description: Name of the referent.
@@ -309,6 +310,7 @@ spec:
                 - grafana
                 - githubdispatch
                 - pagerduty
+                - datadog
                 type: string
               username:
                 description: Username specifies the name under which events are posted.

diff --git a/...ivers.notification.toolkit.fluxcd.io.yaml → ...ivers.notification.toolkit.fluxcd.io.yaml b/...ivers.notification.toolkit.fluxcd.io.yaml → ...ivers.notification.toolkit.fluxcd.io.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/component: notification-controller
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v2.0.1
+    app.kubernetes.io/version: v2.1.0
   name: receivers.notification.toolkit.fluxcd.io
 spec:
   group: notification.toolkit.fluxcd.io

diff --git a/...s/apps_v1_deployment_helm-controller.yaml → ...s/apps_v1_deployment_helm-controller.yaml b/...s/apps_v1_deployment_helm-controller.yaml → ...s/apps_v1_deployment_helm-controller.yaml
@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/component: helm-controller
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v2.0.1
+    app.kubernetes.io/version: v2.1.0
     control-plane: controller
   name: helm-controller
   namespace: kommander-flux
@@ -35,7 +35,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: ghcr.io/fluxcd/helm-controller:v0.35.0
+        image: ghcr.io/fluxcd/helm-controller:v0.36.0
         imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:

diff --git a/...s_v1_deployment_kustomize-controller.yaml → ...s_v1_deployment_kustomize-controller.yaml b/...s_v1_deployment_kustomize-controller.yaml → ...s_v1_deployment_kustomize-controller.yaml
@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/component: kustomize-controller
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v2.0.1
+    app.kubernetes.io/version: v2.1.0
     control-plane: controller
   name: kustomize-controller
   namespace: kommander-flux
@@ -36,7 +36,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: ghcr.io/fluxcd/kustomize-controller:v1.0.1
+        image: ghcr.io/fluxcd/kustomize-controller:v1.1.0
         imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:

diff --git a/...1_deployment_notification-controller.yaml → ...1_deployment_notification-controller.yaml b/...1_deployment_notification-controller.yaml → ...1_deployment_notification-controller.yaml
@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/component: notification-controller
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v2.0.1
+    app.kubernetes.io/version: v2.1.0
     control-plane: controller
   name: notification-controller
   namespace: kommander-flux
@@ -33,7 +33,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: ghcr.io/fluxcd/notification-controller:v1.0.0
+        image: ghcr.io/fluxcd/notification-controller:v1.1.0
         imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:

diff --git a/...apps_v1_deployment_source-controller.yaml → ...apps_v1_deployment_source-controller.yaml b/...apps_v1_deployment_source-controller.yaml → ...apps_v1_deployment_source-controller.yaml
@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/component: source-controller
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v2.0.1
+    app.kubernetes.io/version: v2.1.0
     control-plane: controller
   name: source-controller
   namespace: kommander-flux
@@ -40,7 +40,7 @@ spec:
               fieldPath: metadata.namespace
         - name: TUF_ROOT
           value: /tmp/.sigstore
-        image: ghcr.io/fluxcd/source-controller:v1.0.1
+        image: ghcr.io/fluxcd/source-controller:v1.1.0
         imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:

diff --git a/...r-flux/2.0.1/templates/kustomization.yaml → ...r-flux/2.1.0/templates/kustomization.yaml b/...r-flux/2.0.1/templates/kustomization.yaml → ...r-flux/2.1.0/templates/kustomization.yaml
diff --git a/...k8s.io_v1_networkpolicy_allow-egress.yaml → ...k8s.io_v1_networkpolicy_allow-egress.yaml b/...k8s.io_v1_networkpolicy_allow-egress.yaml → ...k8s.io_v1_networkpolicy_allow-egress.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v2.0.1
+    app.kubernetes.io/version: v2.1.0
   name: allow-egress
   namespace: kommander-flux
 spec:

diff --git a/...s.io_v1_networkpolicy_allow-scraping.yaml → ...s.io_v1_networkpolicy_allow-scraping.yaml b/...s.io_v1_networkpolicy_allow-scraping.yaml → ...s.io_v1_networkpolicy_allow-scraping.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v2.0.1
+    app.kubernetes.io/version: v2.1.0
   name: allow-scraping
   namespace: kommander-flux
 spec:

diff --git a/...k8s.io_v1_networkpolicy_allow-source.yaml → ...k8s.io_v1_networkpolicy_allow-source.yaml b/...k8s.io_v1_networkpolicy_allow-source.yaml → ...k8s.io_v1_networkpolicy_allow-source.yaml
diff --git a/...s.io_v1_networkpolicy_allow-webhooks.yaml → ...s.io_v1_networkpolicy_allow-webhooks.yaml b/...s.io_v1_networkpolicy_allow-webhooks.yaml → ...s.io_v1_networkpolicy_allow-webhooks.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v2.0.1
+    app.kubernetes.io/version: v2.1.0
   name: allow-webhooks
   namespace: kommander-flux
 spec: