Skip to content

Commit fa727e4

Browse files
committed
Proper conditional external cluster
1 parent 3ed9381 commit fa727e4

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

.github/actions/deploy-cluster/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ runs:
1313
env:
1414
NAMESPACE: ${{ inputs.namespace }}
1515
run: |
16-
cat <<EOF | kubectl apply -f -
16+
cat <<EOF | kubectl apply -f --server-side --validate=strict -f -
1717
# Example of PostgreSQL cluster
1818
apiVersion: postgresql.cnpg.io/v1
1919
kind: Cluster

.github/actions/deploy-operator/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ runs:
2121
helm dependency update charts/cloudnative-pg
2222

2323
helm upgrade
24-
--install
24+
--install
2525
--namespace $NAMESPACE
2626
--create-namespace
2727
--set config.clusterWide=$CLUSTER_WIDE

charts/cluster/templates/_external_clusters.tpl

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
{{- define "cluster.externalClusters" -}}
2-
externalClusters:
32
{{- if eq .Values.mode "standalone" }}
4-
{{- else if eq .Values.mode "recovery" }}
3+
{{- if .Values.cluster.externalClusters }}
4+
externalClusters:
5+
{{- range .Values.cluster.externalClusters }}
6+
- {{- toYaml . | nindent 4 }}
7+
{{- end }}
8+
{{- end }}
9+
{{- else }}
10+
externalClusters:
11+
{{- if eq .Values.mode "recovery" }}
512
{{- if eq .Values.recovery.method "pg_basebackup" }}
613
- name: pgBaseBackupSource
714
{{- include "cluster.externalSourceCluster" .Values.recovery.pgBaseBackup.source | nindent 4 }}

0 commit comments

Comments
 (0)