Skip to content

Commit ccd3261

Browse files
kustomize: use 'resources' instead of deprecated 'bases' (#420)
1 parent 9373b21 commit ccd3261

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

scripts/olm-create-bundle.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,7 @@ trap "clean_up" EXIT
107107
mkdir -p "$TMP_DIR"
108108
cp -a "$SERVICE_CONTROLLER_SOURCE_PATH/config" "$TMP_DIR"
109109

110-
# remove crd/common from bases to prevent inclusion of AdoptedResource CRD from being generated in the bundle directory
111-
sed -i.orig '/^bases:$/d' "$tmp_kustomize_config_dir/crd/kustomization.yaml"
110+
# remove crd/common from resources to prevent inclusion of AdoptedResource CRD from being generated in the bundle directory
112111
sed -i.orig '/- common$/d' "$tmp_kustomize_config_dir/crd/kustomization.yaml"
113112

114113
# prepare bundle generate arguments
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
3-
bases:
4-
- common
53
resources:
4+
- common
65
{{- range .CRDNames }}
76
- bases/{{ $.APIGroup }}_{{ . }}.yaml
87
{{- end }}

templates/config/default/kustomization.yaml.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#commonLabels:
1313
# someName: someValue
1414

15-
bases:
15+
resources:
1616
- ../crd
1717
- ../rbac
1818
- ../controller

0 commit comments

Comments
 (0)