From 0cec2f9c29860a8cc18d4a6fa7d5f3b251e187a3 Mon Sep 17 00:00:00 2001 From: surskitt <1909963+surskitt@users.noreply.github.com> Date: Fri, 9 Feb 2024 19:00:50 +0000 Subject: [PATCH] fix(bootstrap): patch flux resource names to match oci manifests (#1299) * fix(bootstrap): patch flux resource names to match oci manifests Resource names differ in the installation manifests installed by the install file found on the flux/fluxcd2 github repo and the oci artifact oci://ghcr.io/fluxcd/flux-manifests. This commit introduces patches to the bootstrap kustomization to rename the resources to match the oci manifests. * Update bootstrap/templates/kubernetes/bootstrap/kustomization.yaml.j2 --------- Co-authored-by: surskitt Co-authored-by: Devin Buhl --- .../bootstrap/kustomization.yaml.j2 | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/bootstrap/templates/kubernetes/bootstrap/kustomization.yaml.j2 b/bootstrap/templates/kubernetes/bootstrap/kustomization.yaml.j2 index fa9d4450..85e8f703 100644 --- a/bootstrap/templates/kubernetes/bootstrap/kustomization.yaml.j2 +++ b/bootstrap/templates/kubernetes/bootstrap/kustomization.yaml.j2 @@ -16,3 +16,46 @@ patches: target: group: networking.k8s.io kind: NetworkPolicy + # Resources renamed to match those installed by oci://ghcr.io/fluxcd/flux-manifests + - target: + kind: ResourceQuota + name: critical-pods + patch: | + - op: replace + path: /metadata/name + value: critical-pods-flux-system + - target: + kind: ClusterRoleBinding + name: cluster-reconciler + patch: | + - op: replace + path: /metadata/name + value: cluster-reconciler-flux-system + - target: + kind: ClusterRoleBinding + name: crd-controller + patch: | + - op: replace + path: /metadata/name + value: crd-controller-flux-system + - target: + kind: ClusterRole + name: crd-controller + patch: | + - op: replace + path: /metadata/name + value: crd-controller-flux-system + - target: + kind: ClusterRole + name: flux-edit + patch: | + - op: replace + path: /metadata/name + value: flux-edit-flux-system + - target: + kind: ClusterRole + name: flux-view + patch: | + - op: replace + path: /metadata/name + value: flux-view-flux-system