feat: Upgrade flux to 2.1.2 (#1672)

* feat: Upgrade flux to 2.1.2 * chore: bump image tag for license --------- Co-authored-by: mesosphere-teamcity <[email protected]> Co-authored-by: York Chen <[email protected]> Co-authored-by: Tarun Gupta Akirala <[email protected]>
mesosphere · Nov 6, 2023 · 464c546 · 464c546
1 parent 77116a6
commit 464c546
Show file tree

Hide file tree

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

diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml
@@ -372,12 +372,12 @@ resources:
       - license_path: LICENSE
         ref: ${image_tag}
         url: https://github.com/brancz/kube-rbac-proxy
-  - container_image: ghcr.io/fluxcd/helm-controller:v0.36.0
+  - container_image: ghcr.io/fluxcd/helm-controller:v0.36.2
     sources:
       - license_path: LICENSE
         ref: ${image_tag}
         url: https://github.com/fluxcd/helm-controller
-  - container_image: ghcr.io/fluxcd/kustomize-controller:v1.1.0
+  - container_image: ghcr.io/fluxcd/kustomize-controller:v1.1.1
     sources:
       - license_path: LICENSE
         ref: ${image_tag}
@@ -387,7 +387,7 @@ resources:
       - license_path: LICENSE
         ref: ${image_tag}
         url: https://github.com/fluxcd/notification-controller
-  - container_image: ghcr.io/fluxcd/source-controller:v1.1.0
+  - container_image: ghcr.io/fluxcd/source-controller:v1.1.2
     sources:
       - license_path: LICENSE
         ref: ${image_tag}

diff --git a/...ces/kommander-flux/2.1.0/defaults/cm.yaml → ...ces/kommander-flux/2.1.2/defaults/cm.yaml b/...ces/kommander-flux/2.1.0/defaults/cm.yaml → ...ces/kommander-flux/2.1.2/defaults/cm.yaml
@@ -4,5 +4,5 @@ data:
     ---
 kind: ConfigMap
 metadata:
-  name: kommander-flux-2.1.0-d2iq-defaults
+  name: kommander-flux-2.1.2-d2iq-defaults
   namespace: ${releaseNamespace}
diff --git a/...er-flux/2.1.0/defaults/kustomization.yaml → ...er-flux/2.1.2/defaults/kustomization.yaml b/...er-flux/2.1.0/defaults/kustomization.yaml → ...er-flux/2.1.2/defaults/kustomization.yaml
diff --git a/...s/kommander-flux/2.1.0/kustomization.yaml → ...s/kommander-flux/2.1.2/kustomization.yaml b/...s/kommander-flux/2.1.0/kustomization.yaml → ...s/kommander-flux/2.1.2/kustomization.yaml
diff --git a/...nder-flux/2.1.0/patch-proxy-env-vars.yaml → ...nder-flux/2.1.2/patch-proxy-env-vars.yaml b/...nder-flux/2.1.0/patch-proxy-env-vars.yaml → ...nder-flux/2.1.2/patch-proxy-env-vars.yaml
diff --git a/...1.0/patch-source-ctrl-network-policy.yaml → ...1.2/patch-source-ctrl-network-policy.yaml b/...1.0/patch-source-ctrl-network-policy.yaml → ...1.2/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.1.0
+    app.kubernetes.io/version: v2.1.2
   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.1.0
+    app.kubernetes.io/version: v2.1.2
   name: buckets.source.toolkit.fluxcd.io
 spec:
   group: source.toolkit.fluxcd.io

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.1.0
+    app.kubernetes.io/version: v2.1.2
   name: gitrepositories.source.toolkit.fluxcd.io
 spec:
   group: source.toolkit.fluxcd.io

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.1.0
+    app.kubernetes.io/version: v2.1.2
   name: helmcharts.source.toolkit.fluxcd.io
 spec:
   group: source.toolkit.fluxcd.io

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.1.0
+    app.kubernetes.io/version: v2.1.2
   name: helmreleases.helm.toolkit.fluxcd.io
 spec:
   group: helm.toolkit.fluxcd.io

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.1.0
+    app.kubernetes.io/version: v2.1.2
   name: helmrepositories.source.toolkit.fluxcd.io
 spec:
   group: source.toolkit.fluxcd.io

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.1.0
+    app.kubernetes.io/version: v2.1.2
   name: kustomizations.kustomize.toolkit.fluxcd.io
 spec:
   group: kustomize.toolkit.fluxcd.io

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.1.0
+    app.kubernetes.io/version: v2.1.2
   name: ocirepositories.source.toolkit.fluxcd.io
 spec:
   group: source.toolkit.fluxcd.io

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.1.0
+    app.kubernetes.io/version: v2.1.2
   name: providers.notification.toolkit.fluxcd.io
 spec:
   group: notification.toolkit.fluxcd.io

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.1.0
+    app.kubernetes.io/version: v2.1.2
   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.1.0
+    app.kubernetes.io/version: v2.1.2
     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.36.0
+        image: ghcr.io/fluxcd/helm-controller:v0.36.2
         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.1.0
+    app.kubernetes.io/version: v2.1.2
     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.1.0
+        image: ghcr.io/fluxcd/kustomize-controller:v1.1.1
         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.1.0
+    app.kubernetes.io/version: v2.1.2
     control-plane: controller
   name: notification-controller
   namespace: kommander-flux

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.1.0
+    app.kubernetes.io/version: v2.1.2
     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.1.0
+        image: ghcr.io/fluxcd/source-controller:v1.1.2
         imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:

diff --git a/...r-flux/2.1.0/templates/kustomization.yaml → ...r-flux/2.1.2/templates/kustomization.yaml b/...r-flux/2.1.0/templates/kustomization.yaml → ...r-flux/2.1.2/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.1.0
+    app.kubernetes.io/version: v2.1.2
   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.1.0
+    app.kubernetes.io/version: v2.1.2
   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.1.0
+    app.kubernetes.io/version: v2.1.2
   name: allow-webhooks
   namespace: kommander-flux
 spec:

diff --git a/...errole_crd-controller-kommander-flux.yaml → ...errole_crd-controller-kommander-flux.yaml b/...errole_crd-controller-kommander-flux.yaml → ...errole_crd-controller-kommander-flux.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v2.1.0
+    app.kubernetes.io/version: v2.1.2
   name: crd-controller-kommander-flux
 rules:
 - apiGroups:

diff --git a/...clusterrole_flux-edit-kommander-flux.yaml → ...clusterrole_flux-edit-kommander-flux.yaml b/...clusterrole_flux-edit-kommander-flux.yaml → ...clusterrole_flux-edit-kommander-flux.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v2.1.0
+    app.kubernetes.io/version: v2.1.2
     rbac.authorization.k8s.io/aggregate-to-admin: "true"
     rbac.authorization.k8s.io/aggregate-to-edit: "true"
   name: flux-edit-kommander-flux

diff --git a/...clusterrole_flux-view-kommander-flux.yaml → ...clusterrole_flux-view-kommander-flux.yaml b/...clusterrole_flux-view-kommander-flux.yaml → ...clusterrole_flux-view-kommander-flux.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v2.1.0
+    app.kubernetes.io/version: v2.1.2
     rbac.authorization.k8s.io/aggregate-to-admin: "true"
     rbac.authorization.k8s.io/aggregate-to-edit: "true"
     rbac.authorization.k8s.io/aggregate-to-view: "true"

diff --git a/...ng_cluster-reconciler-kommander-flux.yaml → ...ng_cluster-reconciler-kommander-flux.yaml b/...ng_cluster-reconciler-kommander-flux.yaml → ...ng_cluster-reconciler-kommander-flux.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v2.1.0
+    app.kubernetes.io/version: v2.1.2
   name: cluster-reconciler-kommander-flux
 roleRef:
   apiGroup: rbac.authorization.k8s.io

diff --git a/...inding_crd-controller-kommander-flux.yaml → ...inding_crd-controller-kommander-flux.yaml b/...inding_crd-controller-kommander-flux.yaml → ...inding_crd-controller-kommander-flux.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v2.1.0
+    app.kubernetes.io/version: v2.1.2
   name: crd-controller-kommander-flux
 roleRef:
   apiGroup: rbac.authorization.k8s.io

diff --git a/...emplates/v1_namespace_kommander-flux.yaml → ...emplates/v1_namespace_kommander-flux.yaml b/...emplates/v1_namespace_kommander-flux.yaml → ...emplates/v1_namespace_kommander-flux.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v2.1.0
+    app.kubernetes.io/version: v2.1.2
     pod-security.kubernetes.io/warn: restricted
     pod-security.kubernetes.io/warn-version: latest
   name: kommander-flux
diff --git a/...cequota_critical-pods-kommander-flux.yaml → ...cequota_critical-pods-kommander-flux.yaml b/...cequota_critical-pods-kommander-flux.yaml → ...cequota_critical-pods-kommander-flux.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v2.1.0
+    app.kubernetes.io/version: v2.1.2
   name: critical-pods-kommander-flux
   namespace: kommander-flux
 spec:

diff --git a/...s/v1_service_notification-controller.yaml → ...s/v1_service_notification-controller.yaml b/...s/v1_service_notification-controller.yaml → ...s/v1_service_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.1.0
+    app.kubernetes.io/version: v2.1.2
     control-plane: controller
   name: notification-controller
   namespace: kommander-flux

diff --git a/...mplates/v1_service_source-controller.yaml → ...mplates/v1_service_source-controller.yaml b/...mplates/v1_service_source-controller.yaml → ...mplates/v1_service_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.1.0
+    app.kubernetes.io/version: v2.1.2
     control-plane: controller
   name: source-controller
   namespace: kommander-flux

diff --git a/...emplates/v1_service_webhook-receiver.yaml → ...emplates/v1_service_webhook-receiver.yaml b/...emplates/v1_service_webhook-receiver.yaml → ...emplates/v1_service_webhook-receiver.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.1.0
+    app.kubernetes.io/version: v2.1.2
     control-plane: controller
   name: webhook-receiver
   namespace: kommander-flux

diff --git a/...es/v1_serviceaccount_helm-controller.yaml → ...es/v1_serviceaccount_helm-controller.yaml b/...es/v1_serviceaccount_helm-controller.yaml → ...es/v1_serviceaccount_helm-controller.yaml
@@ -5,6 +5,6 @@ metadata:
     app.kubernetes.io/component: helm-controller
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v2.1.0
+    app.kubernetes.io/version: v2.1.2
   name: helm-controller
   namespace: kommander-flux
diff --git a/..._serviceaccount_kustomize-controller.yaml → ..._serviceaccount_kustomize-controller.yaml b/..._serviceaccount_kustomize-controller.yaml → ..._serviceaccount_kustomize-controller.yaml
@@ -5,6 +5,6 @@ metadata:
     app.kubernetes.io/component: kustomize-controller
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v2.1.0
+    app.kubernetes.io/version: v2.1.2
   name: kustomize-controller
   namespace: kommander-flux
diff --git a/...rviceaccount_notification-controller.yaml → ...rviceaccount_notification-controller.yaml b/...rviceaccount_notification-controller.yaml → ...rviceaccount_notification-controller.yaml
@@ -5,6 +5,6 @@ metadata:
     app.kubernetes.io/component: notification-controller
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v2.1.0
+    app.kubernetes.io/version: v2.1.2
   name: notification-controller
   namespace: kommander-flux
diff --git a/.../v1_serviceaccount_source-controller.yaml → .../v1_serviceaccount_source-controller.yaml b/.../v1_serviceaccount_source-controller.yaml → .../v1_serviceaccount_source-controller.yaml
@@ -5,6 +5,6 @@ metadata:
     app.kubernetes.io/component: source-controller
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v2.1.0
+    app.kubernetes.io/version: v2.1.2
   name: source-controller
   namespace: kommander-flux