Skip to content

Make externalClusters conditional to prevent null value in standalone mode #772

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

Closed
philippemnoel wants to merge 1 commit into from
Closed

Make externalClusters conditional to prevent null value in standalone mode #772

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 .github/actions/deploy-cluster/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ runs:
env:
NAMESPACE: ${{ inputs.namespace }}
run: |
cat <<EOF | kubectl apply -f -
cat <<EOF | kubectl apply -f --server-side --validate=strict -f -
# Example of PostgreSQL cluster
apiVersion: postgresql.cnpg.io/v1
kind: Cluster
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/deploy-operator/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ runs:
helm dependency update charts/cloudnative-pg

helm upgrade
--install
--install
--namespace $NAMESPACE
--create-namespace
--set config.clusterWide=$CLUSTER_WIDE
Expand Down
11 changes: 9 additions & 2 deletions charts/cluster/templates/_external_clusters.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
{{- define "cluster.externalClusters" -}}
externalClusters:
{{- if eq .Values.mode "standalone" }}
{{- else if eq .Values.mode "recovery" }}
{{- if .Values.cluster.externalClusters }}
externalClusters:
{{- range .Values.cluster.externalClusters }}
- {{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}
{{- else }}
externalClusters:
{{- if eq .Values.mode "recovery" }}
{{- if eq .Values.recovery.method "pg_basebackup" }}
- name: pgBaseBackupSource
{{- include "cluster.externalSourceCluster" .Values.recovery.pgBaseBackup.source | nindent 4 }}
Expand Down