Skip to content

Ensure helm release build consistently handles deployOLM toggle #2066

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
ddelnano merged 1 commit into from
Dec 19, 2024
Merged

Ensure helm release build consistently handles deployOLM toggle #2066

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
2 changes: 1 addition & 1 deletion ci/operator_helm_build_release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ cp "${repo_path}/k8s/operator/crd/base/px.dev_viziers.yaml" "${helm_path}/crds/v

# Updates templates with Helm-specific template functions.
helm_tmpl_checks="$(cat "${repo_path}/k8s/operator/helm/olm_template_checks.tmpl")"
sed -i "1c${helm_tmpl_checks}" "${repo_path}/k8s/operator/helm/templates/00_olm.yaml"
find "${repo_path}/k8s/operator/helm/templates" -type f -exec sed -i "/HELM_DEPLOY_OLM_PLACEHOLDER/c\\${helm_tmpl_checks}" {} \;
rm "${repo_path}/k8s/operator/helm/olm_template_checks.tmpl"

# Fetch all of the current charts in GCS, because generating the index needs all pre-existing tar versions present.
Expand Down
2 changes: 1 addition & 1 deletion k8s/operator/helm/templates/00_olm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{if .Values.deployOLM}}
{{if .Values.deployOLM}}{{- /* HELM_DEPLOY_OLM_PLACEHOLDER */ -}}
{{ if not (eq .Values.olmNamespace .Release.Namespace) }}
---
apiVersion: v1
Expand Down
2 changes: 1 addition & 1 deletion k8s/operator/helm/templates/csv-deleter.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{if .Values.deployOLM}}
{{if .Values.deployOLM}}{{- /* HELM_DEPLOY_OLM_PLACEHOLDER */ -}}
---
apiVersion: batch/v1
kind: Job
Expand Down
Loading