kustomize: use 'resources' instead of deprecated 'bases'

Author: james-callahan

scripts/olm-create-bundle.sh

@@ -107,8 +107,7 @@ trap "clean_up" EXIT
 mkdir -p "$TMP_DIR"
 cp -a "$SERVICE_CONTROLLER_SOURCE_PATH/config" "$TMP_DIR"
 
-# remove crd/common from bases to prevent inclusion of AdoptedResource CRD from being generated in the bundle directory
-sed -i.orig '/^bases:$/d' "$tmp_kustomize_config_dir/crd/kustomization.yaml"
+# remove crd/common from resources to prevent inclusion of AdoptedResource CRD from being generated in the bundle directory
 sed -i.orig '/- common$/d' "$tmp_kustomize_config_dir/crd/kustomization.yaml"
 
 # prepare bundle generate arguments

templates/config/crd/kustomization.yaml.tpl

@@ -1,8 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-bases:
-  - common
 resources:
+  - common
 {{- range .CRDNames }}
   - bases/{{ $.APIGroup }}_{{ . }}.yaml 
 {{- end }}

templates/config/default/kustomization.yaml.tpl

@@ -12,7 +12,7 @@
 #commonLabels:
 #  someName: someValue
 
-bases:
+resources:
 - ../crd
 - ../rbac
 - ../controller