Merge pull request #358 from cloud-pi-native/fix/cnpg-backups-and-arg…

…ocd-proxy Fix/cnpg backups and argocd proxy
cloud-pi-native · Oct 14, 2024 · 3b93398 · 3b93398
2 parents 3e4ca03 + 96d13c0
commit 3b93398
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/roles/argocd/templates/values/10-proxy.j2 b/roles/argocd/templates/values/10-proxy.j2
@@ -6,7 +6,7 @@ server:
     - name: HTTPS_PROXY
       value: "{{ dsc.proxy.https_proxy }}"
     - name: NO_PROXY
-      value: "{{ dsc.proxy.no_proxy }},argo-argo-cd-repo-server"
+      value: "{{ dsc.proxy.no_proxy }},{{ dsc_name }}-argocd-repo-server"
 
 repoServer:
   env: *extraEnvVars

diff --git a/roles/console-dso/templates/values/00-main.j2 b/roles/console-dso/templates/values/00-main.j2
@@ -44,7 +44,7 @@ cnpg:
     pre.hook.backup.velero.io/on-error: Fail
     pre.hook.backup.velero.io/timeout: 90s
 {% endif %}
-{% if dsc.global.backup.cnpg.enabled %}
+{% if dsc.global.backup.cnpg.enabled and dsc.console.cnpg.mode != "restore" %}
   backup:
     enabled: "{{ dsc.global.backup.cnpg.enabled }}"
     destinationPath: "s3://{{ dsc.global.backup.s3.bucketName }}/{{ dsc.global.backup.cnpg.pathPrefix }}"

diff --git a/roles/gitlab/templates/pg-cluster-gitlab.yaml.j2 b/roles/gitlab/templates/pg-cluster-gitlab.yaml.j2
@@ -96,7 +96,7 @@ spec:
   monitoring:
     enablePodMonitor: {{ dsc.global.metrics.enabled }}
 
-{% if dsc.global.backup.cnpg.enabled %}
+{% if dsc.global.backup.cnpg.enabled and dsc.gitlab.cnpg.mode != "restore" %}
   backup:
     barmanObjectStore:
       destinationPath: "s3://{{ dsc.global.backup.s3.bucketName }}/{{ dsc.global.backup.cnpg.pathPrefix }}"

diff --git a/roles/harbor/templates/pg-cluster-harbor.yaml.j2 b/roles/harbor/templates/pg-cluster-harbor.yaml.j2
@@ -96,7 +96,7 @@ spec:
   monitoring:
     enablePodMonitor: {{ dsc.global.metrics.enabled }}
 
-{% if dsc.global.backup.cnpg.enabled %}
+{% if dsc.global.backup.cnpg.enabled and dsc.harbor.cnpg.mode != "restore" %}
   backup:
     barmanObjectStore:
       destinationPath: "s3://{{ dsc.global.backup.s3.bucketName }}/{{ dsc.global.backup.cnpg.pathPrefix }}"

diff --git a/roles/keycloak/templates/pg-cluster-keycloak.yaml.j2 b/roles/keycloak/templates/pg-cluster-keycloak.yaml.j2
@@ -96,7 +96,7 @@ spec:
   monitoring:
     enablePodMonitor: {{ dsc.global.metrics.enabled }}
 
-{% if dsc.global.backup.cnpg.enabled %}
+{% if dsc.global.backup.cnpg.enabled and dsc.keycloak.cnpg.mode != "restore" %}
   backup:
     barmanObjectStore:
       destinationPath: "s3://{{ dsc.global.backup.s3.bucketName }}/{{ dsc.global.backup.cnpg.pathPrefix }}"

diff --git a/roles/sonarqube/templates/pg-cluster-sonar.yaml.j2 b/roles/sonarqube/templates/pg-cluster-sonar.yaml.j2
@@ -96,7 +96,7 @@ spec:
   monitoring:
     enablePodMonitor: {{ dsc.global.metrics.enabled }}
 
-{% if dsc.global.backup.cnpg.enabled %}
+{% if dsc.global.backup.cnpg.enabled and dsc.sonarqube.cnpg.mode != "restore" %}
   backup:
     barmanObjectStore:
       destinationPath: "s3://{{ dsc.global.backup.s3.bucketName }}/{{ dsc.global.backup.cnpg.pathPrefix }}"