Skip to content

patch - private registry external-argocd support and values structure fix #436

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 4 commits into from
Mar 31, 2025
Merged

patch - private registry external-argocd support and values structure fix #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd78eff
fix gitops operator, support templates add byoa
ilia-medvedev-codefresh Mar 26, 2025
4fe0732
Merge remote-tracking branch 'origin/main' into patch/private-registr…
ilia-medvedev-codefresh Mar 31, 2025
c1c45be
fix values structure
ilia-medvedev-codefresh Mar 31, 2025
79892a1
fix values structure
ilia-medvedev-codefresh Mar 31, 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
22 changes: 13 additions & 9 deletions charts/gitops-runtime/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,11 @@ The utility will output 4 files into the folder:
3. `values-images-no-tags.yaml` - a values file with all image values with the private registry **excluding tags**. If provided through --values to helm install/upgrade command - it will override all images to use the private registry.
4. `values-images-with-tags.yaml` - The same as 3 but with tags **included**.

For usage with external ArgoCD run the utility with `EXTERNAL_ARGOCD` environment variable set to `true`.
```
docker run -e EXTERNAL_ARGOCD=true -v <output_dir>:/output quay.io/codefresh/gitops-runtime-private-registry-utils:0.0.0 <local_registry>
```

## Openshift

```yaml
Expand Down Expand Up @@ -166,14 +171,14 @@ sealed-secrets:
| app-proxy.image-enrichment.serviceAccount.name | string | `"codefresh-image-enrichment-sa"` | Name of the service account to create or the name of the existing one to use |
| app-proxy.image.pullPolicy | string | `"IfNotPresent"` | |
| app-proxy.image.repository | string | `"quay.io/codefresh/cap-app-proxy"` | |
| app-proxy.image.tag | string | `"1.3353.1"` | |
| app-proxy.image.tag | string | `"1.3389.0"` | |
| app-proxy.imagePullSecrets | list | `[]` | |
| app-proxy.initContainer.command[0] | string | `"./init.sh"` | |
| app-proxy.initContainer.env | object | `{}` | |
| app-proxy.initContainer.extraVolumeMounts | list | `[]` | Extra volume mounts for init container |
| app-proxy.initContainer.image.pullPolicy | string | `"IfNotPresent"` | |
| app-proxy.initContainer.image.repository | string | `"quay.io/codefresh/cap-app-proxy-init"` | |
| app-proxy.initContainer.image.tag | string | `"1.3336.1"` | |
| app-proxy.initContainer.image.tag | string | `"1.3389.0"` | |
| app-proxy.initContainer.resources.limits | object | `{}` | |
| app-proxy.initContainer.resources.requests.cpu | string | `"0.2"` | |
| app-proxy.initContainer.resources.requests.memory | string | `"256Mi"` | |
Expand Down Expand Up @@ -305,13 +310,6 @@ sealed-secrets:
| gitops-operator.fullnameOverride | string | `""` | |
| gitops-operator.image | object | `{}` | |
| gitops-operator.imagePullSecrets | list | `[]` | |
| gitops-operator.kube-rbac-proxy.image.tag | string | `"v0.16.0"` | |
| gitops-operator.kube-rbac-proxy.resources.limits.cpu | string | `"500m"` | |
| gitops-operator.kube-rbac-proxy.resources.limits.memory | string | `"128Mi"` | |
| gitops-operator.kube-rbac-proxy.resources.requests.cpu | string | `"100m"` | |
| gitops-operator.kube-rbac-proxy.resources.requests.memory | string | `"64Mi"` | |
| gitops-operator.kube-rbac-proxy.securityContext.allowPrivilegeEscalation | bool | `false` | |
| gitops-operator.kube-rbac-proxy.securityContext.capabilities.drop[0] | string | `"ALL"` | |
| gitops-operator.libraryMode | bool | `true` | Do not change unless instructed otherwise by Codefresh support |
| gitops-operator.nameOverride | string | `""` | |
| gitops-operator.nodeSelector | object | `{}` | |
Expand All @@ -321,6 +319,12 @@ sealed-secrets:
| gitops-operator.resources.limits | object | `{}` | |
| gitops-operator.resources.requests.cpu | string | `"100m"` | |
| gitops-operator.resources.requests.memory | string | `"128Mi"` | |
| gitops-operator.resources.resources.limits.cpu | string | `"500m"` | |
| gitops-operator.resources.resources.limits.memory | string | `"128Mi"` | |
| gitops-operator.resources.resources.requests.cpu | string | `"100m"` | |
| gitops-operator.resources.resources.requests.memory | string | `"64Mi"` | |
| gitops-operator.resources.securityContext.allowPrivilegeEscalation | bool | `false` | |
| gitops-operator.resources.securityContext.capabilities.drop[0] | string | `"ALL"` | |
| gitops-operator.serviceAccount.annotations | object | `{}` | |
| gitops-operator.serviceAccount.create | bool | `true` | |
| gitops-operator.serviceAccount.name | string | `"gitops-operator-controller-manager"` | |
Expand Down
7 changes: 7 additions & 0 deletions charts/gitops-runtime/README.md.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,13 @@ The utility will output 4 files into the folder:
3. `values-images-no-tags.yaml` - a values file with all image values with the private registry **excluding tags**. If provided through --values to helm install/upgrade command - it will override all images to use the private registry.
4. `values-images-with-tags.yaml` - The same as 3 but with tags **included**.


For usage with external ArgoCD run the utility with `EXTERNAL_ARGOCD` environment variable set to `true`.
```
docker run -e EXTERNAL_ARGOCD=true -v <output_dir>:/output quay.io/codefresh/gitops-runtime-private-registry-utils:{{ template "chart.version" . }} <local_registry>
```


## Openshift

```yaml
Expand Down
34 changes: 34 additions & 0 deletions charts/gitops-runtime/ci/values-external-argocd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# Values file used to render all image values
global:
codefresh:
accountId: 628a80b693a15c0f9c13ab75 # Codefresh Account id for ilia-codefresh for now, needs to be some test account
gitIntegration:
provider:
name: 'GITHUB'
apiUrl: 'https://api.github.com'
userToken:
secretKeyRef:
name: mysecret
key: myvalue
optional: true

runtime:
name: default

ingress:
enabled: false

repoCredentialsTemplate:
url: 'https://github.com'
username: 'username'
password: 'dummy'

argo-rollouts:
dashboard:
enabled: true

argo-cd:
enabled: false

garage-workflows-artifact-storage:
enabled: true
6 changes: 3 additions & 3 deletions charts/gitops-runtime/templates/app-proxy/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
{{ $argoCdUrl := include "codefresh-gitops-runtime.argocd.server.url" . }}
{{ $argoCdUsername := include "codefresh-gitops-runtime.argocd.server.username-cm" . }}
{{ $appProxyContext := deepCopy . }}
{{ $_ := set $appProxyContext "Values" (get .Values "app-proxy") }}
{{ $_ := set $appProxyContext.Values "global" (get .Values "global") }}
{{ $_ := set $appProxyContext "Values" (deepCopy (get .Values "app-proxy")) }}
{{ $_ := set $appProxyContext.Values "global" (deepCopy (get .Values "global")) }}
{{- if not $appProxyContext.Values.config.argoCdUrl }}
{{ $_ := set $appProxyContext.Values.config "argoCdUrl" $argoCdUrl }}
{{- end }}
Expand All @@ -14,7 +14,7 @@
{{- $_ := set $appProxyContext.Values.config "argoWorkflowsUrl" $argoWorkflowsUrl }}
{{- end }}
{{- end}}
{{- if not (index .Values "argo-cd" "enabled") }}
{{- if not (index $.Values "argo-cd" "enabled") }}
{{- $_ := set $appProxyContext.Values.config "isExternalArgoCD" "true" }}
{{- else }}
{{- $_ := set $appProxyContext.Values.config "isExternalArgoCD" "false" }}
Expand Down
4 changes: 2 additions & 2 deletions charts/gitops-runtime/templates/app-proxy/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{- $appProxyContext := deepCopy . }}
{{- $_ := set $appProxyContext "Values" (get .Values "app-proxy") }}
{{- $_ := set $appProxyContext.Values "global" (get .Values "global") }}
{{- $_ := set $appProxyContext "Values" (deepCopy (get .Values "app-proxy")) }}
{{- $_ := set $appProxyContext.Values "global" (deepCopy (get .Values "global")) }}
{{- $_ := set $appProxyContext.Values "argo-cd" (get .Values "argo-cd") }}

{{/* Merge environment variables with the ones in _app-proxy-env.yaml */}}
Expand Down
6 changes: 3 additions & 3 deletions charts/gitops-runtime/templates/app-proxy/enrichment/rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{{- $appProxyContext := deepCopy . }}
{{- $_ := set $appProxyContext "Values" (get .Values "app-proxy") }}
{{- $_ := set $appProxyContext.Values "global" (get .Values "global") }}
{{- $_ := set $appProxyContext "Values" (deepCopy (get .Values "app-proxy")) }}
{{- $_ := set $appProxyContext.Values "global" (deepCopy (get .Values "global")) }}
{{- if (index (get $appProxyContext "Values") "image-enrichment" "enabled") }}
{{- include "cap-app-proxy.image-enrichment.resources.role" $appProxyContext }}
---
{{- include "cap-app-proxy.image-enrichment.resources.role-binding" $appProxyContext }}
{{- end }}
{{- end }}
6 changes: 3 additions & 3 deletions charts/gitops-runtime/templates/app-proxy/enrichment/sa.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{- $appProxyContext := deepCopy . }}
{{- $_ := set $appProxyContext "Values" (get .Values "app-proxy") }}
{{- $_ := set $appProxyContext.Values "global" (get .Values "global") }}
{{- $_ := set $appProxyContext "Values" (deepCopy (get .Values "app-proxy")) }}
{{- $_ := set $appProxyContext.Values "global" (deepCopy (get .Values "global")) }}
{{- if (index (get $appProxyContext "Values") "image-enrichment" "enabled") }}
{{- include "cap-app-proxy.image-enrichment.resources.sa" $appProxyContext }}
{{- end }}
{{- end }}
4 changes: 2 additions & 2 deletions charts/gitops-runtime/templates/app-proxy/pdb.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{- $appProxyContext := deepCopy . }}
{{- $_ := set $appProxyContext "Values" (get .Values "app-proxy") }}
{{- $_ := set $appProxyContext.Values "global" (get .Values "global") }}
{{- $_ := set $appProxyContext "Values" (deepCopy (get .Values "app-proxy")) }}
{{- $_ := set $appProxyContext.Values "global" (deepCopy (get .Values "global")) }}

{{- if $appProxyContext.Values.pdb.enabled }}
{{- include "cap-app-proxy.resources.pdb" $appProxyContext }}
Expand Down
6 changes: 3 additions & 3 deletions charts/gitops-runtime/templates/app-proxy/rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- $appProxyContext := deepCopy . }}
{{- $_ := set $appProxyContext "Values" (get .Values "app-proxy") }}
{{- $_ := set $appProxyContext.Values "global" (get .Values "global") }}
{{- include "cap-app-proxy.resources.rbac" $appProxyContext }}
{{- $_ := set $appProxyContext "Values" (deepCopy (get .Values "app-proxy")) }}
{{- $_ := set $appProxyContext.Values "global" (deepCopy (get .Values "global")) }}
{{- include "cap-app-proxy.resources.rbac" $appProxyContext }}
6 changes: 3 additions & 3 deletions charts/gitops-runtime/templates/app-proxy/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- $appProxyContext := deepCopy . }}
{{- $_ := set $appProxyContext "Values" (get .Values "app-proxy") }}
{{- $_ := set $appProxyContext.Values "global" (get .Values "global") }}
{{- include "cap-app-proxy.resources.service" $appProxyContext }}
{{- $_ := set $appProxyContext "Values" (deepCopy (get .Values "app-proxy")) }}
{{- $_ := set $appProxyContext.Values "global" (deepCopy (get .Values "global")) }}
{{- include "cap-app-proxy.resources.service" $appProxyContext }}
6 changes: 3 additions & 3 deletions charts/gitops-runtime/templates/app-proxy/serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- $appProxyContext := deepCopy . }}
{{- $_ := set $appProxyContext "Values" (get .Values "app-proxy") }}
{{- $_ := set $appProxyContext.Values "global" (get .Values "global") }}
{{- include "cap-app-proxy.resources.sa" $appProxyContext }}
{{- $_ := set $appProxyContext "Values" (deepCopy (get .Values "app-proxy")) }}
{{- $_ := set $appProxyContext.Values "global" (deepCopy (get .Values "global")) }}
{{- include "cap-app-proxy.resources.sa" $appProxyContext }}
6 changes: 3 additions & 3 deletions charts/gitops-runtime/templates/app-proxy/workflows-crb.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

{{- if index (get .Values "argo-workflows") "enabled" }}
{{- $appProxyContext := deepCopy . }}
{{- $_ := set $appProxyContext "Values" (get .Values "app-proxy") }}
{{- $_ := set $appProxyContext.Values "global" (get .Values "global") }}
{{- $_ := set $appProxyContext "Values" (deepCopy (get .Values "app-proxy")) }}
{{- $_ := set $appProxyContext.Values "global" (deepCopy (get .Values "global")) }}
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
Expand All @@ -15,4 +15,4 @@ subjects:
- kind: ServiceAccount
name: {{ include "cap-app-proxy.serviceAccountName" $appProxyContext }}
namespace: {{ .Release.Namespace }}
{{- end }}
{{- end }}
6 changes: 3 additions & 3 deletions charts/gitops-runtime/templates/event-reporters/rollout-reporter/clusterrolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
{{- if index (get .Values "argo-rollouts") "enabled" }}
{{- if and (index (get .Values "argo-rollouts") "clusterInstall") (index (get .Values "argo-rollouts") "controller" "createClusterRole") }}
{{- $eventReporterContext := deepCopy . }}
{{- $_ := set $eventReporterContext "Values" (get .Values "event-reporters") }}
{{- $_ := set $eventReporterContext.Values "global" (get .Values "global") }}
{{- $_ := set $eventReporterContext "Values" (deepCopy (get .Values "event-reporters")) }}
{{- $_ := set $eventReporterContext.Values "global" (deepCopy (get .Values "global")) }}
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
Expand All @@ -19,4 +19,4 @@ subjects:
name: {{ include "event-reporters.rollout-reporter.serviceAccountName" $eventReporterContext }}
namespace: {{ .Release.Namespace }}
{{- end }}
{{- end }}
{{- end }}
6 changes: 3 additions & 3 deletions charts/gitops-runtime/templates/event-reporters/rollout-reporter/eventsource.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{- if index (get .Values "argo-rollouts") "enabled" }}
{{- $eventReporterContext := deepCopy . }}
{{- $_ := set $eventReporterContext "Values" (get .Values "event-reporters") }}
{{- $_ := set $eventReporterContext.Values "global" (get .Values "global") }}
{{- $_ := set $eventReporterContext "Values" (deepCopy (get .Values "event-reporters")) }}
{{- $_ := set $eventReporterContext.Values "global" (deepCopy (get .Values "global")) }}
{{- include "event-reporters.rollout-reporter.eventsource" $eventReporterContext }}
{{- end }}
{{- end }}
6 changes: 3 additions & 3 deletions charts/gitops-runtime/templates/event-reporters/rollout-reporter/rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{- if index (get .Values "argo-rollouts") "enabled" }}
{{- $eventReporterContext := deepCopy . }}
{{- $_ := set $eventReporterContext "Values" (get .Values "event-reporters") }}
{{- $_ := set $eventReporterContext.Values "global" (get .Values "global") }}
{{- $_ := set $eventReporterContext "Values" (deepCopy (get .Values "event-reporters")) }}
{{- $_ := set $eventReporterContext.Values "global" (deepCopy (get .Values "global")) }}
{{- include "event-reporters.rollout-reporter.rbac" $eventReporterContext }}
{{- end }}
{{- end }}
6 changes: 3 additions & 3 deletions charts/gitops-runtime/templates/event-reporters/rollout-reporter/sensor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{- if index (get .Values "argo-rollouts") "enabled" }}
{{- $eventReporterContext := deepCopy . }}
{{- $_ := set $eventReporterContext "Values" (get .Values "event-reporters") }}
{{- $_ := set $eventReporterContext.Values "global" (get .Values "global") }}
{{- $_ := set $eventReporterContext "Values" (deepCopy (get .Values "event-reporters")) }}
{{- $_ := set $eventReporterContext.Values "global" (deepCopy (get .Values "global")) }}
{{- include "event-reporters.rollout-reporter.sensor" $eventReporterContext }}
{{- end }}
{{- end }}
6 changes: 3 additions & 3 deletions charts/gitops-runtime/templates/event-reporters/rollout-reporter/serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{- if index (get .Values "argo-rollouts") "enabled" }}
{{- $eventReporterContext := deepCopy . }}
{{- $_ := set $eventReporterContext "Values" (get .Values "event-reporters") }}
{{- $_ := set $eventReporterContext.Values "global" (get .Values "global") }}
{{- $_ := set $eventReporterContext "Values" (deepCopy (get .Values "event-reporters")) }}
{{- $_ := set $eventReporterContext.Values "global" (deepCopy (get .Values "global")) }}
{{- include "event-reporters.rollout-reporter.sa" $eventReporterContext }}
{{- end }}
{{- end }}
6 changes: 3 additions & 3 deletions charts/gitops-runtime/templates/event-reporters/workflow-reporter/eventsource.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

{{- if index (get .Values "argo-workflows") "enabled" }}
{{- $eventReporterContext := deepCopy . }}
{{- $_ := set $eventReporterContext "Values" (get .Values "event-reporters") }}
{{- $_ := set $eventReporterContext.Values "global" (get .Values "global") }}
{{- $_ := set $eventReporterContext "Values" (deepCopy (get .Values "event-reporters")) }}
{{- $_ := set $eventReporterContext.Values "global" (deepCopy (get .Values "global")) }}
{{- include "event-reporters.workflow-reporter.eventsource" $eventReporterContext }}
{{- end }}
{{- end }}
6 changes: 3 additions & 3 deletions charts/gitops-runtime/templates/event-reporters/workflow-reporter/rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

{{- if index (get .Values "argo-workflows") "enabled" }}
{{- $eventReporterContext := deepCopy . }}
{{- $_ := set $eventReporterContext "Values" (get .Values "event-reporters") }}
{{- $_ := set $eventReporterContext.Values "global" (get .Values "global") }}
{{- $_ := set $eventReporterContext "Values" (deepCopy (get .Values "event-reporters")) }}
{{- $_ := set $eventReporterContext.Values "global" (deepCopy (get .Values "global")) }}
{{- include "event-reporters.workflow-reporter.rbac" $eventReporterContext }}
{{- end }}
{{- end }}
6 changes: 3 additions & 3 deletions charts/gitops-runtime/templates/event-reporters/workflow-reporter/sensor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

{{- if index (get .Values "argo-workflows") "enabled" }}
{{- $eventReporterContext := deepCopy . }}
{{- $_ := set $eventReporterContext "Values" (get .Values "event-reporters") }}
{{- $_ := set $eventReporterContext.Values "global" (get .Values "global") }}
{{- $_ := set $eventReporterContext "Values" (deepCopy (get .Values "event-reporters")) }}
{{- $_ := set $eventReporterContext.Values "global" (deepCopy (get .Values "global")) }}
{{- include "event-reporters.workflow-reporter.sensor" $eventReporterContext }}
{{- end }}
{{- end }}
6 changes: 3 additions & 3 deletions charts/gitops-runtime/templates/event-reporters/workflow-reporter/serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

{{- if index (get .Values "argo-workflows") "enabled" }}
{{- $eventReporterContext := deepCopy . }}
{{- $_ := set $eventReporterContext "Values" (get .Values "event-reporters") }}
{{- $_ := set $eventReporterContext.Values "global" (get .Values "global") }}
{{- $_ := set $eventReporterContext "Values" (deepCopy (get .Values "event-reporters")) }}
{{- $_ := set $eventReporterContext.Values "global" (deepCopy (get .Values "global")) }}
{{- include "event-reporters.workflow-reporter.sa" $eventReporterContext }}
{{- end }}
{{- end }}
12 changes: 6 additions & 6 deletions charts/gitops-runtime/templates/gitops-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{{- if and (index .Values "gitops-operator" "enabled") }}

{{- if index (get .Values "gitops-operator") "libraryMode" }}
{{- $gitopsOperatorContext := (index .Subcharts "gitops-operator")}}
{{- $gitopsOperatorContext := (deepCopy (index .Subcharts "gitops-operator"))}}

{{- if and (index .Subcharts "argo-cd") }}

{{- $argoCDImageDict := index .Subcharts "argo-cd" "Values" "global" "image" }}
{{- if not $argoCDImageDict.tag }}
{{- $_ := set $argoCDImageDict "tag" (get .Subcharts "argo-cd").Chart.AppVersion }}
Expand All @@ -17,7 +17,7 @@
{{- end }}

{{- else if and (index .Values "global" "external-argo-cd" "server" "image") }}

{{ $argoCDImageDict := (index .Values "global" "external-argo-cd" "server" "image") }}

{{/* Set ArgoCD image */}}
Expand All @@ -31,9 +31,9 @@
{{- end }}

{{- if and (not (index .Values "argo-cd" "enabled")) }}

{{- if and (eq (index .Values "global" "external-argo-cd" "auth" "type") "token") }}

{{- if not (index .Values "global" "external-argo-cd" "auth" "token") }}
{{- $_ := set $gitopsOperatorContext.Values.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 .Values "global" "external-argo-cd" "auth" "tokenSecretKeyRef" "name")) }}
{{- $_ := set $gitopsOperatorContext.Values.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 .Values "global" "external-argo-cd" "auth" "tokenSecretKeyRef" "key")) }}
Expand Down Expand Up @@ -71,7 +71,7 @@
{{- if and (gt (int $gitopsOperatorContext.Values.replicaCount) 1 ) }}
{{- $_ := set $gitopsOperatorContext.Values.env "LEADER_ELECT" "true" }}
{{- else }}
{{- $_ := set $gitopsOperatorContext.Values.env "LEADER_ELECT" "false" }}
{{- $_ := set $gitopsOperatorContext.Values.env "LEADER_ELECT" "false" }}
{{- end }}

{{- include "gitops-operator.resources" $gitopsOperatorContext}}
Expand Down
6 changes: 3 additions & 3 deletions charts/gitops-runtime/templates/internal-router/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{- $internalRouterContext := deepCopy . }}
{{- $_ := set $internalRouterContext "Values" (get .Values "internal-router") }}
{{- $_ := set $internalRouterContext.Values "global" (get .Values "global") }}
{{- $_ := set $internalRouterContext "Values" (deepCopy (get .Values "internal-router")) }}
{{- $_ := set $internalRouterContext.Values "global" (deepCopy (get .Values "global")) }}
{{/*
Set workflows routing
*/}}
Expand All @@ -17,4 +17,4 @@ Set app-proxy routing
{{- if not (index $internalRouterContext.Values "routing" "app-proxy") }}
{{ $_ := set $internalRouterContext.Values.routing "app-proxy" (dict "enabled" true "internalUrl" ( include "codefresh-gitops-runtime.app-proxy.url" . )) }}
{{- end }}
{{- include "internal-router.resources.configmap" $internalRouterContext }}
{{- include "internal-router.resources.configmap" $internalRouterContext }}
6 changes: 3 additions & 3 deletions charts/gitops-runtime/templates/internal-router/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- $internalRouterContext := deepCopy . }}
{{- $_ := set $internalRouterContext "Values" (get .Values "internal-router") }}
{{- $_ := set $internalRouterContext.Values "global" (get .Values "global") }}
{{- include "internal-router.resources.deployment" $internalRouterContext }}
{{- $_ := set $internalRouterContext "Values" (deepCopy (get .Values "internal-router")) }}
{{- $_ := set $internalRouterContext.Values "global" (deepCopy (get .Values "global")) }}
{{- include "internal-router.resources.deployment" $internalRouterContext }}
Loading