Skip to content

Commit 6da4c84

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

33 files changed

+150
-97
lines changed

‎charts/gitops-runtime/README.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@ The utility will output 4 files into the folder:
103103
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.
104104
4. `values-images-with-tags.yaml` - The same as 3 but with tags **included**.
105105

106+
For usage with external ArgoCD run the utility with `EXTERNAL_ARGOCD` environment variable set to `true`.
107+
```
108+
docker run -e EXTERNAL_ARGOCD=true -v <output_dir>:/output quay.io/codefresh/gitops-runtime-private-registry-utils:0.18.1 <local_registry>
109+
```
110+
106111
## Openshift
107112

108113
```yaml
@@ -268,7 +273,7 @@ sealed-secrets:
268273
| garage-workflows-artifact-storage.persistence.meta.storageClass | string | `""` | When empty value empty the default storage class for the cluster will be used |
269274
| garage-workflows-artifact-storage.resources | object | `{}` | Resources for garage pods. For smaller deployments at least 100m CPU and 1024Mi memory is reccommended. For larger deployments double this size. |
270275
| garage-workflows-artifact-storage.tests | object | `{"enabled":false}` | Helm tests |
271-
| gitops-operator | object | `{"affinity":{},"argoCdNotifications":{"image":{},"imageOverride":false,"resources":{}},"crds":{"additionalLabels":{},"annotations":{},"install":true,"keep":false},"enabled":true,"env":{},"fullnameOverride":"","image":{},"imagePullSecrets":[],"kube-rbac-proxy":{"image":{"tag":"v0.16.0"},"resources":{"limits":{"cpu":"500m","memory":"128Mi"},"requests":{"cpu":"100m","memory":"64Mi"}},"securityContext":{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]}}},"libraryMode":true,"nameOverride":"","nodeSelector":{},"podAnnotations":{},"podLabels":{},"replicaCount":1,"resources":{"limits":{},"requests":{"cpu":"100m","memory":"128Mi"}},"serviceAccount":{"annotations":{},"create":true,"name":"gitops-operator-controller-manager"},"tolerations":[]}` | ------------------------------------------------------------------------------------------------------------------- |
276+
| gitops-operator | object | `{"affinity":{},"argoCdNotifications":{"image":{},"imageOverride":false,"resources":{}},"crds":{"additionalLabels":{},"annotations":{},"install":true,"keep":false},"enabled":true,"env":{},"fullnameOverride":"","image":{},"imagePullSecrets":[],"libraryMode":true,"nameOverride":"","nodeSelector":{},"podAnnotations":{},"podLabels":{},"replicaCount":1,"resources":{"limits":{},"requests":{"cpu":"100m","memory":"128Mi"},"resources":{"limits":{"cpu":"500m","memory":"128Mi"},"requests":{"cpu":"100m","memory":"64Mi"}},"securityContext":{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]}}},"serviceAccount":{"annotations":{},"create":true,"name":"gitops-operator-controller-manager"},"tolerations":[]}` | ------------------------------------------------------------------------------------------------------------------- |
272277
| gitops-operator.argoCdNotifications | object | `{"image":{},"imageOverride":false,"resources":{}}` | Builtin notifications controller used by gitops-operator for promotion related notifications |
273278
| gitops-operator.argoCdNotifications.image | object | `{}` | Set image.repository and image.tag notifications image used by the gitops operator. Ignored unless imageOverride is set to true. |
274279
| gitops-operator.argoCdNotifications.imageOverride | bool | `false` | If set to true allows to override notifications image used by the gitops operator. When set to false the version of ArgoCD will be set to the version used for all other ArgoCD components. |

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

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

107+
108+
For usage with external ArgoCD run the utility with `EXTERNAL_ARGOCD` environment variable set to `true`.
109+
```
110+
docker run -e EXTERNAL_ARGOCD=true -v <output_dir>:/output quay.io/codefresh/gitops-runtime-private-registry-utils:{{ template "chart.version" . }} <local_registry>
111+
```
112+
113+
107114
## Openshift
108115

109116
```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 }}

0 commit comments

Comments
 (0)