Merge pull request #709 from dprince/revert_bump_kustomize

Revert "Bump kustomize"

Makefile

@@ -215,7 +215,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
 GINKGO ?= $(LOCALBIN)/ginkgo
 
 ## Tool Versions
-KUSTOMIZE_VERSION ?= v5.0.1
+KUSTOMIZE_VERSION ?= v3.8.7
 CONTROLLER_TOOLS_VERSION ?= v0.11.1
 
 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"

config/crd/kustomization.yaml

@@ -6,22 +6,19 @@ resources:
 - bases/client.openstack.org_openstackclients.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
-patches:
+patchesStrategicMerge:
 # [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_core_openstackcontrolplanes.yaml
-#- path: patches/webhook_in_openstackclients.yaml
+#- patches/webhook_in_core_openstackcontrolplanes.yaml
+#- patches/webhook_in_openstackclients.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_core_openstackcontrolplanes.yaml
-#- path: patches/cainjection_in_openstackclients.yaml
+- patches/cainjection_in_core_openstackcontrolplanes.yaml
+#- patches/cainjection_in_openstackclients.yaml
 #+kubebuilder:scaffold:crdkustomizecainjectionpatch
 
 # the following config is for teaching kustomize how to do kustomization for CRDs.
 configurations:
 - kustomizeconfig.yaml
-
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization

config/default/kustomization.yaml

@@ -12,7 +12,7 @@ namePrefix: openstack-operator-
 #commonLabels:
 #  someName: someValue
 
-resources:
+bases:
 - ../crd
 - ../rbac
 - ../manager
@@ -24,27 +24,27 @@ resources:
 # [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
 #- ../prometheus
 
-patches:
+patchesStrategicMerge:
 # Protect the /metrics endpoint by putting it behind auth.
 # If you want your controller-manager to expose the /metrics
 # endpoint w/o any authn/z, please comment the following line.
-- path: manager_auth_proxy_patch.yaml
+- manager_auth_proxy_patch.yaml
 
 # Mount the controller config file for loading manager configurations
 # through a ComponentConfig type
-#- path: manager_config_patch.yaml
+#- manager_config_patch.yaml
 
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
 # crd/kustomization.yaml
-- path: manager_webhook_patch.yaml
+- manager_webhook_patch.yaml
 
 # [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'.
 # Uncomment 'CERTMANAGER' sections in crd/kustomization.yaml to enable the CA injection in the admission webhooks.
 # 'CERTMANAGER' needs to be enabled to use ca injection
-- path: webhookcainjection_patch.yaml
+- webhookcainjection_patch.yaml
 
 # Injects our custom images (ENV variable settings)
-- path: manager_default_images.yaml
+- manager_default_images.yaml
 
 # the following config is for teaching kustomize how to do var substitution
 vars:
@@ -75,6 +75,3 @@ vars:
 #    kind: Service
 #    version: v1
 #    name: webhook-service
-
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization

config/manifests/kustomization.yaml

@@ -9,9 +9,7 @@ resources:
 # [WEBHOOK] To enable webhooks, uncomment all the sections with [WEBHOOK] prefix.
 # Do NOT uncomment sections with prefix [CERTMANAGER], as OLM does not support cert-manager.
 # These patches remove the unnecessary "cert" volume and its manager container volumeMount.
-# apiVersion: kustomize.config.k8s.io/v1beta1
-# kind: Kustomization
-# patches:
+#patchesJson6902:
 #- target:
 #    group: apps
 #    version: v1

config/scorecard/kustomization.yaml

@@ -1,8 +1,6 @@
 resources:
 - bases/config.yaml
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-patches:
+patchesJson6902:
 - path: patches/basic.config.yaml
   target:
     group: scorecard.operatorframework.io