Skip to content

Commit 3e22ac4

Browse files
mikhail-klimkomikhail-klimko
committed
refactor cf-argocd-extras
1 parent 3882de6 commit 3e22ac4

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

‎charts/gitops-runtime/templates/argo-gateway/_env.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ HTTP_PROXY: {{ .Values.global.httpProxy | squote}}
33
HTTPS_PROXY: {{ .Values.global.httpsProxy | squote }}
44
NO_PROXY: {{ .Values.global.noProxy | squote }}
55

6-
{{- if and (eq (index .Values "global" "external-argo-cd" "auth" "type") "token") }}
7-
{{- if not (index .Values "global" "external-argo-cd" "auth" "token") }}
8-
ARGO_CD_TOKEN_SECRET_NAME: {{ required ".Values.global.external-argo-cd.auth.type is set to 'token' therefore .global.external-argo-cd.auth.tokenSecretKeyRef.name is required" (index .Values "global" "external-argo-cd" "auth" "tokenSecretKeyRef" "name") }}
9-
ARGO_CD_TOKEN_SECRET_KEY: {{ required ".Values.global.external-argo-cd.auth.type is set to 'token' therefore .global.external-argo-cd.auth.tokenSecretKeyRef.key is required" (index .Values "global" "external-argo-cd" "auth" "tokenSecretKeyRef" "key" ) }}
6+
{{- if and (eq (index .Values "global" "integrations" "argo-cd" "server" "auth" "type") "token") }}
7+
{{- if not (index .Values "global" "integrations" "argo-cd" "server" "auth" "token") }}
8+
ARGO_CD_TOKEN_SECRET_NAME: {{ required ".Values.global.integrations.argo-cd.server.auth.type is set to 'token' therefore .global.integrations.argo-cd.server.auth.tokenSecretKeyRef.name is required" (index .Values "global" "integrations" "argo-cd" "server" "auth" "tokenSecretKeyRef" "name") }}
9+
ARGO_CD_TOKEN_SECRET_KEY: {{ required ".Values.global.integrations.argo-cd.server.auth.type is set to 'token' therefore .global.integrations.argo-cd.server.auth.tokenSecretKeyRef.key is required" (index .Values "global" "integrations" "argo-cd" "server" "auth" "tokenSecretKeyRef" "key" ) }}
1010
{{- else }}
1111
ARGO_CD_TOKEN_SECRET_NAME: "gitops-runtime-argo-cd-token"
1212
ARGO_CD_TOKEN_SECRET_KEY: "token"

‎charts/gitops-runtime/templates/event-reporters/cluster-event-reporter/_env.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ HTTP_PROXY: {{ .Values.global.httpProxy | squote}}
33
HTTPS_PROXY: {{ .Values.global.httpsProxy | squote }}
44
NO_PROXY: {{ .Values.global.noProxy | squote }}
55

6-
{{- if and (eq (index .Values "global" "external-argo-cd" "auth" "type") "token") }}
7-
{{- if not (index .Values "global" "external-argo-cd" "auth" "token") }}
8-
ARGO_CD_TOKEN_SECRET_NAME: {{ required ".Values.global.external-argo-cd.auth.type is set to 'token' therefore .global.external-argo-cd.auth.tokenSecretKeyRef.name is required" (index .Values "global" "external-argo-cd" "auth" "tokenSecretKeyRef" "name") }}
9-
ARGO_CD_TOKEN_SECRET_KEY: {{ required ".Values.global.external-argo-cd.auth.type is set to 'token' therefore .global.external-argo-cd.auth.tokenSecretKeyRef.key is required" (index .Values "global" "external-argo-cd" "auth" "tokenSecretKeyRef" "key" ) }}
6+
{{- if and (eq (index .Values "global" "integrations" "argo-cd" "server" "auth" "type") "token") }}
7+
{{- if not (index .Values "global" "integrations" "argo-cd" "server" "auth" "token") }}
8+
ARGO_CD_TOKEN_SECRET_NAME: {{ required ".Values.global.integrations.argo-cd.server.auth.type is set to 'token' therefore .global.integrations.argo-cd.server.auth.tokenSecretKeyRef.name is required" (index .Values "global" "integrations" "argo-cd" "server" "auth" "tokenSecretKeyRef" "name") }}
9+
ARGO_CD_TOKEN_SECRET_KEY: {{ required ".Values.global.integrations.argo-cd.server.auth.type is set to 'token' therefore .global.integrations.argo-cd.server.auth.tokenSecretKeyRef.key is required" (index .Values "global" "integrations" "argo-cd" "server" "auth" "tokenSecretKeyRef" "key" ) }}
1010
{{- else }}
1111
ARGO_CD_TOKEN_SECRET_NAME: "gitops-runtime-argo-cd-token"
1212
ARGO_CD_TOKEN_SECRET_KEY: "token"

‎charts/gitops-runtime/templates/event-reporters/runtime-event-reporter/_env.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ HTTP_PROXY: {{ .Values.global.httpProxy | squote}}
33
HTTPS_PROXY: {{ .Values.global.httpsProxy | squote }}
44
NO_PROXY: {{ .Values.global.noProxy | squote }}
55

6-
{{- if and (eq (index .Values "global" "external-argo-cd" "auth" "type") "token") }}
7-
{{- if not (index .Values "global" "external-argo-cd" "auth" "token") }}
8-
ARGO_CD_TOKEN_SECRET_NAME: {{ required ".Values.global.external-argo-cd.auth.type is set to 'token' therefore .global.external-argo-cd.auth.tokenSecretKeyRef.name is required" (index .Values "global" "external-argo-cd" "auth" "tokenSecretKeyRef" "name") }}
9-
ARGO_CD_TOKEN_SECRET_KEY: {{ required ".Values.global.external-argo-cd.auth.type is set to 'token' therefore .global.external-argo-cd.auth.tokenSecretKeyRef.key is required" (index .Values "global" "external-argo-cd" "auth" "tokenSecretKeyRef" "key" ) }}
6+
{{- if and (eq (index .Values "global" "integrations" "argo-cd" "server" "auth" "type") "token") }}
7+
{{- if not (index .Values "global" "integrations" "argo-cd" "server" "auth" "token") }}
8+
ARGO_CD_TOKEN_SECRET_NAME: {{ required ".Values.global.integrations.argo-cd.server.auth.type is set to 'token' therefore .global.integrations.argo-cd.server.auth.tokenSecretKeyRef.name is required" (index .Values "global" "integrations" "argo-cd" "server" "auth" "tokenSecretKeyRef" "name") }}
9+
ARGO_CD_TOKEN_SECRET_KEY: {{ required ".Values.global.integrations.argo-cd.server.auth.type is set to 'token' therefore .global.integrations.argo-cd.server.auth.tokenSecretKeyRef.key is required" (index .Values "global" "integrations" "argo-cd" "server" "auth" "tokenSecretKeyRef" "key" ) }}
1010
{{- else }}
1111
ARGO_CD_TOKEN_SECRET_NAME: "gitops-runtime-argo-cd-token"
1212
ARGO_CD_TOKEN_SECRET_KEY: "token"

0 commit comments

Comments
 (0)