From 09a6bfcb79a3de6bc2bce59ddaf98a495d640f3e Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Fri, 15 Apr 2022 21:56:30 -0400 Subject: [PATCH] feat(cluster): move system-upgrade-controller to crds and apps Signed-off-by: Devin Buhl --- .../system-upgrade-controller/kustomization.yaml | 10 ++++++++-- .../{agent-plan.yaml => plans/agent.yaml} | 0 .../system-upgrade-controller/plans/kustomization.yaml | 6 ++++++ .../{server-plan.yaml => plans/server.yaml} | 0 .../system-upgrade-patches.yaml | 9 +++++++++ cluster/core/kustomization.yaml | 1 - cluster/core/namespaces/kustomization.yaml | 1 + cluster/core/namespaces/system-upgrade.yaml | 5 +++++ cluster/core/system-upgrade/kustomization.yaml | 8 -------- cluster/crds/kustomization.yaml | 1 + .../crds/system-upgrade-controller/kustomization.yaml | 6 ++++++ 11 files changed, 36 insertions(+), 11 deletions(-) rename cluster/apps/system-upgrade/system-upgrade-controller/{agent-plan.yaml => plans/agent.yaml} (100%) create mode 100644 cluster/apps/system-upgrade/system-upgrade-controller/plans/kustomization.yaml rename cluster/apps/system-upgrade/system-upgrade-controller/{server-plan.yaml => plans/server.yaml} (100%) create mode 100644 cluster/apps/system-upgrade/system-upgrade-controller/system-upgrade-patches.yaml create mode 100644 cluster/core/namespaces/system-upgrade.yaml delete mode 100644 cluster/core/system-upgrade/kustomization.yaml create mode 100644 cluster/crds/system-upgrade-controller/kustomization.yaml diff --git a/cluster/apps/system-upgrade/system-upgrade-controller/kustomization.yaml b/cluster/apps/system-upgrade/system-upgrade-controller/kustomization.yaml index d553eada..2951f5d2 100644 --- a/cluster/apps/system-upgrade/system-upgrade-controller/kustomization.yaml +++ b/cluster/apps/system-upgrade/system-upgrade-controller/kustomization.yaml @@ -2,5 +2,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - server-plan.yaml - - agent-plan.yaml + - github.com/rancher/system-upgrade-controller?ref=v0.9.1 + - plans +images: + - name: rancher/system-upgrade-controller + newName: docker.io/rancher/system-upgrade-controller + newTag: v0.9.1 +patchesStrategicMerge: + - ./system-upgrade-patches.yaml diff --git a/cluster/apps/system-upgrade/system-upgrade-controller/agent-plan.yaml b/cluster/apps/system-upgrade/system-upgrade-controller/plans/agent.yaml similarity index 100% rename from cluster/apps/system-upgrade/system-upgrade-controller/agent-plan.yaml rename to cluster/apps/system-upgrade/system-upgrade-controller/plans/agent.yaml diff --git a/cluster/apps/system-upgrade/system-upgrade-controller/plans/kustomization.yaml b/cluster/apps/system-upgrade/system-upgrade-controller/plans/kustomization.yaml new file mode 100644 index 00000000..e51bcd70 --- /dev/null +++ b/cluster/apps/system-upgrade/system-upgrade-controller/plans/kustomization.yaml @@ -0,0 +1,6 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - agent.yaml + - server.yaml diff --git a/cluster/apps/system-upgrade/system-upgrade-controller/server-plan.yaml b/cluster/apps/system-upgrade/system-upgrade-controller/plans/server.yaml similarity index 100% rename from cluster/apps/system-upgrade/system-upgrade-controller/server-plan.yaml rename to cluster/apps/system-upgrade/system-upgrade-controller/plans/server.yaml diff --git a/cluster/apps/system-upgrade/system-upgrade-controller/system-upgrade-patches.yaml b/cluster/apps/system-upgrade/system-upgrade-controller/system-upgrade-patches.yaml new file mode 100644 index 00000000..2161d7b0 --- /dev/null +++ b/cluster/apps/system-upgrade/system-upgrade-controller/system-upgrade-patches.yaml @@ -0,0 +1,9 @@ +--- +# Namespace should already exist +# Delete the system-upgrade namespace +# from the kustomization +$patch: delete +apiVersion: v1 +kind: Namespace +metadata: + name: system-upgrade diff --git a/cluster/core/kustomization.yaml b/cluster/core/kustomization.yaml index 41fcb045..9882a235 100644 --- a/cluster/core/kustomization.yaml +++ b/cluster/core/kustomization.yaml @@ -5,4 +5,3 @@ resources: - cert-manager - kube-system - metallb-system - - system-upgrade diff --git a/cluster/core/namespaces/kustomization.yaml b/cluster/core/namespaces/kustomization.yaml index 18a171a9..feecf3d0 100644 --- a/cluster/core/namespaces/kustomization.yaml +++ b/cluster/core/namespaces/kustomization.yaml @@ -4,3 +4,4 @@ resources: - cert-manager.yaml - metallb-system.yaml - networking.yaml + - system-upgrade.yaml diff --git a/cluster/core/namespaces/system-upgrade.yaml b/cluster/core/namespaces/system-upgrade.yaml new file mode 100644 index 00000000..faec62d7 --- /dev/null +++ b/cluster/core/namespaces/system-upgrade.yaml @@ -0,0 +1,5 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + name: system-upgrade diff --git a/cluster/core/system-upgrade/kustomization.yaml b/cluster/core/system-upgrade/kustomization.yaml deleted file mode 100644 index fa926626..00000000 --- a/cluster/core/system-upgrade/kustomization.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - github.com/rancher/system-upgrade-controller?ref=v0.9.1 -images: - - name: rancher/system-upgrade-controller - newTag: v0.9.1 diff --git a/cluster/crds/kustomization.yaml b/cluster/crds/kustomization.yaml index ca6efa96..5b7db55d 100644 --- a/cluster/crds/kustomization.yaml +++ b/cluster/crds/kustomization.yaml @@ -2,4 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - cert-manager + - system-upgrade-controller - traefik diff --git a/cluster/crds/system-upgrade-controller/kustomization.yaml b/cluster/crds/system-upgrade-controller/kustomization.yaml new file mode 100644 index 00000000..e5b64dda --- /dev/null +++ b/cluster/crds/system-upgrade-controller/kustomization.yaml @@ -0,0 +1,6 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + # renovate: registryUrl=https://github.com/rancher/system-upgrade-controller + - https://github.com/rancher/system-upgrade-controller/releases/download/v0.9.1/crd.yaml