Skip to content

chore: move argo-cd auth values to global.integrations.argo-cd.server.auth #768

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

Merged
merged 11 commits into from
Oct 6, 2025
Merged

chore: move argo-cd auth values to global.integrations.argo-cd.server.auth #768

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b50ddcc
fix: update app-proxy image tags to 1.3798.0
ATGardner Oct 1, 2025
0394f05
inject username/password OR token into app-proxy env
ATGardner Oct 1, 2025
4d8dca7
removed unused config fields
ATGardner Oct 1, 2025
bb86a01
removed accidental commit
ATGardner Oct 1, 2025
7e87475
fixed component-tests gitea to not depend on bitnami images
ATGardner Oct 5, 2025
080eba2
fixed tests
ATGardner Oct 5, 2025
0991145
move global.external-argo-cd.auth into global.integrations.argo-cd.se…
ATGardner Oct 5, 2025
2ca7c2d
added "codefresh-gitops-runtime.argocd-token-auth"
ATGardner Oct 5, 2025
7dd5b65
returned default argocd and argowf urls
ATGardner Oct 5, 2025
a33757a
moved "codefresh-gitops-runtime.argocd-token-auth" into "gitops-opera…
ATGardner Oct 6, 2025
f4f0aca
fixed tests
ATGardner Oct 6, 2025
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
14 changes: 4 additions & 10 deletions charts/gitops-runtime/templates/_components/cap-app-proxy/_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
{{- define "cap-app-proxy.resources.configmap-documented-configs"}}
argoCdUrl: {{ .Values.config.argoCdUrl }}
argoCdUsername: {{ .Values.config.argoCdUsername }}
{{- define "cap-app-proxy.resources.configmap-documented-configs" }}
argoWorkflowsInsecure: {{ .Values.config.argoWorkflowsInsecure | quote }}
argoWorkflowsUrl: {{ default "" .Values.config.argoWorkflowsUrl }}
clusterChunkSize: {{ .Values.config.clusterChunkSize | quote }}
cors: {{ .Values.global.codefresh.url }}
{{- with .Values.config.clusterChunkSize }}
clusterChunkSize: {{ . | quote }}
{{- end }}
env: {{ .Values.config.env | quote}}
isConfigurationRuntime: {{ .Values.global.runtime.isConfigurationRuntime | quote }}
isExternalArgoCD: {{ .Values.global.runtime.isExternalArgoCD | quote }}
runtimeName: {{ required "global.runtime.name is required" .Values.global.runtime.name | quote}}
skipGitPermissionValidation: {{ .Values.config.skipGitPermissionValidation | quote }}
isNamespacedRuntime: {{ .Values.global.runtime.singleNamespace | quote }}
logLevel: {{ .Values.config.logLevel | quote }}
{{- $enrichmentValues := get .Values "image-enrichment" }}
{{- if $enrichmentValues.enabled }}
Expand All @@ -30,7 +24,7 @@ enrichmentJiraEnrichmentImage: {{ printf "%s/%s:%s" $enrichmentValues.config.ima

{{- define "cap-app-proxy.resources.configmap" }}
{{- $documentedConfigs := (include "cap-app-proxy.resources.configmap-documented-configs" . | fromYaml ) }}
{{- $overrides := omit .Values.config "clusterChunkSize" }}
{{- $overrides := omit .Values.config "argoWorkflowsInsecure" "clusterChunkSize" "cors" }}
{{- $mergedConfig := mergeOverwrite $documentedConfigs $overrides }}
apiVersion: v1
kind: ConfigMap
Expand Down
12 changes: 5 additions & 7 deletions ...ps-runtime/templates/_components/cap-app-proxy/environment-variables/_main-container.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ ARGO_CD_URL:
name: cap-app-proxy-cm
key: argoCdUrl
optional: true
ARGO_CD_TOKEN: {{ include "codefresh-gitops-runtime.argocd.server.token" . | nindent 2 }}
ARGO_CD_USERNAME: {{ include "codefresh-gitops-runtime.argocd.server.username-env-var" . | nindent 2 }}
ARGO_CD_PASSWORD: {{ include "codefresh-gitops-runtime.argocd.server.password" . | nindent 2 }}
ARGO_WORKFLOWS_INSECURE:
valueFrom:
configMapKeyRef:
Expand Down Expand Up @@ -224,8 +221,9 @@ LEADER_ID:
Read defaults from the template above and merge with the values provided in values file
*/}}
{{- define "cap-app-proxy.environment-variables" -}}
{{- $defaults := (include "cap-app-proxy.environment-variables.defaults" . | fromYaml) }}
{{- $overrides := .Values.env }}
{{- $mergedValues := mergeOverwrite $defaults $overrides }}
{{- include "codefresh-gitops-runtime.components.common_helpers.container-templates.env-vars" $mergedValues }}
{{- $defaults := (include "cap-app-proxy.environment-variables.defaults" . | fromYaml) }}
{{- $argoCdAuth := (include "codefresh-gitops-runtime.argocd-auth" . | fromYaml) }}
{{- $overrides := .Values.env }}
{{- $mergedValues := mergeOverwrite $defaults $argoCdAuth $overrides }}
{{- include "codefresh-gitops-runtime.components.common_helpers.container-templates.env-vars" $mergedValues }}
{{- end -}}
7 changes: 3 additions & 4 deletions charts/gitops-runtime/templates/_components/cf-argocd-extras/_default-values.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{- define "cf-argocd-extras.default-values" }}
{{- $argoCdAuth := (include "codefresh-gitops-runtime.argocd-token-auth" . | fromYaml) }}
global: {}

externalRedis:
Expand Down Expand Up @@ -84,8 +85,7 @@ eventReporter:
name: argocd-cmd-params-cm
key: server.rootpath
optional: true
ARGO_CD_TOKEN_SECRET_NAME: argocd-token
ARGO_CD_TOKEN_SECRET_KEY: token
{{ $argoCdAuth | toYaml | indent 6 }}
BINARY_NAME: event-reporter
CODEFRESH_SSL_CERT_PATH: ""
CODEFRESH_TLS_INSECURE:
Expand Down Expand Up @@ -392,8 +392,7 @@ sourcesServer:
configMapKeyRef:
name: sources-server-cmd-params-cm
key: argocd.server
ARGO_CD_TOKEN_SECRET_NAME: argocd-token
ARGO_CD_TOKEN_SECRET_KEY: token
{{ $argoCdAuth | toYaml | indent 6}}
ARGOCD_SERVER_ROOTPATH:
valueFrom:
configMapKeyRef:
Expand Down
10 changes: 0 additions & 10 deletions ...ts/gitops-runtime/templates/_components/cf-argocd-extras/event-reporter/_statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,6 @@
{{- $_ := set $context.Values.container.env.REDIS_PASSWORD.valueFrom.secretKeyRef "key" (default "redis-password" $vals.externalRedis.existingSecretKeyRef.key) }}
{{- end }}

{{- if and (eq (index $context.Values "global" "external-argo-cd" "auth" "type") "token") }}
{{- if not (index $context.Values "global" "external-argo-cd" "auth" "token") }}
{{- $_ := set $context.Values.container.env "ARGO_CD_TOKEN_SECRET_NAME" (required ".Values.global.external-argo-cd.auth.type is set to 'token' therefore .Values.global.external-argo-cd.auth.tokenSecretKeyRef.name is required" (index $context.Values "global" "external-argo-cd" "auth" "tokenSecretKeyRef" "name")) }}
{{- $_ := set $context.Values.container.env "ARGO_CD_TOKEN_SECRET_KEY" (required ".Values.global.external-argo-cd.auth.type is set to 'token' therefore .Values.global.external-argo-cd.auth.tokenSecretKeyRef.key is required" (index $context.Values "global" "external-argo-cd" "auth" "tokenSecretKeyRef" "key" )) }}
{{- else }}
{{- $_ := set $context.Values.container.env "ARGO_CD_TOKEN_SECRET_NAME" "gitops-runtime-argo-cd-token" }}
{{- $_ := set $context.Values.container.env "ARGO_CD_TOKEN_SECRET_KEY" "token" }}
{{- end }}
{{- end }}

{{- if and (index $context.Values "global" "external-argo-cd" "server" "rootpath") }}
{{- $_ := set $context.Values.container.env "ARGOCD_SERVER_ROOTPATH" (index $context.Values "global" "external-argo-cd" "server" "rootpath") }}
{{- end }}
Expand Down
10 changes: 0 additions & 10 deletions charts/gitops-runtime/templates/_components/cf-argocd-extras/sources-server/_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,6 @@
{{- $_ := set $context.Values.container.env.REDIS_PASSWORD.valueFrom.secretKeyRef "key" (default "redis-password" $vals.externalRedis.existingSecretKeyRef.key) }}
{{- end }}

{{- if and (eq (index $context.Values "global" "external-argo-cd" "auth" "type") "token") }}
{{- if not (index $context.Values "global" "external-argo-cd" "auth" "token") }}
{{- $_ := set $context.Values.container.env "ARGO_CD_TOKEN_SECRET_NAME" (required ".Values.global.external-argo-cd.auth.type is set to 'token' therefore .Values.global.external-argo-cd.auth.tokenSecretKeyRef.name is required" (index $context.Values "global" "external-argo-cd" "auth" "tokenSecretKeyRef" "name")) }}
{{- $_ := set $context.Values.container.env "ARGO_CD_TOKEN_SECRET_KEY" (required ".Values.global.external-argo-cd.auth.type is set to 'token' therefore .Values.global.external-argo-cd.auth.tokenSecretKeyRef.key is required" (index $context.Values "global" "external-argo-cd" "auth" "tokenSecretKeyRef" "key" )) }}
{{- else }}
{{- $_ := set $context.Values.container.env "ARGO_CD_TOKEN_SECRET_NAME" "gitops-runtime-argo-cd-token" }}
{{- $_ := set $context.Values.container.env "ARGO_CD_TOKEN_SECRET_KEY" "token" }}
{{- end }}
{{- end }}

{{- if and (index $context.Values "global" "external-argo-cd" "server" "rootpath") }}
{{- $_ := set $context.Values.container.env "ARGOCD_SERVER_ROOTPATH" (index $context.Values "global" "external-argo-cd" "server" "rootpath") }}
{{- end }}
Expand Down
3 changes: 2 additions & 1 deletion charts/gitops-runtime/templates/_components/gitops-operator/_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
{{/* Merge environment variables from calculated, defaults and overwrites */}}
{{- $defaults := (include "gitops-operator.resources.environment-variables.defaults" . | fromYaml) }}
{{- $calculated := (include "gitops-operator.resources.environment-variables.calculated" . | fromYaml) }}
{{- $argoCdAuth := (include "codefresh-gitops-runtime.argocd-token-auth" . | fromYaml) }}
{{- $overrides := .Values.env }}
{{- $mergedValues := mergeOverwrite $defaults $calculated $overrides }}
{{- $mergedValues := mergeOverwrite $defaults $calculated $argoCdAuth $overrides }}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ATGardner why is this required? Can we add it to calculated values?

apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down
14 changes: 8 additions & 6 deletions charts/gitops-runtime/templates/_components/gitops-operator/_env.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,30 @@ to keep the separation of components as pseudo library charts, they are defined
CF_CA_CERT: {{ printf "/app/config/codefresh-tls/%s" .Values.global.codefresh.tls.caCerts.secretKeyRef.key }}
{{- end }}
CF_URL: {{ .Values.global.codefresh.url }}
COMMIT_STATUS_POLLING_INTERVAL: {{ .Values.config.commitStatusPollingInterval }}
GITOPS_OPERATOR_VERSION: {{ .Values.image.tag }}
{{- if (gt (int .Values.replicaCount) 1 ) }}
LEADER_ELECT: true
{{- else }}
LEADER_ELECT: false
{{- end }}
MAX_CONCURRENT_RELEASES: {{ .Values.config.maxConcurrentReleases }}
PROMOTION_WRAPPER_TEMPLATE: {{ .Values.config.promotionWrapperTemplate | quote }}
RUNTIME: {{ .Values.global.runtime.name }}
TASK_POLLING_INTERVAL: {{ .Values.config.taskPollingInterval }}
COMMIT_STATUS_POLLING_INTERVAL: {{ .Values.config.commitStatusPollingInterval }}
WORKFLOW_MONITOR_POLLING_INTERVAL: {{ .Values.config.workflowMonitorPollingInterval }}
MAX_CONCURRENT_RELEASES: {{ .Values.config.maxConcurrentReleases }}
PROMOTION_WRAPPER_TEMPLATE: {{ .Values.config.promotionWrapperTemplate | quote }}
{{- end }}

{{- define "gitops-operator.resources.environment-variables.defaults" -}}
AP_URL: http://cap-app-proxy:3017
ARGO_CD_URL: argo-cd-server:80
ARGO_CD_TOKEN_SECRET_NAME: argocd-token
ARGO_CD_TOKEN_SECRET_KEY: token
ARGO_WF_URL: http://argo-server:2746
CF_TOKEN:
valueFrom:
secretKeyRef:
name: codefresh-token
key: token
HEALTH_PROBE_BIND_ADDRESS: :8081
LEADER_ELECT: true
METRICS_BIND_ADDRESS: :8080
METRICS_SECURE: false
NAMESPACE:
Expand Down
Loading