Skip to content

Commit db286d8

Browse files
mikhail-klimkomikhail-klimko
authored
Merge pull request #81 from codefresh-io/fix-argocd-svc-override
fix: argocd svc and port overrides; arm support for app-proxy
2 parents 0717116 + ba9469a commit db286d8

File tree

10 files changed

+128
-10
lines changed

10 files changed

+128
-10
lines changed

‎charts/gitops-runtime/Chart.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
appVersion: 0.1.35
33
description: A Helm chart for Codefresh gitops runtime
44
name: gitops-runtime
5-
version: 0.2.20
5+
version: 0.2.21
66
home: https://github.com/codefresh-io/gitops-runtime-helm
77
icon: https://avatars1.githubusercontent.com/u/11412079?v=3
88
keywords:
@@ -14,8 +14,10 @@ maintainers:
1414
annotations:
1515
artifacthub.io/alternativeName: "codefresh-gitops-runtime"
1616
artifacthub.io/changes: |
17+
- kind: fixed
18+
description: Fix argoCDServerServiceName and argoCDServerServicePort overrides
1719
- kind: changed
18-
description: Update ArgoCD to v2.8.1-cap-CR-not-setup-kustomize-ns
20+
description: Update app-proxy for ARM support
1921
dependencies:
2022
- name: argo-cd
2123
repository: https://codefresh-io.github.io/argo-helm

‎charts/gitops-runtime/README.md

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## Codefresh gitops runtime
2-
![Version: 0.2.20](https://img.shields.io/badge/Version-0.2.20-informational?style=flat-square) ![AppVersion: 0.1.35](https://img.shields.io/badge/AppVersion-0.1.35-informational?style=flat-square)
2+
![Version: 0.2.21](https://img.shields.io/badge/Version-0.2.21-informational?style=flat-square) ![AppVersion: 0.1.35](https://img.shields.io/badge/AppVersion-0.1.35-informational?style=flat-square)
33

44
## Codefresh official documentation:
55
Prior to running the installation please see the official documentation at: https://codefresh.io/docs/docs/installation/gitops/hybrid-gitops-helm-installation/
@@ -15,7 +15,7 @@ We have created a helper utility to resolve this issue:
1515
The utility is packaged in a container image. Below are instructions on executing the utility using Docker:
1616

1717
```
18-
docker run -v <output_dir>:/output quay.io/codefresh/gitops-runtime-private-registry-utils:0.2.20 <local_registry>
18+
docker run -v <output_dir>:/output quay.io/codefresh/gitops-runtime-private-registry-utils:0.2.21 <local_registry>
1919
```
2020
`output_dir` - is a local directory where the utility will output files. <br>
2121
`local_registry` - is your local registry where you want to mirror the images to
@@ -88,14 +88,14 @@ sealed-secrets:
8888
| 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 |
8989
| app-proxy.image.pullPolicy | string | `"IfNotPresent"` | |
9090
| app-proxy.image.repository | string | `"quay.io/codefresh/cap-app-proxy"` | |
91-
| app-proxy.image.tag | string | `"1.2411.2"` | |
91+
| app-proxy.image.tag | string | `"1.2472.0"` | |
9292
| app-proxy.imagePullSecrets | list | `[]` | |
9393
| app-proxy.initContainer.command[0] | string | `"./init.sh"` | |
9494
| app-proxy.initContainer.env | object | `{}` | |
9595
| app-proxy.initContainer.extraVolumeMounts | list | `[]` | Extra volume mounts for init container |
9696
| app-proxy.initContainer.image.pullPolicy | string | `"IfNotPresent"` | |
9797
| app-proxy.initContainer.image.repository | string | `"quay.io/codefresh/cap-app-proxy-init"` | |
98-
| app-proxy.initContainer.image.tag | string | `"1.2411.2"` | |
98+
| app-proxy.initContainer.image.tag | string | `"1.2472.0"` | |
9999
| app-proxy.initContainer.resources.limits.cpu | string | `"1"` | |
100100
| app-proxy.initContainer.resources.limits.memory | string | `"512Mi"` | |
101101
| app-proxy.initContainer.resources.requests.cpu | string | `"0.2"` | |
@@ -146,20 +146,38 @@ sealed-secrets:
146146
| argo-workflows.fullnameOverride | string | `"argo"` | |
147147
| event-reporters.events.argoCDServerServiceName | string | `nil` | LEAVE EMPTY and let the chart logic determine the name. Change only if you are totally sure you need to override ArgoCD service name. |
148148
| event-reporters.events.argoCDServerServicePort | string | `nil` | LEAVE EMPTY and let the chart logic determine the name. Change only if you are totally sure you need to override ArgoCD service port. |
149+
| event-reporters.events.eventSource.affinity | object | `{}` | |
150+
| event-reporters.events.eventSource.nodeSelector | object | `{}` | |
149151
| event-reporters.events.eventSource.replicas | int | `1` | |
150152
| event-reporters.events.eventSource.resources | object | `{}` | |
153+
| event-reporters.events.eventSource.tolerations | list | `[]` | |
154+
| event-reporters.events.sensor.affinity | object | `{}` | |
155+
| event-reporters.events.sensor.nodeSelector | object | `{}` | |
151156
| event-reporters.events.sensor.replicas | int | `1` | |
152157
| event-reporters.events.sensor.resources | object | `{}` | |
158+
| event-reporters.events.sensor.tolerations | list | `[]` | |
153159
| event-reporters.events.serviceAccount.create | bool | `true` | |
160+
| event-reporters.rollout.eventSource.affinity | object | `{}` | |
161+
| event-reporters.rollout.eventSource.nodeSelector | object | `{}` | |
154162
| event-reporters.rollout.eventSource.replicas | int | `1` | |
155163
| event-reporters.rollout.eventSource.resources | object | `{}` | |
164+
| event-reporters.rollout.eventSource.tolerations | list | `[]` | |
165+
| event-reporters.rollout.sensor.affinity | object | `{}` | |
166+
| event-reporters.rollout.sensor.nodeSelector | object | `{}` | |
156167
| event-reporters.rollout.sensor.replicas | int | `1` | |
157168
| event-reporters.rollout.sensor.resources | object | `{}` | |
169+
| event-reporters.rollout.sensor.tolerations | list | `[]` | |
158170
| event-reporters.rollout.serviceAccount.create | bool | `true` | |
171+
| event-reporters.workflow.eventSource.affinity | object | `{}` | |
172+
| event-reporters.workflow.eventSource.nodeSelector | object | `{}` | |
159173
| event-reporters.workflow.eventSource.replicas | int | `1` | |
160174
| event-reporters.workflow.eventSource.resources | object | `{}` | |
175+
| event-reporters.workflow.eventSource.tolerations | list | `[]` | |
176+
| event-reporters.workflow.sensor.affinity | object | `{}` | |
177+
| event-reporters.workflow.sensor.nodeSelector | object | `{}` | |
161178
| event-reporters.workflow.sensor.replicas | int | `1` | |
162179
| event-reporters.workflow.sensor.resources | object | `{}` | |
180+
| event-reporters.workflow.sensor.tolerations | list | `[]` | |
163181
| event-reporters.workflow.serviceAccount.create | bool | `true` | |
164182
| global.codefresh | object | `{"accountId":"","apiEventsPath":"/2.0/api/events","tls":{"caCerts":{"secret":{"annotations":{},"content":"","create":false,"key":"ca-bundle.crt"},"secretKeyRef":{}},"workflowPipelinesGitWebhooks":{"annotatins":{},"certificates":{}}},"url":"https://g.codefresh.io","userToken":{"secretKeyRef":{},"token":""}}` | Codefresh platform and account-related settings |
165183
| global.codefresh.accountId | string | `""` | Codefresh Account ID. |

‎charts/gitops-runtime/templates/_components/event-reporters/events-reporter/_event-source.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,16 @@ spec:
2323
{{- with .Values.events.eventSource.resources }}
2424
{{- . | toYaml | nindent 8 }}
2525
{{- end }}
26+
tolerations:
27+
{{- with .Values.events.eventSource.tolerations }}
28+
{{- . | toYaml | nindent 6 }}
29+
{{- end }}
30+
nodeSelector:
31+
{{- with .Values.events.eventSource.nodeSelector }}
32+
{{- . | toYaml | nindent 6 }}
33+
{{- end }}
34+
affinity:
35+
{{- with .Values.events.eventSource.affinity }}
36+
{{- . | toYaml | nindent 6 }}
37+
{{- end }}
2638
{{- end }}

‎charts/gitops-runtime/templates/_components/event-reporters/events-reporter/_sensor.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,18 @@ spec:
1919
{{- with .Values.events.sensor.resources }}
2020
{{- . | toYaml | nindent 8 }}
2121
{{- end }}
22+
tolerations:
23+
{{- with .Values.events.sensor.tolerations }}
24+
{{- . | toYaml | nindent 6 }}
25+
{{- end }}
26+
nodeSelector:
27+
{{- with .Values.events.sensor.nodeSelector }}
28+
{{- . | toYaml | nindent 6 }}
29+
{{- end }}
30+
affinity:
31+
{{- with .Values.events.sensor.affinity }}
32+
{{- . | toYaml | nindent 6 }}
33+
{{- end }}
2234
triggers:
2335
{{- include "event-reporters.http.trigger" (dict "name" "events" "Values" .Values "payloadDest" "data") | nindent 4 }}
2436
{{- end }}

‎charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_event-source.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,16 @@ spec:
4747
{{- . | toYaml | nindent 8 }}
4848
{{- end }}
4949
serviceAccountName: {{ include "event-reporters.rollout-reporter.serviceAccountName" .}}
50+
tolerations:
51+
{{- with .Values.rollout.eventSource.tolerations }}
52+
{{- . | toYaml | nindent 6 }}
53+
{{- end }}
54+
nodeSelector:
55+
{{- with .Values.rollout.eventSource.nodeSelector }}
56+
{{- . | toYaml | nindent 6 }}
57+
{{- end }}
58+
affinity:
59+
{{- with .Values.rollout.eventSource.affinity }}
60+
{{- . | toYaml | nindent 6 }}
61+
{{- end }}
5062
{{- end }}

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,18 @@ spec:
2626
{{- with .Values.rollout.eventSource.resources }}
2727
{{- . | toYaml | nindent 8 }}
2828
{{- end }}
29+
tolerations:
30+
{{- with .Values.rollout.eventSource.tolerations }}
31+
{{- . | toYaml | nindent 6 }}
32+
{{- end }}
33+
nodeSelector:
34+
{{- with .Values.rollout.eventSource.nodeSelector }}
35+
{{- . | toYaml | nindent 6 }}
36+
{{- end }}
37+
affinity:
38+
{{- with .Values.rollout.eventSource.affinity }}
39+
{{- . | toYaml | nindent 6 }}
40+
{{- end }}
2941
triggers:
3042
{{- include "event-reporters.http.trigger" (dict "name" "rollouts" "Values" .Values "payloadDest" "data.object") | nindent 4 }}
3143
{{- include "event-reporters.http.trigger" (dict "name" "replicasets" "Values" .Values "payloadDest" "data.object") | nindent 4 }}

‎charts/gitops-runtime/templates/_components/event-reporters/workflow-reporter/_event-source.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,16 @@ spec:
2828
{{- . | toYaml | nindent 8 }}
2929
{{- end }}
3030
serviceAccountName: {{ include "event-reporters.workflow-reporter.serviceAccountName" .}}
31+
tolerations:
32+
{{- with .Values.workflow.eventSource.tolerations }}
33+
{{- toYaml . | nindent 6 }}
34+
{{- end }}
35+
nodeSelector:
36+
{{- with .Values.workflow.eventSource.nodeSelector }}
37+
{{- toYaml . | nindent 6 }}
38+
{{- end }}
39+
affinity:
40+
{{- with .Values.workflow.eventSource.affinity }}
41+
{{- toYaml . | nindent 6 }}
42+
{{- end }}
3143
{{- end }}

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,18 @@ spec:
2020
{{- with .Values.workflow.sensor.resources }}
2121
{{- . | toYaml | nindent 8 }}
2222
{{- end }}
23+
tolerations:
24+
{{- with .Values.workflow.sensor.tolerations }}
25+
{{- . | toYaml | nindent 6 }}
26+
{{- end }}
27+
nodeSelector:
28+
{{- with .Values.workflow.sensor.nodeSelector }}
29+
{{- . | toYaml | nindent 6 }}
30+
{{- end }}
31+
affinity:
32+
{{- with .Values.workflow.sensor.affinity }}
33+
{{- . | toYaml | nindent 6 }}
34+
{{- end }}
2335
triggers:
2436
{{- include "event-reporters.http.trigger" (dict "name" "workflows" "Values" .Values "payloadDest" "data.object") | nindent 4 }}
2537
{{- end }}

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
{{- $_ := set $eventReporterContext "Values" (get .Values "event-reporters") }}
33
{{- $_ := set $eventReporterContext.Values "global" (get .Values "global") }}
44
# should allow overwriting in values.yaml
5-
{{- $_ := set $eventReporterContext.Values.events "argoCDServerServiceName" ( include "codefresh-gitops-runtime.argocd.server.servicename" . ) }}
6-
{{- $_ := set $eventReporterContext.Values.events "argoCDServerServicePort" ( include "codefresh-gitops-runtime.argocd.server.serviceport" . ) }}
5+
{{- $argoCDServerServiceName := (include "codefresh-gitops-runtime.argocd.server.servicename" .) -}}
6+
{{- $argoCDServerServicePort := ( include "codefresh-gitops-runtime.argocd.server.serviceport" . ) -}}
7+
{{- if $eventReporterContext.Values.events.argoCDServerServiceName -}}
8+
{{ $argoCDServerServiceName = $eventReporterContext.Values.events.argoCDServerServiceName }}
9+
{{- end -}}
10+
{{- if $eventReporterContext.Values.events.argoCDServerServicePort -}}
11+
{{ $argoCDServerServicePort = $eventReporterContext.Values.events.argoCDServerServicePort }}
12+
{{- end -}}
13+
{{- $_ := set $eventReporterContext.Values.events "argoCDServerServiceName" $argoCDServerServiceName }}
14+
{{- $_ := set $eventReporterContext.Values.events "argoCDServerServicePort" $argoCDServerServicePort }}
715
{{- include "event-reporters.events-reporter.eventsource" $eventReporterContext }}

‎charts/gitops-runtime/values.yaml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,27 +183,45 @@ event-reporters:
183183
eventSource:
184184
replicas: 1
185185
resources: {}
186+
tolerations: []
187+
nodeSelector: {}
188+
affinity: {}
186189
sensor:
187190
replicas: 1
188191
resources: {}
192+
tolerations: []
193+
nodeSelector: {}
194+
affinity: {}
189195
rollout:
190196
serviceAccount:
191197
create: true
192198
eventSource:
193199
replicas: 1
194200
resources: {}
201+
tolerations: []
202+
nodeSelector: {}
203+
affinity: {}
195204
sensor:
196205
replicas: 1
197206
resources: {}
207+
tolerations: []
208+
nodeSelector: {}
209+
affinity: {}
198210
workflow:
199211
serviceAccount:
200212
create: true
201213
eventSource:
202214
replicas: 1
203215
resources: {}
216+
tolerations: []
217+
nodeSelector: {}
218+
affinity: {}
204219
sensor:
205220
replicas: 1
206221
resources: {}
222+
tolerations: []
223+
nodeSelector: {}
224+
affinity: {}
207225

208226
#-----------------------------------------------------------------------------------------------------------------------
209227
# Internal router
@@ -335,15 +353,15 @@ app-proxy:
335353
tag: 1.1.10-main
336354
image:
337355
repository: quay.io/codefresh/cap-app-proxy
338-
tag: 1.2411.2
356+
tag: 1.2472.0
339357
pullPolicy: IfNotPresent
340358
# -- Extra volume mounts for main container
341359
extraVolumeMounts: []
342360

343361
initContainer:
344362
image:
345363
repository: quay.io/codefresh/cap-app-proxy-init
346-
tag: 1.2411.2
364+
tag: 1.2472.0
347365
pullPolicy: IfNotPresent
348366
command:
349367
- ./init.sh

0 commit comments

Comments
 (0)