[proxy] Implement and condition correctly

Signed-off-by: c.josso <[email protected]>
goharbor · Sep 6, 2024 · 5f6bbf2 · 5f6bbf2
1 parent 47547b7
commit 5f6bbf2
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/Chart.yaml b/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: harbor
-version: 1.15.1
+version: 1.15.1-proxy-0.2
 appVersion: 2.11.1
 description: An open source trusted cloud native registry that stores, signs, and scans content
 keywords:

diff --git a/templates/core/core-cm.yaml b/templates/core/core-cm.yaml
@@ -48,7 +48,7 @@ data:
   {{- if .Values.uaaSecretName }}
   UAA_CA_ROOT: "/etc/core/auth-ca/auth-ca.crt"
   {{- end }}
-  {{- if has "core" .Values.proxy.components and not .Values.proxy.existingSecret }}
+  {{- if and (has "core" .Values.proxy.components) (not .Values.proxy.existingSecret) }}
   HTTP_PROXY: "{{ .Values.proxy.httpProxy }}"
   HTTPS_PROXY: "{{ .Values.proxy.httpsProxy }}"
   {{- end }}

diff --git a/templates/exporter/exporter-cm-env.yaml b/templates/exporter/exporter-cm-env.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
 {{ include "harbor.labels" . | indent 4 }}
 data:
-  {{- if has "jobservice" .Values.proxy.components and not .Values.proxy.existingSecret }}
+  {{- if and (has "jobservice" .Values.proxy.components) (not .Values.proxy.existingSecret) }}
   HTTP_PROXY: "{{ .Values.proxy.httpProxy }}"
   HTTPS_PROXY: "{{ .Values.proxy.httpsProxy }}"
   {{- end }}

diff --git a/templates/jobservice/jobservice-cm-env.yaml b/templates/jobservice/jobservice-cm-env.yaml
@@ -15,7 +15,7 @@ data:
   JOBSERVICE_WEBHOOK_JOB_MAX_RETRY: "{{ .Values.jobservice.notification.webhook_job_max_retry }}"
   JOBSERVICE_WEBHOOK_JOB_HTTP_CLIENT_TIMEOUT: "{{ .Values.jobservice.notification.webhook_job_http_client_timeout }}"
 
-  {{- if has "jobservice" .Values.proxy.components and not .Values.proxy.existingSecret }}
+  {{- if and (has "jobservice" .Values.proxy.components) (not .Values.proxy.existingSecret) }}
   HTTP_PROXY: "{{ .Values.proxy.httpProxy }}"
   HTTPS_PROXY: "{{ .Values.proxy.httpsProxy }}"
   {{- end }}

diff --git a/templates/registry/registry-dpl.yaml b/templates/registry/registry-dpl.yaml
@@ -111,7 +111,7 @@ spec:
               name: {{ .Values.registry.existingSecret }}
               key: {{ .Values.registry.existingSecretKey }}
         {{- end }}
-        {{- if has "registry" .Values.proxy.components and not .Values.proxy.existingSecret }}
+        {{- if and (has "registry" .Values.proxy.components) (not .Values.proxy.existingSecret) }}
         - name: HTTP_PROXY
           value: "{{ .Values.proxy.httpProxy }}"
         - name: HTTPS_PROXY

diff --git a/templates/trivy/trivy-sts.yaml b/templates/trivy/trivy-sts.yaml
@@ -74,7 +74,7 @@ spec:
                 name: "{{ .Values.proxy.existingSecret }}"
           {{- end }}
           env:
-          {{- if has "trivy" .Values.proxy.components and not .Values.proxy.existingSecret }}
+          {{- if and (has "trivy" .Values.proxy.components) (not .Values.proxy.existingSecret) }}
             - name: HTTP_PROXY
               value: "{{ .Values.proxy.httpProxy }}"
             - name: HTTPS_PROXY