fix warnings in kustomization file

config/crd/kustomization.yaml

@@ -1,6 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-commonLabels:
+labels:
   cluster.x-k8s.io/v1beta1: v1beta1_v1beta2
 
 # This kustomization.yaml is not intended to be run by itself,
@@ -18,7 +18,7 @@ resources:
 - bases/infrastructure.cluster.x-k8s.io_ibmvpcclustertemplates.yaml
 # +kubebuilder:scaffold:crdkustomizeresource
 
-patchesStrategicMerge:
+patches:
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
 # patches here are for enabling the conversion webhook for each CRD
 - patches/webhook_in_ibmvpcclusters.yaml

config/default/kustomization.yaml

@@ -8,10 +8,10 @@ namespace: capi-ibmcloud-system
 # field above.
 namePrefix: capi-ibmcloud-
 
-commonLabels:
+labels:
   cluster.x-k8s.io/provider: "infrastructure-ibmcloud"
 
-bases:
+resources:
 - ../crd
 - ../rbac
 - ../manager
@@ -26,7 +26,7 @@ bases:
 resources:
 - credentials.yaml
 
-patchesStrategicMerge:
+patches:
 - manager_credentials_patch.yaml
 - manager_image_patch.yaml
 - manager_pull_policy.yaml
@@ -41,7 +41,7 @@ patchesStrategicMerge:
 - webhookcainjection_patch.yaml
 
 # the following config is for teaching kustomize how to do var substitution
-vars:
+replacements:
 # [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER' prefix.
 - name: CERTIFICATE_NAMESPACE # namespace of the certificate CR
   objref:

test/e2e/data/templates/cluster-template-powervs-md-remediation/kustomization.yaml

@@ -2,5 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../../../../../templates/cluster-template-powervs-cloud-provider.yaml
-patchesStrategicMerge:
+patches:
   - patches/mhc-label.yaml