feat: Upgrade flux to 2.3.0 (#2670)

* feat: Upgrade flux to 2.3.0 * build: Updated licenses.d2iq.yaml * chore: fix kustomize ctrl image --------- Co-authored-by: d2iq-mergebot <ci-mergebot@d2iq.com> Co-authored-by: York Chen <york.chen@nutanix.com>
mesosphere · Oct 22, 2024 · ed86e13 · ed86e13
1 parent 0f4f5fe
commit ed86e13
Show file tree

Hide file tree

Showing 44 changed files with 8,728 additions and 6,024 deletions.
diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml
@@ -303,22 +303,22 @@ resources:
       - license_path: LICENSE
         ref: ${image_tag}
         url: https://github.com/brancz/kube-rbac-proxy
-  - container_image: ghcr.io/fluxcd/helm-controller:v0.37.4
+  - container_image: ghcr.io/fluxcd/helm-controller:v1.0.1
     sources:
       - license_path: LICENSE
         ref: ${image_tag}
         url: https://github.com/fluxcd/helm-controller
-  - container_image: ghcr.io/mesosphere/dkp-container-images/ghcr.io/fluxcd/kustomize-controller:v1.2.2-d2iq.1
+  - container_image: ghcr.io/fluxcd/kustomize-controller:v1.3.0
     sources:
       - license_path: LICENSE
         ref: ${image_tag%-d2iq.1}
         url: https://github.com/fluxcd/kustomize-controller
-  - container_image: ghcr.io/fluxcd/notification-controller:v1.2.4
+  - container_image: ghcr.io/fluxcd/notification-controller:v1.3.0
     sources:
       - license_path: LICENSE
         ref: ${image_tag}
         url: https://github.com/fluxcd/notification-controller
-  - container_image: ghcr.io/fluxcd/source-controller:v1.2.4
+  - container_image: ghcr.io/fluxcd/source-controller:v1.3.0
     sources:
       - license_path: LICENSE
         ref: ${image_tag}

diff --git a/...tensions.k8s.io_v1_customresourcedefinition_gitrepositories.source.toolkit.fluxcd.io.yaml b/...tensions.k8s.io_v1_customresourcedefinition_gitrepositories.source.toolkit.fluxcd.io.yaml
diff --git a/...apiextensions.k8s.io_v1_customresourcedefinition_helmcharts.source.toolkit.fluxcd.io.yaml b/...apiextensions.k8s.io_v1_customresourcedefinition_helmcharts.source.toolkit.fluxcd.io.yaml
diff --git a/...apiextensions.k8s.io_v1_customresourcedefinition_helmreleases.helm.toolkit.fluxcd.io.yaml b/...apiextensions.k8s.io_v1_customresourcedefinition_helmreleases.helm.toolkit.fluxcd.io.yaml
diff --git a/...ensions.k8s.io_v1_customresourcedefinition_helmrepositories.source.toolkit.fluxcd.io.yaml b/...ensions.k8s.io_v1_customresourcedefinition_helmrepositories.source.toolkit.fluxcd.io.yaml
diff --git a/...tensions.k8s.io_v1_customresourcedefinition_ocirepositories.source.toolkit.fluxcd.io.yaml b/...tensions.k8s.io_v1_customresourcedefinition_ocirepositories.source.toolkit.fluxcd.io.yaml
diff --git a/...ces/kommander-flux/2.2.5/defaults/cm.yaml → ...ces/kommander-flux/2.3.0/defaults/cm.yaml b/...ces/kommander-flux/2.2.5/defaults/cm.yaml → ...ces/kommander-flux/2.3.0/defaults/cm.yaml
@@ -4,5 +4,5 @@ data:
     ---
 kind: ConfigMap
 metadata:
-  name: kommander-flux-2.2.5-d2iq-defaults
+  name: kommander-flux-2.3.0-d2iq-defaults
   namespace: ${releaseNamespace}
diff --git a/...er-flux/2.2.5/defaults/kustomization.yaml → ...er-flux/2.3.0/defaults/kustomization.yaml b/...er-flux/2.2.5/defaults/kustomization.yaml → ...er-flux/2.3.0/defaults/kustomization.yaml
diff --git a/...s/kommander-flux/2.2.5/kustomization.yaml → ...s/kommander-flux/2.3.0/kustomization.yaml b/...s/kommander-flux/2.2.5/kustomization.yaml → ...s/kommander-flux/2.3.0/kustomization.yaml
diff --git a/...nder-flux/2.2.5/patch-proxy-env-vars.yaml → ...nder-flux/2.3.0/patch-proxy-env-vars.yaml b/...nder-flux/2.2.5/patch-proxy-env-vars.yaml → ...nder-flux/2.3.0/patch-proxy-env-vars.yaml
diff --git a/...2.5/patch-source-ctrl-network-policy.yaml → ...3.0/patch-source-ctrl-network-policy.yaml b/...2.5/patch-source-ctrl-network-policy.yaml → ...3.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
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
diff --git a/...tensions.k8s.io_v1_customresourcedefinition_gitrepositories.source.toolkit.fluxcd.io.yaml b/...tensions.k8s.io_v1_customresourcedefinition_gitrepositories.source.toolkit.fluxcd.io.yaml
diff --git a/...apiextensions.k8s.io_v1_customresourcedefinition_helmcharts.source.toolkit.fluxcd.io.yaml b/...apiextensions.k8s.io_v1_customresourcedefinition_helmcharts.source.toolkit.fluxcd.io.yaml
diff --git a/...apiextensions.k8s.io_v1_customresourcedefinition_helmreleases.helm.toolkit.fluxcd.io.yaml b/...apiextensions.k8s.io_v1_customresourcedefinition_helmreleases.helm.toolkit.fluxcd.io.yaml
diff --git a/...ensions.k8s.io_v1_customresourcedefinition_helmrepositories.source.toolkit.fluxcd.io.yaml b/...ensions.k8s.io_v1_customresourcedefinition_helmrepositories.source.toolkit.fluxcd.io.yaml
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
diff --git a/...tensions.k8s.io_v1_customresourcedefinition_ocirepositories.source.toolkit.fluxcd.io.yaml b/...tensions.k8s.io_v1_customresourcedefinition_ocirepositories.source.toolkit.fluxcd.io.yaml
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
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
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.2.3
+    app.kubernetes.io/version: v2.3.0
     control-plane: controller
   name: helm-controller
   namespace: kommander-flux
@@ -35,7 +35,17 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: ghcr.io/fluxcd/helm-controller:v0.37.4
+        - name: GOMAXPROCS
+          valueFrom:
+            resourceFieldRef:
+              containerName: manager
+              resource: limits.cpu
+        - name: GOMEMLIMIT
+          valueFrom:
+            resourceFieldRef:
+              containerName: manager
+              resource: limits.memory
+        image: ghcr.io/fluxcd/helm-controller:v1.0.1
         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.2.3
+    app.kubernetes.io/version: v2.3.0
     control-plane: controller
   name: kustomize-controller
   namespace: kommander-flux
@@ -36,7 +36,17 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: ghcr.io/mesosphere/dkp-container-images/ghcr.io/fluxcd/kustomize-controller:v1.2.2-d2iq.1
+        - name: GOMAXPROCS
+          valueFrom:
+            resourceFieldRef:
+              containerName: manager
+              resource: limits.cpu
+        - name: GOMEMLIMIT
+          valueFrom:
+            resourceFieldRef:
+              containerName: manager
+              resource: limits.memory
+        image: ghcr.io/fluxcd/kustomize-controller:v1.3.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.2.3
+    app.kubernetes.io/version: v2.3.0
     control-plane: controller
   name: notification-controller
   namespace: kommander-flux
@@ -33,7 +33,17 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: ghcr.io/fluxcd/notification-controller:v1.2.4
+        - name: GOMAXPROCS
+          valueFrom:
+            resourceFieldRef:
+              containerName: manager
+              resource: limits.cpu
+        - name: GOMEMLIMIT
+          valueFrom:
+            resourceFieldRef:
+              containerName: manager
+              resource: limits.memory
+        image: ghcr.io/fluxcd/notification-controller:v1.3.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.2.3
+    app.kubernetes.io/version: v2.3.0
     control-plane: controller
   name: source-controller
   namespace: kommander-flux
@@ -40,7 +40,17 @@ spec:
               fieldPath: metadata.namespace
         - name: TUF_ROOT
           value: /tmp/.sigstore
-        image: ghcr.io/fluxcd/source-controller:v1.2.4
+        - name: GOMAXPROCS
+          valueFrom:
+            resourceFieldRef:
+              containerName: manager
+              resource: limits.cpu
+        - name: GOMEMLIMIT
+          valueFrom:
+            resourceFieldRef:
+              containerName: manager
+              resource: limits.memory
+        image: ghcr.io/fluxcd/source-controller:v1.3.0
         imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:

diff --git a/...r-flux/2.2.5/templates/kustomization.yaml → ...r-flux/2.3.0/templates/kustomization.yaml b/...r-flux/2.2.5/templates/kustomization.yaml → ...r-flux/2.3.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.2.3
+    app.kubernetes.io/version: v2.3.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.2.3
+    app.kubernetes.io/version: v2.3.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.2.3
+    app.kubernetes.io/version: v2.3.0
   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.2.3
+    app.kubernetes.io/version: v2.3.0
   name: crd-controller-kommander-flux
 rules:
 - apiGroups:
@@ -87,3 +87,7 @@ rules:
   - update
   - patch
   - delete
+- nonResourceURLs:
+  - /livez/ping
+  verbs:
+  - head
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.2.3
+    app.kubernetes.io/version: v2.3.0
     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.2.3
+    app.kubernetes.io/version: v2.3.0
     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.2.3
+    app.kubernetes.io/version: v2.3.0
   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.2.3
+    app.kubernetes.io/version: v2.3.0
   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.2.3
+    app.kubernetes.io/version: v2.3.0
     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.2.3
+    app.kubernetes.io/version: v2.3.0
   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.2.3
+    app.kubernetes.io/version: v2.3.0
     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.2.3
+    app.kubernetes.io/version: v2.3.0
     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.2.3
+    app.kubernetes.io/version: v2.3.0
     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.2.3
+    app.kubernetes.io/version: v2.3.0
   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.2.3
+    app.kubernetes.io/version: v2.3.0
   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.2.3
+    app.kubernetes.io/version: v2.3.0
   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.2.3
+    app.kubernetes.io/version: v2.3.0
   name: source-controller
   namespace: kommander-flux