Skip to content

Commit 37ee72e

Browse files
ilia-medvedev-codefreshilia-medvedev-codefresh
committed
patch - private registry external-argocd support and values structure fix (#436)
1 parent e5bccb8 commit 37ee72e

33 files changed

+159
-107
lines changed

‎charts/gitops-runtime/README.md

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Prior to running the installation please see the official documentation at: http
2121
> This version of the chart includes default configuration for storing workflow artifacts and logs in Codefresh provided s3 compatible storage.
2222
2323
If you have your own storage configuration using the default configmap `artifact-repositories` upgrading the chart will override your artifact storage configuration.
24-
To prevent this please set `argo-workflows.controller.workflowDefaults.spec.workflowDefaults.artifactRepository.configMap` to `artifact-repositories` and `argo-workflows.controller.workflowDefaults.spec.workflowDefaults.artifactRepository.key`
24+
To prevent this please set `argo-workflows.controller.workflowDefaults.spec.artifactRepository.configMap` to `artifact-repositories` and `argo-workflows.controller.workflowDefaults.spec.artifactRepository.key`
2525
to the respective key in your configmap identifying the repository.
2626
> [!WARNING]
2727
> It's highly recommended to use your own artifact storage for data privacy reasons.
@@ -115,6 +115,11 @@ The utility will output 4 files into the folder:
115115
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.
116116
4. `values-images-with-tags.yaml` - The same as 3 but with tags **included**.
117117

118+
For usage with external ArgoCD run the utility with `EXTERNAL_ARGOCD` environment variable set to `true`.
119+
```
120+
docker run -e EXTERNAL_ARGOCD=true -v <output_dir>:/output quay.io/codefresh/gitops-runtime-private-registry-utils:0.0.0 <local_registry>
121+
```
122+
118123
## Openshift
119124

120125
```yaml
@@ -178,14 +183,14 @@ sealed-secrets:
178183
| 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 |
179184
| app-proxy.image.pullPolicy | string | `"IfNotPresent"` | |
180185
| app-proxy.image.repository | string | `"quay.io/codefresh/cap-app-proxy"` | |
181-
| app-proxy.image.tag | string | `"1.3362.0"` | |
186+
| app-proxy.image.tag | string | `"1.3389.0"` | |
182187
| app-proxy.imagePullSecrets | list | `[]` | |
183188
| app-proxy.initContainer.command[0] | string | `"./init.sh"` | |
184189
| app-proxy.initContainer.env | object | `{}` | |
185190
| app-proxy.initContainer.extraVolumeMounts | list | `[]` | Extra volume mounts for init container |
186191
| app-proxy.initContainer.image.pullPolicy | string | `"IfNotPresent"` | |
187192
| app-proxy.initContainer.image.repository | string | `"quay.io/codefresh/cap-app-proxy-init"` | |
188-
| app-proxy.initContainer.image.tag | string | `"1.3362.0"` | |
193+
| app-proxy.initContainer.image.tag | string | `"1.3389.0"` | |
189194
| app-proxy.initContainer.resources.limits | object | `{}` | |
190195
| app-proxy.initContainer.resources.requests.cpu | string | `"0.2"` | |
191196
| app-proxy.initContainer.resources.requests.memory | string | `"256Mi"` | |
@@ -249,6 +254,7 @@ sealed-secrets:
249254
| argo-rollouts.fullnameOverride | string | `"argo-rollouts"` | |
250255
| argo-rollouts.installCRDs | bool | `true` | |
251256
| argo-workflows.codefreshWorkflowLogs | object | `{"endpoint":"gitops-workflow-logs.codefresh.io","insecure":false}` | Argo workflows logs storage on Codefresh platform settings. Don't change unless instructed by Codefresh support. |
257+
| argo-workflows.controller.workflowDefaults.spec.archiveLogs | bool | `true` | |
252258
| argo-workflows.controller.workflowDefaults.spec.artifactRepositoryRef | object | `{"configMap":"codefresh-workflows-log-store","key":"codefresh-workflows-log-store"}` | By default artifact repository is set to a Codefresh provided repository. For data privacy it is reccommended to set your own artifact repository. For instructions see: https://argo-workflows.readthedocs.io/en/latest/configure-artifact-repository/#configuring-your-artifact-repository |
253259
| argo-workflows.crds.install | bool | `true` | Install and upgrade CRDs |
254260
| argo-workflows.enabled | bool | `true` | |
@@ -311,13 +317,6 @@ sealed-secrets:
311317
| gitops-operator.fullnameOverride | string | `""` | |
312318
| gitops-operator.image | object | `{}` | |
313319
| gitops-operator.imagePullSecrets | list | `[]` | |
314-
| gitops-operator.kube-rbac-proxy.image.tag | string | `"v0.16.0"` | |
315-
| gitops-operator.kube-rbac-proxy.resources.limits.cpu | string | `"500m"` | |
316-
| gitops-operator.kube-rbac-proxy.resources.limits.memory | string | `"128Mi"` | |
317-
| gitops-operator.kube-rbac-proxy.resources.requests.cpu | string | `"100m"` | |
318-
| gitops-operator.kube-rbac-proxy.resources.requests.memory | string | `"64Mi"` | |
319-
| gitops-operator.kube-rbac-proxy.securityContext.allowPrivilegeEscalation | bool | `false` | |
320-
| gitops-operator.kube-rbac-proxy.securityContext.capabilities.drop[0] | string | `"ALL"` | |
321320
| gitops-operator.libraryMode | bool | `true` | Do not change unless instructed otherwise by Codefresh support |
322321
| gitops-operator.nameOverride | string | `""` | |
323322
| gitops-operator.nodeSelector | object | `{}` | |
@@ -327,6 +326,12 @@ sealed-secrets:
327326
| gitops-operator.resources.limits | object | `{}` | |
328327
| gitops-operator.resources.requests.cpu | string | `"100m"` | |
329328
| gitops-operator.resources.requests.memory | string | `"128Mi"` | |
329+
| gitops-operator.resources.resources.limits.cpu | string | `"500m"` | |
330+
| gitops-operator.resources.resources.limits.memory | string | `"128Mi"` | |
331+
| gitops-operator.resources.resources.requests.cpu | string | `"100m"` | |
332+
| gitops-operator.resources.resources.requests.memory | string | `"64Mi"` | |
333+
| gitops-operator.resources.securityContext.allowPrivilegeEscalation | bool | `false` | |
334+
| gitops-operator.resources.securityContext.capabilities.drop[0] | string | `"ALL"` | |
330335
| gitops-operator.serviceAccount.annotations | object | `{}` | |
331336
| gitops-operator.serviceAccount.create | bool | `true` | |
332337
| gitops-operator.serviceAccount.name | string | `"gitops-operator-controller-manager"` | |

‎charts/gitops-runtime/README.md.gotmpl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,13 @@ The utility will output 4 files into the folder:
117117
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.
118118
4. `values-images-with-tags.yaml` - The same as 3 but with tags **included**.
119119

120+
121+
For usage with external ArgoCD run the utility with `EXTERNAL_ARGOCD` environment variable set to `true`.
122+
```
123+
docker run -e EXTERNAL_ARGOCD=true -v <output_dir>:/output quay.io/codefresh/gitops-runtime-private-registry-utils:{{ template "chart.version" . }} <local_registry>
124+
```
125+
126+
120127
## Openshift
121128

122129
```yaml

‎charts/gitops-runtime/ci/values-external-argocd.yaml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Values file used to render all image values
2+
global:
3+
codefresh:
4+
accountId: 628a80b693a15c0f9c13ab75 # Codefresh Account id for ilia-codefresh for now, needs to be some test account
5+
gitIntegration:
6+
provider:
7+
name: 'GITHUB'
8+
apiUrl: 'https://api.github.com'
9+
userToken:
10+
secretKeyRef:
11+
name: mysecret
12+
key: myvalue
13+
optional: true
14+
15+
runtime:
16+
name: default
17+
18+
ingress:
19+
enabled: false
20+
21+
repoCredentialsTemplate:
22+
url: 'https://github.com'
23+
username: 'username'
24+
password: 'dummy'
25+
26+
argo-rollouts:
27+
dashboard:
28+
enabled: true
29+
30+
argo-cd:
31+
enabled: false
32+
33+
garage-workflows-artifact-storage:
34+
enabled: true

‎charts/gitops-runtime/templates/app-proxy/config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
{{ $argoCdUrl := include "codefresh-gitops-runtime.argocd.server.url" . }}
33
{{ $argoCdUsername := include "codefresh-gitops-runtime.argocd.server.username-cm" . }}
44
{{ $appProxyContext := deepCopy . }}
5-
{{ $_ := set $appProxyContext "Values" (get .Values "app-proxy") }}
6-
{{ $_ := set $appProxyContext.Values "global" (get .Values "global") }}
5+
{{ $_ := set $appProxyContext "Values" (deepCopy (get .Values "app-proxy")) }}
6+
{{ $_ := set $appProxyContext.Values "global" (deepCopy (get .Values "global")) }}
77
{{- if not $appProxyContext.Values.config.argoCdUrl }}
88
{{ $_ := set $appProxyContext.Values.config "argoCdUrl" $argoCdUrl }}
99
{{- end }}
@@ -14,7 +14,7 @@
1414
{{- $_ := set $appProxyContext.Values.config "argoWorkflowsUrl" $argoWorkflowsUrl }}
1515
{{- end }}
1616
{{- end}}
17-
{{- if not (index .Values "argo-cd" "enabled") }}
17+
{{- if not (index $.Values "argo-cd" "enabled") }}
1818
{{- $_ := set $appProxyContext.Values.config "isExternalArgoCD" "true" }}
1919
{{- else }}
2020
{{- $_ := set $appProxyContext.Values.config "isExternalArgoCD" "false" }}

‎charts/gitops-runtime/templates/app-proxy/deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{- $appProxyContext := deepCopy . }}
2-
{{- $_ := set $appProxyContext "Values" (get .Values "app-proxy") }}
3-
{{- $_ := set $appProxyContext.Values "global" (get .Values "global") }}
2+
{{- $_ := set $appProxyContext "Values" (deepCopy (get .Values "app-proxy")) }}
3+
{{- $_ := set $appProxyContext.Values "global" (deepCopy (get .Values "global")) }}
44
{{- $_ := set $appProxyContext.Values "argo-cd" (get .Values "argo-cd") }}
55

66
{{/* Merge environment variables with the ones in _app-proxy-env.yaml */}}

‎charts/gitops-runtime/templates/app-proxy/enrichment/rbac.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{{- $appProxyContext := deepCopy . }}
2-
{{- $_ := set $appProxyContext "Values" (get .Values "app-proxy") }}
3-
{{- $_ := set $appProxyContext.Values "global" (get .Values "global") }}
2+
{{- $_ := set $appProxyContext "Values" (deepCopy (get .Values "app-proxy")) }}
3+
{{- $_ := set $appProxyContext.Values "global" (deepCopy (get .Values "global")) }}
44
{{- if (index (get $appProxyContext "Values") "image-enrichment" "enabled") }}
55
{{- include "cap-app-proxy.image-enrichment.resources.role" $appProxyContext }}
66
---
77
{{- include "cap-app-proxy.image-enrichment.resources.role-binding" $appProxyContext }}
8-
{{- end }}
8+
{{- end }}

‎charts/gitops-runtime/templates/app-proxy/enrichment/sa.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{- $appProxyContext := deepCopy . }}
2-
{{- $_ := set $appProxyContext "Values" (get .Values "app-proxy") }}
3-
{{- $_ := set $appProxyContext.Values "global" (get .Values "global") }}
2+
{{- $_ := set $appProxyContext "Values" (deepCopy (get .Values "app-proxy")) }}
3+
{{- $_ := set $appProxyContext.Values "global" (deepCopy (get .Values "global")) }}
44
{{- if (index (get $appProxyContext "Values") "image-enrichment" "enabled") }}
55
{{- include "cap-app-proxy.image-enrichment.resources.sa" $appProxyContext }}
6-
{{- end }}
6+
{{- end }}

‎charts/gitops-runtime/templates/app-proxy/pdb.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{- $appProxyContext := deepCopy . }}
2-
{{- $_ := set $appProxyContext "Values" (get .Values "app-proxy") }}
3-
{{- $_ := set $appProxyContext.Values "global" (get .Values "global") }}
2+
{{- $_ := set $appProxyContext "Values" (deepCopy (get .Values "app-proxy")) }}
3+
{{- $_ := set $appProxyContext.Values "global" (deepCopy (get .Values "global")) }}
44

55
{{- if $appProxyContext.Values.pdb.enabled }}
66
{{- include "cap-app-proxy.resources.pdb" $appProxyContext }}

‎charts/gitops-runtime/templates/app-proxy/rbac.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{{- $appProxyContext := deepCopy . }}
2-
{{- $_ := set $appProxyContext "Values" (get .Values "app-proxy") }}
3-
{{- $_ := set $appProxyContext.Values "global" (get .Values "global") }}
4-
{{- include "cap-app-proxy.resources.rbac" $appProxyContext }}
2+
{{- $_ := set $appProxyContext "Values" (deepCopy (get .Values "app-proxy")) }}
3+
{{- $_ := set $appProxyContext.Values "global" (deepCopy (get .Values "global")) }}
4+
{{- include "cap-app-proxy.resources.rbac" $appProxyContext }}

‎charts/gitops-runtime/templates/app-proxy/service.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{{- $appProxyContext := deepCopy . }}
2-
{{- $_ := set $appProxyContext "Values" (get .Values "app-proxy") }}
3-
{{- $_ := set $appProxyContext.Values "global" (get .Values "global") }}
4-
{{- include "cap-app-proxy.resources.service" $appProxyContext }}
2+
{{- $_ := set $appProxyContext "Values" (deepCopy (get .Values "app-proxy")) }}
3+
{{- $_ := set $appProxyContext.Values "global" (deepCopy (get .Values "global")) }}
4+
{{- include "cap-app-proxy.resources.service" $appProxyContext }}

‎charts/gitops-runtime/templates/app-proxy/serviceaccount.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{{- $appProxyContext := deepCopy . }}
2-
{{- $_ := set $appProxyContext "Values" (get .Values "app-proxy") }}
3-
{{- $_ := set $appProxyContext.Values "global" (get .Values "global") }}
4-
{{- include "cap-app-proxy.resources.sa" $appProxyContext }}
2+
{{- $_ := set $appProxyContext "Values" (deepCopy (get .Values "app-proxy")) }}
3+
{{- $_ := set $appProxyContext.Values "global" (deepCopy (get .Values "global")) }}
4+
{{- include "cap-app-proxy.resources.sa" $appProxyContext }}

‎charts/gitops-runtime/templates/app-proxy/workflows-crb.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
{{- if index (get .Values "argo-workflows") "enabled" }}
33
{{- $appProxyContext := deepCopy . }}
4-
{{- $_ := set $appProxyContext "Values" (get .Values "app-proxy") }}
5-
{{- $_ := set $appProxyContext.Values "global" (get .Values "global") }}
4+
{{- $_ := set $appProxyContext "Values" (deepCopy (get .Values "app-proxy")) }}
5+
{{- $_ := set $appProxyContext.Values "global" (deepCopy (get .Values "global")) }}
66
apiVersion: rbac.authorization.k8s.io/v1
77
kind: ClusterRoleBinding
88
metadata:
@@ -15,4 +15,4 @@ subjects:
1515
- kind: ServiceAccount
1616
name: {{ include "cap-app-proxy.serviceAccountName" $appProxyContext }}
1717
namespace: {{ .Release.Namespace }}
18-
{{- end }}
18+
{{- end }}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
{{- if index (get .Values "argo-rollouts") "enabled" }}
55
{{- if and (index (get .Values "argo-rollouts") "clusterInstall") (index (get .Values "argo-rollouts") "controller" "createClusterRole") }}
66
{{- $eventReporterContext := deepCopy . }}
7-
{{- $_ := set $eventReporterContext "Values" (get .Values "event-reporters") }}
8-
{{- $_ := set $eventReporterContext.Values "global" (get .Values "global") }}
7+
{{- $_ := set $eventReporterContext "Values" (deepCopy (get .Values "event-reporters")) }}
8+
{{- $_ := set $eventReporterContext.Values "global" (deepCopy (get .Values "global")) }}
99
apiVersion: rbac.authorization.k8s.io/v1
1010
kind: ClusterRoleBinding
1111
metadata:
@@ -19,4 +19,4 @@ subjects:
1919
name: {{ include "event-reporters.rollout-reporter.serviceAccountName" $eventReporterContext }}
2020
namespace: {{ .Release.Namespace }}
2121
{{- end }}
22-
{{- end }}
22+
{{- end }}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{- if index (get .Values "argo-rollouts") "enabled" }}
22
{{- $eventReporterContext := deepCopy . }}
3-
{{- $_ := set $eventReporterContext "Values" (get .Values "event-reporters") }}
4-
{{- $_ := set $eventReporterContext.Values "global" (get .Values "global") }}
3+
{{- $_ := set $eventReporterContext "Values" (deepCopy (get .Values "event-reporters")) }}
4+
{{- $_ := set $eventReporterContext.Values "global" (deepCopy (get .Values "global")) }}
55
{{- include "event-reporters.rollout-reporter.eventsource" $eventReporterContext }}
6-
{{- end }}
6+
{{- end }}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{- if index (get .Values "argo-rollouts") "enabled" }}
22
{{- $eventReporterContext := deepCopy . }}
3-
{{- $_ := set $eventReporterContext "Values" (get .Values "event-reporters") }}
4-
{{- $_ := set $eventReporterContext.Values "global" (get .Values "global") }}
3+
{{- $_ := set $eventReporterContext "Values" (deepCopy (get .Values "event-reporters")) }}
4+
{{- $_ := set $eventReporterContext.Values "global" (deepCopy (get .Values "global")) }}
55
{{- include "event-reporters.rollout-reporter.rbac" $eventReporterContext }}
6-
{{- end }}
6+
{{- end }}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{- if index (get .Values "argo-rollouts") "enabled" }}
22
{{- $eventReporterContext := deepCopy . }}
3-
{{- $_ := set $eventReporterContext "Values" (get .Values "event-reporters") }}
4-
{{- $_ := set $eventReporterContext.Values "global" (get .Values "global") }}
3+
{{- $_ := set $eventReporterContext "Values" (deepCopy (get .Values "event-reporters")) }}
4+
{{- $_ := set $eventReporterContext.Values "global" (deepCopy (get .Values "global")) }}
55
{{- include "event-reporters.rollout-reporter.sensor" $eventReporterContext }}
6-
{{- end }}
6+
{{- end }}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{- if index (get .Values "argo-rollouts") "enabled" }}
22
{{- $eventReporterContext := deepCopy . }}
3-
{{- $_ := set $eventReporterContext "Values" (get .Values "event-reporters") }}
4-
{{- $_ := set $eventReporterContext.Values "global" (get .Values "global") }}
3+
{{- $_ := set $eventReporterContext "Values" (deepCopy (get .Values "event-reporters")) }}
4+
{{- $_ := set $eventReporterContext.Values "global" (deepCopy (get .Values "global")) }}
55
{{- include "event-reporters.rollout-reporter.sa" $eventReporterContext }}
6-
{{- end }}
6+
{{- end }}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
{{- if index (get .Values "argo-workflows") "enabled" }}
33
{{- $eventReporterContext := deepCopy . }}
4-
{{- $_ := set $eventReporterContext "Values" (get .Values "event-reporters") }}
5-
{{- $_ := set $eventReporterContext.Values "global" (get .Values "global") }}
4+
{{- $_ := set $eventReporterContext "Values" (deepCopy (get .Values "event-reporters")) }}
5+
{{- $_ := set $eventReporterContext.Values "global" (deepCopy (get .Values "global")) }}
66
{{- include "event-reporters.workflow-reporter.eventsource" $eventReporterContext }}
7-
{{- end }}
7+
{{- end }}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
{{- if index (get .Values "argo-workflows") "enabled" }}
33
{{- $eventReporterContext := deepCopy . }}
4-
{{- $_ := set $eventReporterContext "Values" (get .Values "event-reporters") }}
5-
{{- $_ := set $eventReporterContext.Values "global" (get .Values "global") }}
4+
{{- $_ := set $eventReporterContext "Values" (deepCopy (get .Values "event-reporters")) }}
5+
{{- $_ := set $eventReporterContext.Values "global" (deepCopy (get .Values "global")) }}
66
{{- include "event-reporters.workflow-reporter.rbac" $eventReporterContext }}
7-
{{- end }}
7+
{{- end }}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
{{- if index (get .Values "argo-workflows") "enabled" }}
33
{{- $eventReporterContext := deepCopy . }}
4-
{{- $_ := set $eventReporterContext "Values" (get .Values "event-reporters") }}
5-
{{- $_ := set $eventReporterContext.Values "global" (get .Values "global") }}
4+
{{- $_ := set $eventReporterContext "Values" (deepCopy (get .Values "event-reporters")) }}
5+
{{- $_ := set $eventReporterContext.Values "global" (deepCopy (get .Values "global")) }}
66
{{- include "event-reporters.workflow-reporter.sensor" $eventReporterContext }}
7-
{{- end }}
7+
{{- end }}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
{{- if index (get .Values "argo-workflows") "enabled" }}
33
{{- $eventReporterContext := deepCopy . }}
4-
{{- $_ := set $eventReporterContext "Values" (get .Values "event-reporters") }}
5-
{{- $_ := set $eventReporterContext.Values "global" (get .Values "global") }}
4+
{{- $_ := set $eventReporterContext "Values" (deepCopy (get .Values "event-reporters")) }}
5+
{{- $_ := set $eventReporterContext.Values "global" (deepCopy (get .Values "global")) }}
66
{{- include "event-reporters.workflow-reporter.sa" $eventReporterContext }}
7-
{{- end }}
7+
{{- end }}

0 commit comments

Comments
 (0)