Skip to content

Commit f7c8103

Browse files
mikhail-klimkomikhail-klimko
authored
feat: global constraints (#469)
1 parent c26b05c commit f7c8103

23 files changed

+1340
-159
lines changed

‎charts/gitops-runtime/Chart.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,26 @@ dependencies:
2020
version: 7.8.23-3-cap-v2.14.9-2025-04-23-4de04dd8
2121
- name: argo-events
2222
repository: https://codefresh-io.github.io/argo-helm
23-
version: 2.4.7-1-cap-CR-28072
23+
version: 2.4.7-2-cap-CR-28072
2424
- name: argo-workflows
2525
repository: https://codefresh-io.github.io/argo-helm
26-
version: 0.45.2-v3.6.4-cap-CR-27392
26+
version: 0.45.4-v3.6.4-cap-CR-27392
2727
condition: argo-workflows.enabled
2828
- name: argo-rollouts
2929
repository: https://codefresh-io.github.io/argo-helm
30-
version: 2.37.3-3-v1.7.2-cap-CR-28008
30+
version: 2.37.3-4-v1.7.2-cap-CR-28008
3131
condition: argo-rollouts.enabled
3232
- name: sealed-secrets
3333
repository: https://bitnami-labs.github.io/sealed-secrets/
3434
version: 2.17.2
3535
- name: codefresh-tunnel-client
3636
repository: oci://quay.io/codefresh/charts
37-
version: 0.1.19
37+
version: 0.1.21
3838
alias: tunnel-client
3939
condition: tunnel-client.enabled
4040
- name: codefresh-gitops-operator
4141
repository: oci://quay.io/codefresh/charts
42-
version: 0.5.5
42+
version: 0.7.0
4343
alias: gitops-operator
4444
condition: gitops-operator.enabled
4545
- name: garage
@@ -49,4 +49,4 @@ dependencies:
4949
condition: garage-workflows-artifact-storage.enabled
5050
- name: cf-argocd-extras
5151
repository: oci://quay.io/codefresh/charts
52-
version: 0.3.20
52+
version: 0.3.21

‎charts/gitops-runtime/templates/_components/cap-app-proxy/_deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,15 @@ spec:
8484
- mountPath: /app/config/all
8585
name: all-certs
8686
readOnly: true
87-
{{- with .Values.nodeSelector }}
87+
{{- with .Values.nodeSelector | default .Values.global.nodeSelector }}
8888
nodeSelector:
8989
{{- toYaml . | nindent 8 }}
9090
{{- end }}
9191
{{- with .Values.affinity }}
9292
affinity:
9393
{{- toYaml . | nindent 8}}
9494
{{- end }}
95-
{{- with .Values.tolerations }}
95+
{{- with .Values.tolerations | default .Values.global.tolerations}}
9696
tolerations:
9797
{{- toYaml . | nindent 6 }}
9898
{{- end }}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@ spec:
4848
{{- end }}
4949
serviceAccountName: {{ include "event-reporters.rollout-reporter.serviceAccountName" .}}
5050
tolerations:
51-
{{- with .Values.rollout.eventSource.tolerations }}
51+
{{- with .Values.rollout.eventSource.tolerations | default .Values.global.tolerations }}
5252
{{- . | toYaml | nindent 6 }}
5353
{{- end }}
5454
nodeSelector:
55-
{{- with .Values.rollout.eventSource.nodeSelector }}
55+
{{- with .Values.rollout.eventSource.nodeSelector | default .Values.global.nodeSelector }}
5656
{{- . | toYaml | nindent 6 }}
5757
{{- end }}
5858
affinity:
59-
{{- with .Values.rollout.eventSource.affinity }}
59+
{{- with .Values.affinity }}
6060
{{- . | toYaml | nindent 6 }}
6161
{{- end }}
62-
{{- end }}
62+
{{- end }}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ spec:
2828
{{- . | toYaml | nindent 8 }}
2929
{{- end }}
3030
tolerations:
31-
{{- with .Values.rollout.sensor.tolerations }}
31+
{{- with .Values.rollout.sensor.tolerations | default .Values.global.tolerations }}
3232
{{- . | toYaml | nindent 6 }}
3333
{{- end }}
3434
nodeSelector:
35-
{{- with .Values.rollout.sensor.nodeSelector }}
35+
{{- with .Values.rollout.sensor.nodeSelector | default .Values.global.nodeSelector}}
3636
{{- . | toYaml | nindent 6 }}
3737
{{- end }}
3838
affinity:
39-
{{- with .Values.rollout.sensor.affinity }}
39+
{{- with .Values.affinity }}
4040
{{- . | toYaml | nindent 6 }}
4141
{{- end }}
4242
triggers:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ spec:
2929
{{- end }}
3030
serviceAccountName: {{ include "event-reporters.workflow-reporter.serviceAccountName" .}}
3131
tolerations:
32-
{{- with .Values.workflow.eventSource.tolerations }}
32+
{{- with .Values.workflow.eventSource.tolerations | default .Values.global.tolerations }}
3333
{{- toYaml . | nindent 6 }}
3434
{{- end }}
3535
nodeSelector:
36-
{{- with .Values.workflow.eventSource.nodeSelector }}
36+
{{- with .Values.workflow.eventSource.nodeSelector | default .Values.global.nodeSelector }}
3737
{{- toYaml . | nindent 6 }}
3838
{{- end }}
3939
affinity:
40-
{{- with .Values.workflow.eventSource.affinity }}
40+
{{- with .Values.affinity }}
4141
{{- toYaml . | nindent 6 }}
4242
{{- end }}
43-
{{- end }}
43+
{{- end }}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ spec:
2222
{{- . | toYaml | nindent 8 }}
2323
{{- end }}
2424
tolerations:
25-
{{- with .Values.workflow.sensor.tolerations }}
25+
{{- with .Values.workflow.sensor.tolerations | default .Values.global.tolerations}}
2626
{{- . | toYaml | nindent 6 }}
2727
{{- end }}
2828
nodeSelector:
29-
{{- with .Values.workflow.sensor.nodeSelector }}
29+
{{- with .Values.workflow.sensor.nodeSelector | default .Values.global.nodeSelector }}
3030
{{- . | toYaml | nindent 6 }}
3131
{{- end }}
3232
affinity:
33-
{{- with .Values.workflow.sensor.affinity }}
33+
{{- with .Values.affinity }}
3434
{{- . | toYaml | nindent 6 }}
3535
{{- end }}
3636
triggers:

‎charts/gitops-runtime/templates/_components/internal-router/_deployment.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,16 @@ spec:
7070
path: default.conf.template
7171
- name: log
7272
emptyDir: { }
73-
{{- with .Values.nodeSelector }}
73+
{{- with .Values.nodeSelector | default .Values.global.nodeSelector }}
7474
nodeSelector:
7575
{{- toYaml . | nindent 8 }}
7676
{{- end }}
7777
{{- with .Values.affinity }}
7878
affinity:
7979
{{- toYaml . | nindent 8 }}
8080
{{- end }}
81-
{{- with .Values.tolerations }}
81+
{{- with .Values.tolerations | default .Values.global.tolerations }}
8282
tolerations:
8383
{{- toYaml . | nindent 8 }}
8484
{{- end }}
85-
{{- end }}
85+
{{- end }}

‎charts/gitops-runtime/templates/app-proxy/_app-proxy-volumes.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{- define "codefresh-gitops-runtime.app-proxy.extra-volumes" }}
22
extraVolumes:
3-
{{- if or .Values.global.codefresh.tls.caCerts.secret.create .Values.global.codefresh.tls.caCerts.secretKeyRef}}
3+
{{- if or .Values.global.codefresh.tls.caCerts.secret.create .Values.global.codefresh.tls.caCerts.secretKeyRef }}
44
- name: codefresh-tls-certs
55
secret:
66
secretName: {{ .Values.global.codefresh.tls.caCerts.secret.create | ternary "codefresh-tls-certs" .Values.global.codefresh.tls.caCerts.secretKeyRef.name }}
@@ -11,7 +11,7 @@ extraVolumes:
1111

1212
{{- define "codefresh-gitops-runtime.app-proxy.init.extra-volume-mounts" }}
1313
extraVolumeMounts:
14-
{{- if or .Values.global.codefresh.tls.caCerts.secret.create .Values.global.codefresh.tls.caCerts.secretKeyRef}}
14+
{{- if or .Values.global.codefresh.tls.caCerts.secret.create .Values.global.codefresh.tls.caCerts.secretKeyRef }}
1515
- mountPath: /app/config/codefresh-tls-certs
1616
name: codefresh-tls-certs
1717
readOnly: true

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{{- $appProxyContext := deepCopy . }}
2+
23
{{- $_ := set $appProxyContext "Values" (deepCopy (get .Values "app-proxy")) }}
34
{{- $_ := set $appProxyContext.Values "global" (deepCopy (get .Values "global")) }}
45
{{- $_ := set $appProxyContext.Values "argo-cd" (get .Values "argo-cd") }}

‎charts/gitops-runtime/templates/eventbus/codefresh-eventbus.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
{{- if hasKey $eventBusSpec "annotations" }}
1212
{{- $eventBusSpec = unset $eventBusSpec "annotations" }}
1313
{{- end }}
14+
15+
{{- $_ := set $eventBusSpec.nats.native "nodeSelector" ($eventBusSpec.nats.native.nodeSelector | default .Values.global.nodeSelector) }}
16+
{{- $_ := set $eventBusSpec.nats.native "tolerations" ($eventBusSpec.nats.native.tolerations | default .Values.global.tolerations) }}
17+
1418
apiVersion: argoproj.io/v1alpha1
1519
kind: EventBus
1620
metadata:
@@ -21,4 +25,4 @@ metadata:
2125
app.kubernetes.io/part-of: argo-events
2226
codefresh.io/internal: "true"
2327
spec:
24-
{{- $eventBusSpec | toYaml | nindent 2}}
28+
{{- $eventBusSpec | toYaml | nindent 2}}

‎charts/gitops-runtime/templates/gitops-operator.yaml

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,6 @@
33
{{- if index (get .Values "gitops-operator") "libraryMode" }}
44
{{- $gitopsOperatorContext := (deepCopy (index .Subcharts "gitops-operator"))}}
55

6-
{{- if and (index .Subcharts "argo-cd") }}
7-
8-
{{- $argoCDImageDict := index .Subcharts "argo-cd" "Values" "global" "image" }}
9-
{{- if not $argoCDImageDict.tag }}
10-
{{- $_ := set $argoCDImageDict "tag" (get .Subcharts "argo-cd").Chart.AppVersion }}
11-
{{- end }}
12-
13-
{{/* Set ArgoCD image */}}
14-
{{- if not (index .Values "gitops-operator" "argoCdNotifications" "imageOverride") }}
15-
{{- $_ := set $gitopsOperatorContext.Values.argoCdNotifications.image "repository" $argoCDImageDict.repository }}
16-
{{- $_ := set $gitopsOperatorContext.Values.argoCdNotifications.image "tag" $argoCDImageDict.tag }}
17-
{{- end }}
18-
19-
{{- else if and (index .Values "global" "external-argo-cd" "server" "image") }}
20-
21-
{{ $argoCDImageDict := (index .Values "global" "external-argo-cd" "server" "image") }}
22-
23-
{{/* Set ArgoCD image */}}
24-
{{- if not (index .Values "gitops-operator" "argoCdNotifications" "imageOverride") }}
25-
{{- $_ := set $gitopsOperatorContext.Values.argoCdNotifications.image "repository" (required "ArgoCD is not enabled and .Values.global.external-argo-cd.server.image is not set" $argoCDImageDict.repository) }}
26-
{{- $_ := set $gitopsOperatorContext.Values.argoCdNotifications.image "tag" (required "ArgoCD is not enabled and .Values.global.external-argo-cd.server.tag is not set" $argoCDImageDict.tag) }}
27-
{{- end }}
28-
29-
{{- else }}
30-
{{- fail "ArgoCD is not enabled and .Values.global.external-argo-cd.server.image is not set" }}
31-
{{- end }}
32-
336
{{- if and (not (index .Values "argo-cd" "enabled")) }}
347

358
{{- if and (eq (index .Values "global" "external-argo-cd" "auth" "type") "token") }}
@@ -45,10 +18,6 @@
4518
{{- end }}
4619
{{- end }}
4720

48-
{{/* Set repo server service and port */}}
49-
{{- $_ := set $gitopsOperatorContext.Values.argoCdNotifications.argocd.repoServer "fullname" (include "codefresh-gitops-runtime.argocd.reposerver.servicename" . ) }}
50-
{{- $_ := set $gitopsOperatorContext.Values.argoCdNotifications.argocd.repoServer "port" (include "codefresh-gitops-runtime.argocd.reposerver.serviceport" . ) }}
51-
5221
{{/* Set argo-cd-server service and port */}}
5322
{{ if not (index .Values "gitops-operator").env.ARGO_CD_URL }}
5423
{{- $_ := set $gitopsOperatorContext.Values.env "ARGO_CD_URL" (include "codefresh-gitops-runtime.argocd.server.no-protocol-url" . ) }}

‎charts/gitops-runtime/templates/hooks/pre-install/validate-usage.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ spec:
3737
fieldRef:
3838
fieldPath: metadata.namespace
3939
command: ["sh", "-c"]
40-
args:
40+
args:
4141
- |
4242
cf account validate-usage --fail-condition=reached --subject=clusters --values /job_tmp/values.yaml --namespace ${NAMESPACE} --hook --log-level debug
4343
volumeMounts:
@@ -47,4 +47,13 @@ spec:
4747
- name: validate-usage-volume
4848
configMap:
4949
name: validate-usage-config
50+
{{- with .Values.installer.nodeSelector | default .Values.global.nodeSelector }}
51+
nodeSelector: {{ toYaml . | nindent 8 }}
52+
{{- end }}
53+
{{- with .Values.installer.tolerations | default .Values.global.tolerations}}
54+
tolerations: {{ toYaml . | nindent 6 }}
55+
{{- end }}
56+
{{- with .Values.installer.affinity }}
57+
affinity: {{ toYaml . | nindent 8 }}
58+
{{- end }}
5059
{{- end }}

‎charts/gitops-runtime/templates/hooks/pre-install/validate-values.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,5 +174,14 @@ spec:
174174
volumes:
175175
- name: customized-values
176176
configMap:
177-
name: validate-values-config
177+
name: validate-values-config
178+
{{- with .Values.installer.nodeSelector | default .Values.global.nodeSelector }}
179+
nodeSelector: {{ toYaml . | nindent 8 }}
180+
{{- end }}
181+
{{- with .Values.installer.tolerations | default .Values.global.tolerations}}
182+
tolerations: {{ toYaml . | nindent 6 }}
183+
{{- end }}
184+
{{- with .Values.installer.affinity }}
185+
affinity: {{ toYaml . | nindent 8 }}
186+
{{- end }}
178187
{{- end }}

‎charts/gitops-runtime/templates/hooks/pre-uninstall/cleanup-resources.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,18 @@ spec:
1616
image: "{{ .Values.installer.image.repository }}:{{ .Values.installer.image.tag | default .Chart.Version }}"
1717
imagePullPolicy: {{ .Values.installer.image.pullPolicy }}
1818
command: ["sh", "-c"]
19-
args:
19+
args:
2020
- |
2121
kubectl patch EventBus $(kubectl get eventbus -l codefresh.io/internal=true | awk 'NR>1{print $1}' | xargs) -p '{"metadata":{"finalizers":null}}' --type=merge && \
2222
kubectl patch Eventsource $(kubectl get EventSource -l codefresh.io/internal=true | awk 'NR>1{print $1}' | xargs) -p '{"metadata":{"finalizers":null}}' --type=merge && \
2323
kubectl patch Sensor $(kubectl get Sensor -l codefresh.io/internal=true | awk 'NR>1{print $1}' | xargs) -p '{"metadata":{"finalizers":null}}' --type=merge ;
2424
return 0
25+
{{- with .Values.installer.nodeSelector | default .Values.global.nodeSelector }}
26+
nodeSelector: {{ toYaml . | nindent 8 }}
27+
{{- end }}
28+
{{- with .Values.installer.tolerations | default .Values.global.tolerations}}
29+
tolerations: {{ toYaml . | nindent 6 }}
30+
{{- end }}
31+
{{- with .Values.installer.affinity }}
32+
affinity: {{ toYaml . | nindent 8 }}
33+
{{- end }}

‎charts/gitops-runtime/templates/hooks/pre-uninstall/delete-runtime-from-platform.yaml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
{{- $customCASecretName = .Values.global.codefresh.tls.caCerts.secret.create | ternary "codefresh-tls-certs" .Values.global.codefresh.tls.caCerts.secretKeyRef.name }}
55
{{- $customCASecretKey = .Values.global.codefresh.tls.caCerts.secret.create | ternary (default "ca-bundle.crt" .Values.global.codefresh.tls.caCerts.secret.key) .Values.global.codefresh.tls.caCerts.secretKeyRef.key }}
66
{{- end }}
7+
---
78
apiVersion: batch/v1
89
kind: Job
910
metadata:
@@ -38,7 +39,7 @@ spec:
3839
readOnly: true
3940
{{- end }}
4041
command: ["sh", "-c"]
41-
args:
42+
args:
4243
- |
4344
if [ ! -z "$USER_TOKEN" ]; then
4445
curl ${PLATFORM_URL}/2.0/api/graphql -H "Authorization: ${USER_TOKEN}" -H "Content-Type: application/json" -d "{\"query\": \"mutation deleteRuntime(\$name: String"'!'") {\n deleteRuntime(name: \$name) }\",\"variables\": {\"name\": \"${RUNTIME_NAME}\"}}"
@@ -54,3 +55,12 @@ spec:
5455
defaultMode: 420
5556
optional: true
5657
{{- end }}
58+
{{- with .Values.installer.nodeSelector | default .Values.global.nodeSelector }}
59+
nodeSelector: {{ toYaml . | nindent 8 }}
60+
{{- end }}
61+
{{- with .Values.installer.tolerations | default .Values.global.tolerations}}
62+
tolerations: {{ toYaml . | nindent 6 }}
63+
{{- end }}
64+
{{- with .Values.installer.affinity }}
65+
affinity: {{ toYaml . | nindent 8 }}
66+
{{- end }}

‎charts/gitops-runtime/templates/ingress.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ metadata:
1818
name: codefresh-gitops-runtime
1919
labels:
2020
{{- include "codefresh-gitops-runtime.labels" . | nindent 4 }}
21+
{{- with .Values.global.runtime.ingress.labels }}
22+
{{- toYaml . | nindent 4 }}
23+
{{- end }}
2124
{{- with .Values.global.runtime.ingress.annotations }}
2225
annotations:
2326
{{- toYaml . | nindent 4 }}
@@ -63,6 +66,6 @@ spec:
6366
port:
6467
number: 80
6568
path: /app-proxy
66-
pathType: Prefix
69+
pathType: Prefix
6770
{{- end }}
68-
{{- end }}
71+
{{- end }}

0 commit comments

Comments
 (0)