From c0f36701168d1ab104769fc58a86934dda63a212 Mon Sep 17 00:00:00 2001 From: kranurag7 Date: Mon, 24 Jun 2024 12:49:39 +0530 Subject: [PATCH] update kustomize to v5.4.2 version Signed-off-by: kranurag7 --- Makefile | 2 +- config/crd/kustomization.yaml | 22 ++-------------------- config/default/kustomization.yaml | 8 +++++--- config/localmode/kustomization.yaml | 8 +++++--- config/manager/kustomization.yaml | 2 ++ config/prometheus/kustomization.yaml | 2 ++ config/rbac/kustomization.yaml | 10 ++++++---- 7 files changed, 23 insertions(+), 31 deletions(-) diff --git a/Makefile b/Makefile index 341cc1eb..d12fb23f 100644 --- a/Makefile +++ b/Makefile @@ -94,7 +94,7 @@ $(CONTROLLER_GEN): # Build controller-gen from tools folder. KUSTOMIZE := $(abspath $(TOOLS_BIN_DIR)/kustomize) kustomize: $(KUSTOMIZE) ## Build a local copy of kustomize $(KUSTOMIZE): # Build kustomize from tools folder. - go install sigs.k8s.io/kustomize/kustomize/v4@v4.5.7 + go install sigs.k8s.io/kustomize/kustomize/v5@v5.4.2 TILT := $(abspath $(TOOLS_BIN_DIR)/tilt) tilt: $(TILT) ## Build a local copy of tilt diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml index 7336c127..7febb790 100644 --- a/config/crd/kustomization.yaml +++ b/config/crd/kustomization.yaml @@ -7,23 +7,5 @@ resources: - bases/infrastructure.clusterstack.x-k8s.io_openstacknodeimagereleases.yaml #+kubebuilder:scaffold:crdkustomizeresource -patches: -# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix. -# patches here are for enabling the conversion webhook for each CRD -#- path: patches/webhook_in_openstackclusterstackreleases.yaml -#- path: patches/webhook_in_openstackclusterstackreleasetemplates.yaml -#- path: patches/webhook_in_openstacknodeimagereleases.yaml -#+kubebuilder:scaffold:crdkustomizewebhookpatch - -# [CERTMANAGER] To enable cert-manager, uncomment all the sections with [CERTMANAGER] prefix. -# patches here are for enabling the CA injection for each CRD -#- path: patches/cainjection_in_openstackclusterstackreleases.yaml -#- path: patches/cainjection_in_openstackclusterstackreleasetemplates.yaml -#- path: patches/cainjection_in_openstacknodeimagereleases.yaml -#+kubebuilder:scaffold:crdkustomizecainjectionpatch - -# [WEBHOOK] To enable webhook, uncomment the following section -# the following config is for teaching kustomize how to do kustomization for CRDs. - -#configurations: -#- kustomizeconfig.yaml +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 5012e20f..1a0841f9 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -5,6 +5,8 @@ resources: - ../crd - ../rbac - ../manager -patchesStrategicMerge: -- manager_auth_proxy_patch.yaml -- manager_config_patch.yaml +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +patches: +- path: manager_auth_proxy_patch.yaml +- path: manager_config_patch.yaml diff --git a/config/localmode/kustomization.yaml b/config/localmode/kustomization.yaml index 5012e20f..1a0841f9 100644 --- a/config/localmode/kustomization.yaml +++ b/config/localmode/kustomization.yaml @@ -5,6 +5,8 @@ resources: - ../crd - ../rbac - ../manager -patchesStrategicMerge: -- manager_auth_proxy_patch.yaml -- manager_config_patch.yaml +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +patches: +- path: manager_auth_proxy_patch.yaml +- path: manager_config_patch.yaml diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index d797a472..83217abb 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -1,3 +1,5 @@ resources: - manager.yaml - credentials.yaml +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization diff --git a/config/prometheus/kustomization.yaml b/config/prometheus/kustomization.yaml index ed137168..a5a7cbb7 100644 --- a/config/prometheus/kustomization.yaml +++ b/config/prometheus/kustomization.yaml @@ -1,2 +1,4 @@ resources: - monitor.yaml +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization diff --git a/config/rbac/kustomization.yaml b/config/rbac/kustomization.yaml index 731832a6..9fa6ffee 100644 --- a/config/rbac/kustomization.yaml +++ b/config/rbac/kustomization.yaml @@ -1,18 +1,20 @@ -resources: # All RBAC will be applied under this service account in # the deployment namespace. You may comment out this resource # if your manager will use a service account that exists at # runtime. Be sure to update RoleBinding and ClusterRoleBinding # subjects if changing service account names. +# Comment the following 4 lines if you want to disable +# the auth proxy (https://github.com/brancz/kube-rbac-proxy) +# which protects your /metrics endpoint. +resources: - service_account.yaml - role.yaml - role_binding.yaml - leader_election_role.yaml - leader_election_role_binding.yaml -# Comment the following 4 lines if you want to disable -# the auth proxy (https://github.com/brancz/kube-rbac-proxy) -# which protects your /metrics endpoint. - auth_proxy_service.yaml - auth_proxy_role.yaml - auth_proxy_role_binding.yaml - auth_proxy_client_clusterrole.yaml +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization