Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RedbackThomson merged 1 commit into from
Mar 7, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions scripts/olm-create-bundle.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions templates/config/crd/kustomization.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
bases:
- common
resources:
- common
{{- range .CRDNames }}
- bases/{{ $.APIGroup }}_{{ . }}.yaml
{{- end }}
2 changes: 1 addition & 1 deletion templates/config/default/kustomization.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#commonLabels:
# someName: someValue

bases:
resources:
- ../crd
- ../rbac
- ../controller
Expand Down