From 70c1799d76fd57b6265dc5b7f7270cb4400c8c29 Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Sat, 8 Apr 2023 13:41:58 -0400 Subject: [PATCH] feat!: Upgrade Flux to v2.0.0-rc.1 and update apiVersions (#693) --- kubernetes/apps/cert-manager/cert-manager/ks.yaml | 4 ++-- kubernetes/apps/default/echo-server/ks.yaml | 2 +- kubernetes/apps/default/hajimari/ks.yaml | 2 +- kubernetes/apps/flux-system/addons/ks.yaml | 2 +- .../apps/flux-system/addons/webhooks/github/receiver.yaml | 8 ++++---- kubernetes/apps/flux-system/weave-gitops/ks.yaml | 2 +- kubernetes/apps/kube-system/kube-vip/ks.yaml | 2 +- .../apps/kube-system/local-path-provisioner/ks.yaml | 2 +- kubernetes/apps/kube-system/metrics-server/ks.yaml | 2 +- kubernetes/apps/kube-system/reloader/ks.yaml | 2 +- kubernetes/apps/monitoring/kubernetes-dashboard/ks.yaml | 2 +- kubernetes/apps/networking/cloudflare-ddns/ks.yaml | 2 +- kubernetes/apps/networking/external-dns/ks.yaml | 2 +- kubernetes/apps/networking/ingress-nginx/ks.yaml | 4 ++-- kubernetes/apps/networking/k8s-gateway/ks.yaml | 2 +- kubernetes/apps/networking/metallb/ks.yaml | 4 ++-- .../apps/system-upgrade/system-upgrade-controller/ks.yaml | 4 ++-- kubernetes/flux/apps.yaml | 5 ++--- kubernetes/flux/config/flux.yaml | 4 ++-- .../flux/repositories/git/local-path-provisioner.yaml | 2 +- tmpl/kubernetes/flux/cluster.yaml | 4 ++-- 21 files changed, 31 insertions(+), 32 deletions(-) diff --git a/kubernetes/apps/cert-manager/cert-manager/ks.yaml b/kubernetes/apps/cert-manager/cert-manager/ks.yaml index 058f1c2e631..7849953e3c2 100644 --- a/kubernetes/apps/cert-manager/cert-manager/ks.yaml +++ b/kubernetes/apps/cert-manager/cert-manager/ks.yaml @@ -1,5 +1,5 @@ --- -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: cluster-apps-cert-manager @@ -19,7 +19,7 @@ spec: retryInterval: 1m timeout: 3m --- -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: cluster-apps-cert-manager-issuers diff --git a/kubernetes/apps/default/echo-server/ks.yaml b/kubernetes/apps/default/echo-server/ks.yaml index e1bc0ccfb10..478e66c9f3d 100644 --- a/kubernetes/apps/default/echo-server/ks.yaml +++ b/kubernetes/apps/default/echo-server/ks.yaml @@ -1,5 +1,5 @@ --- -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: cluster-apps-echo-server diff --git a/kubernetes/apps/default/hajimari/ks.yaml b/kubernetes/apps/default/hajimari/ks.yaml index 4dfd4d66034..d336d000ad0 100644 --- a/kubernetes/apps/default/hajimari/ks.yaml +++ b/kubernetes/apps/default/hajimari/ks.yaml @@ -1,5 +1,5 @@ --- -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: cluster-apps-hajimari diff --git a/kubernetes/apps/flux-system/addons/ks.yaml b/kubernetes/apps/flux-system/addons/ks.yaml index 582153ada17..ed158e02275 100644 --- a/kubernetes/apps/flux-system/addons/ks.yaml +++ b/kubernetes/apps/flux-system/addons/ks.yaml @@ -1,5 +1,5 @@ --- -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: cluster-apps-flux-webhooks diff --git a/kubernetes/apps/flux-system/addons/webhooks/github/receiver.yaml b/kubernetes/apps/flux-system/addons/webhooks/github/receiver.yaml index 9a8428407c8..b4f78ca65b3 100644 --- a/kubernetes/apps/flux-system/addons/webhooks/github/receiver.yaml +++ b/kubernetes/apps/flux-system/addons/webhooks/github/receiver.yaml @@ -1,5 +1,5 @@ --- -apiVersion: notification.toolkit.fluxcd.io/v1beta1 +apiVersion: notification.toolkit.fluxcd.io/v1 kind: Receiver metadata: name: github-receiver @@ -12,15 +12,15 @@ spec: secretRef: name: github-webhook-token-secret resources: - - apiVersion: source.toolkit.fluxcd.io/v1beta2 + - apiVersion: source.toolkit.fluxcd.io/v1 kind: GitRepository name: home-kubernetes namespace: flux-system - - apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 + - apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization name: cluster namespace: flux-system - - apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 + - apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization name: cluster-apps namespace: flux-system diff --git a/kubernetes/apps/flux-system/weave-gitops/ks.yaml b/kubernetes/apps/flux-system/weave-gitops/ks.yaml index eacfe8c09f5..cc1bc1ad369 100644 --- a/kubernetes/apps/flux-system/weave-gitops/ks.yaml +++ b/kubernetes/apps/flux-system/weave-gitops/ks.yaml @@ -1,5 +1,5 @@ --- -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: cluster-apps-weave-gitops diff --git a/kubernetes/apps/kube-system/kube-vip/ks.yaml b/kubernetes/apps/kube-system/kube-vip/ks.yaml index 50214ca7aa1..ebdc4428fa8 100644 --- a/kubernetes/apps/kube-system/kube-vip/ks.yaml +++ b/kubernetes/apps/kube-system/kube-vip/ks.yaml @@ -1,5 +1,5 @@ --- -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: cluster-apps-kube-vip diff --git a/kubernetes/apps/kube-system/local-path-provisioner/ks.yaml b/kubernetes/apps/kube-system/local-path-provisioner/ks.yaml index c91f012368d..c607f9fa430 100644 --- a/kubernetes/apps/kube-system/local-path-provisioner/ks.yaml +++ b/kubernetes/apps/kube-system/local-path-provisioner/ks.yaml @@ -1,5 +1,5 @@ --- -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: cluster-apps-local-path-provisioner diff --git a/kubernetes/apps/kube-system/metrics-server/ks.yaml b/kubernetes/apps/kube-system/metrics-server/ks.yaml index 639b29da46b..89bd24c227f 100644 --- a/kubernetes/apps/kube-system/metrics-server/ks.yaml +++ b/kubernetes/apps/kube-system/metrics-server/ks.yaml @@ -1,5 +1,5 @@ --- -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: cluster-apps-metrics-server diff --git a/kubernetes/apps/kube-system/reloader/ks.yaml b/kubernetes/apps/kube-system/reloader/ks.yaml index f02d6476c88..aa78e68e2c7 100644 --- a/kubernetes/apps/kube-system/reloader/ks.yaml +++ b/kubernetes/apps/kube-system/reloader/ks.yaml @@ -1,5 +1,5 @@ --- -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: cluster-apps-reloader diff --git a/kubernetes/apps/monitoring/kubernetes-dashboard/ks.yaml b/kubernetes/apps/monitoring/kubernetes-dashboard/ks.yaml index d71ad1cb65f..8b04f13ca34 100644 --- a/kubernetes/apps/monitoring/kubernetes-dashboard/ks.yaml +++ b/kubernetes/apps/monitoring/kubernetes-dashboard/ks.yaml @@ -1,5 +1,5 @@ --- -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: cluster-apps-kubernetes-dashboard diff --git a/kubernetes/apps/networking/cloudflare-ddns/ks.yaml b/kubernetes/apps/networking/cloudflare-ddns/ks.yaml index c496af1443d..3361b4ea471 100644 --- a/kubernetes/apps/networking/cloudflare-ddns/ks.yaml +++ b/kubernetes/apps/networking/cloudflare-ddns/ks.yaml @@ -1,5 +1,5 @@ --- -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: cluster-apps-cloudflare-ddns diff --git a/kubernetes/apps/networking/external-dns/ks.yaml b/kubernetes/apps/networking/external-dns/ks.yaml index 9265b69d8bf..fa62cc7898b 100644 --- a/kubernetes/apps/networking/external-dns/ks.yaml +++ b/kubernetes/apps/networking/external-dns/ks.yaml @@ -1,5 +1,5 @@ --- -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: cluster-apps-external-dns diff --git a/kubernetes/apps/networking/ingress-nginx/ks.yaml b/kubernetes/apps/networking/ingress-nginx/ks.yaml index bca20d3570e..b947da2077d 100644 --- a/kubernetes/apps/networking/ingress-nginx/ks.yaml +++ b/kubernetes/apps/networking/ingress-nginx/ks.yaml @@ -1,5 +1,5 @@ --- -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: cluster-apps-ingress-nginx-certificates @@ -17,7 +17,7 @@ spec: retryInterval: 1m timeout: 3m --- -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: cluster-apps-ingress-nginx diff --git a/kubernetes/apps/networking/k8s-gateway/ks.yaml b/kubernetes/apps/networking/k8s-gateway/ks.yaml index 511df6622f6..3b54eba0a12 100644 --- a/kubernetes/apps/networking/k8s-gateway/ks.yaml +++ b/kubernetes/apps/networking/k8s-gateway/ks.yaml @@ -1,5 +1,5 @@ --- -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: cluster-apps-k8s-gateway diff --git a/kubernetes/apps/networking/metallb/ks.yaml b/kubernetes/apps/networking/metallb/ks.yaml index c8c88074ce4..f4544e32d4b 100644 --- a/kubernetes/apps/networking/metallb/ks.yaml +++ b/kubernetes/apps/networking/metallb/ks.yaml @@ -1,5 +1,5 @@ --- -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: cluster-apps-metallb @@ -19,7 +19,7 @@ spec: retryInterval: 1m timeout: 3m --- -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: cluster-apps-metallb-config diff --git a/kubernetes/apps/system-upgrade/system-upgrade-controller/ks.yaml b/kubernetes/apps/system-upgrade/system-upgrade-controller/ks.yaml index 091665c19f1..66803cae77f 100644 --- a/kubernetes/apps/system-upgrade/system-upgrade-controller/ks.yaml +++ b/kubernetes/apps/system-upgrade/system-upgrade-controller/ks.yaml @@ -1,5 +1,5 @@ --- -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: cluster-apps-system-upgrade-controller @@ -15,7 +15,7 @@ spec: retryInterval: 1m timeout: 3m --- -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: cluster-apps-system-upgrade-controller-plans diff --git a/kubernetes/flux/apps.yaml b/kubernetes/flux/apps.yaml index 4a847d0c8db..43c3a05d689 100644 --- a/kubernetes/flux/apps.yaml +++ b/kubernetes/flux/apps.yaml @@ -1,5 +1,5 @@ --- -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: cluster-apps @@ -23,7 +23,7 @@ spec: name: cluster-secrets patches: - patch: |- - apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 + apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: not-used @@ -40,6 +40,5 @@ spec: name: cluster-secrets target: group: kustomize.toolkit.fluxcd.io - version: v1beta2 kind: Kustomization labelSelector: substitution.flux.home.arpa/disabled notin (true) diff --git a/kubernetes/flux/config/flux.yaml b/kubernetes/flux/config/flux.yaml index 7663d7b3bfd..140fe95dbd0 100644 --- a/kubernetes/flux/config/flux.yaml +++ b/kubernetes/flux/config/flux.yaml @@ -8,9 +8,9 @@ spec: interval: 10m url: oci://ghcr.io/fluxcd/flux-manifests ref: - tag: v0.41.2 + tag: v2.0.0-rc.1 --- -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: flux diff --git a/kubernetes/flux/repositories/git/local-path-provisioner.yaml b/kubernetes/flux/repositories/git/local-path-provisioner.yaml index 0660938077f..669fb0533d6 100644 --- a/kubernetes/flux/repositories/git/local-path-provisioner.yaml +++ b/kubernetes/flux/repositories/git/local-path-provisioner.yaml @@ -1,5 +1,5 @@ --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.toolkit.fluxcd.io/v1 kind: GitRepository metadata: name: local-path-provisioner diff --git a/tmpl/kubernetes/flux/cluster.yaml b/tmpl/kubernetes/flux/cluster.yaml index bfe7a5deaaf..8d42e24b327 100644 --- a/tmpl/kubernetes/flux/cluster.yaml +++ b/tmpl/kubernetes/flux/cluster.yaml @@ -1,5 +1,5 @@ --- -apiVersion: source.toolkit.fluxcd.io/v1beta2 +apiVersion: source.toolkit.fluxcd.io/v1 kind: GitRepository metadata: name: home-kubernetes @@ -15,7 +15,7 @@ spec: # include kubernetes directory !/kubernetes --- -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: name: cluster