Merge pull request #44 from mesosphere/tga/flux-bump-0221

Bump flux to 0.22.1
mesosphere · Nov 12, 2021 · ac62d24 · ac62d24
2 parents 813dacd + 95f91bd
commit ac62d24
Show file tree

Hide file tree

Showing 48 changed files with 607 additions and 45 deletions.
diff --git a/grafana-dashboards/centralized/kustomization.yaml b/grafana-dashboards/centralized/kustomization.yaml
@@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 configMapGenerator:
   - name: grafana-dashboards-centralized
+    namespace: ${releaseNamespace}
     files:
       - global-overview.json
 generatorOptions:

diff --git a/grafana-dashboards/core-components/kustomization.yaml b/grafana-dashboards/core-components/kustomization.yaml
@@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 configMapGenerator:
   - name: grafana-dashboards-core-components
+    namespace: ${releaseNamespace}
     files:
       - calico.json
       - flux-control-plane.json

diff --git a/grafana-dashboards/kube-prometheus-stack/kustomization.yaml b/grafana-dashboards/kube-prometheus-stack/kustomization.yaml
@@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 configMapGenerator:
   - name: grafana-dashboards-kube-prometheus-stack
+    namespace: ${releaseNamespace}
     files:
       - grafana.json
 generatorOptions:

diff --git a/grafana-dashboards/traefik/kustomization.yaml b/grafana-dashboards/traefik/kustomization.yaml
@@ -3,6 +3,7 @@ kind: Kustomization
 namespace: ${releaseNamespace}
 configMapGenerator:
   - name: grafana-dashboards-traefik
+    namespace: ${releaseNamespace}
     files:
       - traefik.json
 generatorOptions:

diff --git a/grafana-dashboards/velero/kustomization.yaml b/grafana-dashboards/velero/kustomization.yaml
@@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 configMapGenerator:
   - name: grafana-dashboards-velero
+    namespace: ${releaseNamespace}
     files:
       - velero.json
 generatorOptions:

diff --git a/services/centralized-kubecost/0.20.0/post-install-jobs.yaml b/services/centralized-kubecost/0.20.0/post-install-jobs.yaml
@@ -1,4 +1,4 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
 kind: Kustomization
 metadata:
   name: centralized-kubecost-post-install-jobs

diff --git a/services/centralized-kubecost/0.20.0/release.yaml b/services/centralized-kubecost/0.20.0/release.yaml
@@ -1,4 +1,4 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
 kind: Kustomization
 metadata:
   name: centralized-kubecost-release

diff --git a/services/cert-manager/0.2.7/release.yaml b/services/cert-manager/0.2.7/release.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
 kind: Kustomization
 metadata:
   name: cert-manager-release

diff --git a/services/cert-manager/0.2.7/root-ca.yaml b/services/cert-manager/0.2.7/root-ca.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
 kind: Kustomization
 metadata:
   name: cert-manager-root-ca

diff --git a/services/istio/1.9.1/helmrelease.yaml b/services/istio/1.9.1/helmrelease.yaml
@@ -1,4 +1,4 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
 kind: Kustomization
 metadata:
   name: istio-helmrelease

diff --git a/services/istio/1.9.1/istio-ca.yaml b/services/istio/1.9.1/istio-ca.yaml
@@ -1,4 +1,4 @@
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
 kind: Kustomization
 metadata:
   name: istio-ca

diff --git a/services/istio/1.9.1/istio-system-namespace.yaml b/services/istio/1.9.1/istio-system-namespace.yaml
@@ -1,7 +1,7 @@
 # After the HelmRelease becomes the only object created by Kustomizations
 # in the `istio-system` Namespace, creating this Namespace should be made
 # a responsibility of the HelmRelease (see D2IQ-80630).
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
+apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
 kind: Kustomization
 metadata:
   name: istio-system-namespace

diff --git a/...es/kommander-flux/0.17.2/defaults/cm.yaml → ...es/kommander-flux/0.22.1/defaults/cm.yaml b/...es/kommander-flux/0.17.2/defaults/cm.yaml → ...es/kommander-flux/0.22.1/defaults/cm.yaml
@@ -4,5 +4,5 @@ data:
     ---
 kind: ConfigMap
 metadata:
-  name: kommander-flux-0.17.2-d2iq-defaults
+  name: kommander-flux-0.22.1-d2iq-defaults
   namespace: ${releaseNamespace}
diff --git a/...r-flux/0.17.2/defaults/kustomization.yaml → ...r-flux/0.22.1/defaults/kustomization.yaml b/...r-flux/0.17.2/defaults/kustomization.yaml → ...r-flux/0.22.1/defaults/kustomization.yaml
diff --git a/.../kommander-flux/0.17.2/kustomization.yaml → .../kommander-flux/0.22.1/kustomization.yaml b/.../kommander-flux/0.17.2/kustomization.yaml → .../kommander-flux/0.22.1/kustomization.yaml
diff --git a/...der-flux/0.17.2/patch-proxy-env-vars.yaml → ...der-flux/0.22.1/patch-proxy-env-vars.yaml b/...der-flux/0.17.2/patch-proxy-env-vars.yaml → ...der-flux/0.22.1/patch-proxy-env-vars.yaml
diff --git a/...7.2/patch-source-ctrl-network-policy.yaml → ...2.1/patch-source-ctrl-network-policy.yaml b/...7.2/patch-source-ctrl-network-policy.yaml → ...2.1/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:
   labels:
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v0.17.2
+    app.kubernetes.io/version: v0.22.1
   name: alerts.notification.toolkit.fluxcd.io
 spec:
   group: notification.toolkit.fluxcd.io
@@ -120,6 +120,8 @@ spec:
             - providerRef
             type: object
           status:
+            default:
+              observedGeneration: -1
             description: AlertStatus defines the observed state of Alert
             properties:
               conditions:

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:
   labels:
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v0.17.2
+    app.kubernetes.io/version: v0.22.1
   name: buckets.source.toolkit.fluxcd.io
 spec:
   group: source.toolkit.fluxcd.io
@@ -76,6 +76,7 @@ spec:
                 enum:
                 - generic
                 - aws
+                - gcp
                 type: string
               region:
                 description: The bucket region.

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:
   labels:
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v0.17.2
+    app.kubernetes.io/version: v0.22.1
   name: gitrepositories.source.toolkit.fluxcd.io
 spec:
   group: source.toolkit.fluxcd.io
@@ -107,7 +107,6 @@ spec:
                   defaults to master branch.
                 properties:
                   branch:
-                    default: master
                     description: The Git branch to checkout, defaults to master.
                     type: string
                   commit:

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:
   labels:
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v0.17.2
+    app.kubernetes.io/version: v0.22.1
   name: helmcharts.source.toolkit.fluxcd.io
 spec:
   group: source.toolkit.fluxcd.io
@@ -69,6 +69,16 @@ spec:
               interval:
                 description: The interval at which to check the Source for updates.
                 type: string
+              reconcileStrategy:
+                default: ChartVersion
+                description: Determines what enables the creation of a new artifact.
+                  Valid values are ('ChartVersion', 'Revision'). See the documentation
+                  of the values for an explanation on their behavior. Defaults to
+                  ChartVersion when omitted.
+                enum:
+                - ChartVersion
+                - Revision
+                type: string
               sourceRef:
                 description: The reference to the Source the chart is available at.
                 properties:

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:
   labels:
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v0.17.2
+    app.kubernetes.io/version: v0.22.1
   name: helmreleases.helm.toolkit.fluxcd.io
 spec:
   group: helm.toolkit.fluxcd.io
@@ -66,6 +66,16 @@ spec:
                         description: Interval at which to check the v1beta1.Source
                           for updates. Defaults to 'HelmReleaseSpec.Interval'.
                         type: string
+                      reconcileStrategy:
+                        default: ChartVersion
+                        description: Determines what enables the creation of a new
+                          artifact. Valid values are ('ChartVersion', 'Revision').
+                          See the documentation of the values for an explanation on
+                          their behavior. Defaults to ChartVersion when omitted.
+                        enum:
+                        - ChartVersion
+                        - Revision
+                        type: string
                       sourceRef:
                         description: The name and namespace of the v1beta1.Source
                           the chart is available at.

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:
   labels:
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v0.17.2
+    app.kubernetes.io/version: v0.22.1
   name: helmrepositories.source.toolkit.fluxcd.io
 spec:
   group: source.toolkit.fluxcd.io