Skip to content

Commit 962b1ae

Browse files
mikhail-klimkomikhail-klimko
committed
refactor cf-argocd-extras
1 parent 69d767e commit 962b1ae

14 files changed

+942
-1399
lines changed

‎charts/gitops-runtime/templates/argo-api-gateway/_env.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ ARGO_CD_TOKEN_SECRET_KEY: "token"
1313
{{- end }}
1414
{{- end }}
1515

16-
{{- with (index .Values "global" "external-argo-cd" "server" "rootpath") }}
17-
ARGOCD_SERVER_ROOTPATH: {{ . }}
18-
{{- end }}
16+
ARGOCD_SERVER_ROOTPATH: {{ dig "server" "rootpath" "/" (index .Values "global" "external-argo-cd") | quote }}
1917

2018
{{- if or .Values.global.codefresh.tls.caCerts.secret.create (and .Values.global.codefresh.tls.caCerts.secretKeyRef.key .Values.global.codefresh.tls.caCerts.secretKeyRef.name) }}
2119
{{- $secretKey := .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 }}

‎charts/gitops-runtime/templates/event-reporters/resources-reporter/_env.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ ARGO_CD_TOKEN_SECRET_KEY: "token"
1313
{{- end }}
1414
{{- end }}
1515

16-
{{- with (index .Values "global" "external-argo-cd" "server" "rootpath") }}
17-
ARGOCD_SERVER_ROOTPATH: {{ . }}
18-
{{- end }}
16+
ARGOCD_SERVER_ROOTPATH: {{ dig "server" "rootpath" "/" (index .Values "global" "external-argo-cd") | quote }}
1917

2018
{{- if or .Values.global.codefresh.tls.caCerts.secret.create (and .Values.global.codefresh.tls.caCerts.secretKeyRef.key .Values.global.codefresh.tls.caCerts.secretKeyRef.name) }}
2119
{{- $secretKey := .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 }}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ ARGO_CD_TOKEN_SECRET_KEY: "token"
1313
{{- end }}
1414
{{- end }}
1515

16-
{{- with (index .Values "global" "external-argo-cd" "server" "rootpath") }}
17-
ARGOCD_SERVER_ROOTPATH: {{ . }}
18-
{{- end }}
16+
ARGOCD_SERVER_ROOTPATH: {{ dig "server" "rootpath" "/" (index .Values "global" "external-argo-cd") | quote }}
1917

2018
{{- if or .Values.global.codefresh.tls.caCerts.secret.create (and .Values.global.codefresh.tls.caCerts.secretKeyRef.key .Values.global.codefresh.tls.caCerts.secretKeyRef.name) }}
2119
{{- $secretKey := .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 }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ NAMESPACE:
1515
{{- define "installer.validate-values.environment-variables.defaults" -}}
1616
ARGOCD_CHECK_VERSION: {{ not (get .Values "argo-cd").enabled | quote }}
1717
ARGOCD_LABELS: "{{ range $k, $v := .Values.installer.argoCdVersionCheck.argoServerLabels }}{{ $k }}={{ $v }},{{ end }}"
18-
ARGOCD_ROOT_PATH: {{ dig "external-argo-cd" "server" "rootpath" "/" dict (get .Values "global") }}
18+
ARGOCD_SERVER_ROOTPATH: {{ dig "server" "rootpath" "/" (index .Values "global" "external-argo-cd") | quote }}
1919
ARGOCD_VERSION_PATH: "/api/version"
2020
CHART_VERSION: {{ .Chart.Version }}
2121
NAMESPACE:

‎charts/gitops-runtime/tests/argo-api-gateway_test.yaml‎

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
# yaml-language-server: $schema=https://raw.githubusercontent.com/helm-unittest/helm-unittest/main/schema/helm-testsuite.json
2+
suite: argo-api-gateway tests
3+
templates:
4+
- argo-api-gateway/**
5+
tests:
6+
- it: Argo Api Gateway ConfigMap should have valid data
7+
template: argo-api-gateway/configmap.yaml
8+
values:
9+
- ./values/mandatory-values-ingress.yaml
10+
asserts:
11+
- equal:
12+
path: data["argocd.server"]
13+
value: argo-cd-server:80
14+
- equal:
15+
path: data["redis.server"]
16+
value: argo-cd-redis:6379
17+
- equal:
18+
path: data["repo.server"]
19+
value: argo-cd-repo-server:8081
20+
21+
- it: Argo Api Gateway Deployment should have valid matchLabel selectors
22+
template: argo-api-gateway/deployment.yaml
23+
values:
24+
- ./values/mandatory-values-ingress.yaml
25+
asserts:
26+
- equal:
27+
path: spec.selector.matchLabels
28+
value:
29+
app.kubernetes.io/name: argo-api-gateway
30+
app.kubernetes.io/instance: RELEASE-NAME
31+
- equal:
32+
path: spec.template.metadata.labels
33+
value:
34+
app.kubernetes.io/name: argo-api-gateway
35+
app.kubernetes.io/instance: RELEASE-NAME
36+
37+
- it: Argo Api Gateway Service should have valid matchLabel selectors
38+
template: argo-api-gateway/service.yaml
39+
values:
40+
- ./values/mandatory-values-ingress.yaml
41+
asserts:
42+
- equal:
43+
path: spec.selector
44+
value:
45+
app.kubernetes.io/name: argo-api-gateway
46+
app.kubernetes.io/instance: RELEASE-NAME
47+
48+
- it: Argo Api Gateway should be deployed with forked ArgoCD
49+
template: argo-api-gateway/deployment.yaml
50+
values:
51+
- ./values/mandatory-values-ingress.yaml
52+
asserts:
53+
- hasDocuments:
54+
count: 1
55+
- isKind:
56+
of: Deployment
57+
- equal:
58+
path: metadata.name
59+
value: argo-api-gateway
60+
61+
- it: Argo Api Gateway should be deployed with external OSS ArgoCD
62+
template: argo-api-gateway/deployment.yaml
63+
values:
64+
- ./values/mandatory-values-ingress.yaml
65+
- ./values/external-argocd-values.yaml
66+
asserts:
67+
- hasDocuments:
68+
count: 1
69+
- isKind:
70+
of: Deployment
71+
- equal:
72+
path: metadata.name
73+
value: argo-api-gateway
74+
75+
- it: Argo Api Gateway ConfigMap should have valid redis-ha url
76+
template: argo-api-gateway/configmap.yaml
77+
values:
78+
- ./values/mandatory-values-ingress.yaml
79+
set:
80+
argo-cd:
81+
redis-ha:
82+
enabled: true
83+
asserts:
84+
- equal:
85+
path: data["redis.server"]
86+
value: RELEASE-NAME-redis-ha-haproxy:6379
87+
88+
- it: Argo Api Gateway should have CODEFRESH_SSL_CERT_PATH env var when .Values.global.codefresh.tls.caCerts.secret.create is true
89+
template: argo-api-gateway/deployment.yaml
90+
values:
91+
- ./values/mandatory-values-ingress.yaml
92+
set:
93+
global:
94+
codefresh:
95+
tls:
96+
caCerts:
97+
secret:
98+
create: true
99+
key: ca-bundle.crt
100+
content: |
101+
-----BEGIN CERTIFICATE-----
102+
MIID...
103+
-----END CERTIFICATE-----
104+
asserts:
105+
- equal:
106+
path: spec.template.spec.containers[0].env[?(@.name == 'CODEFRESH_SSL_CERT_PATH')].value
107+
value: /app/config/codefresh-tls-certs/ca-bundle.crt
108+
- contains:
109+
path: spec.template.spec.volumes
110+
content:
111+
name: codefresh-tls-certs
112+
secret:
113+
secretName: codefresh-tls-certs
114+
- contains:
115+
path: spec.template.spec.containers[0].volumeMounts
116+
content:
117+
name: codefresh-tls-certs
118+
mountPath: /app/config/codefresh-tls-certs
119+
readOnly: true
120+
121+
- it: Argo Api Gateway should have CODEFRESH_SSL_CERT_PATH env var when .Values.global.codefresh.tls.caCerts.secretKeyRef is set
122+
template: argo-api-gateway/deployment.yaml
123+
values:
124+
- ./values/mandatory-values-ingress.yaml
125+
set:
126+
global:
127+
codefresh:
128+
tls:
129+
caCerts:
130+
secretKeyRef:
131+
name: my-codefresh-tls-certs
132+
key: my-ca-bundle.crt
133+
asserts:
134+
- equal:
135+
path: spec.template.spec.containers[0].env[?(@.name == 'CODEFRESH_SSL_CERT_PATH')].value
136+
value: /app/config/codefresh-tls-certs/my-ca-bundle.crt
137+
- contains:
138+
path: spec.template.spec.volumes
139+
content:
140+
name: codefresh-tls-certs
141+
secret:
142+
secretName: my-codefresh-tls-certs
143+
- contains:
144+
path: spec.template.spec.containers[0].volumeMounts
145+
content:
146+
name: codefresh-tls-certs
147+
mountPath: /app/config/codefresh-tls-certs
148+
readOnly: true

‎charts/gitops-runtime/tests/argo-projects-templates-integration_test.yaml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -105,18 +105,3 @@ tests:
105105
- equal:
106106
path: data.argoWorkflowsUrl
107107
value: https://argo-test-server:2746
108-
# ------------------------------------------------------------------------------------------
109-
# Argo rollouts
110-
# Affected templates - rollouts reporter clusterrolebinding
111-
# ------------------------------------------------------------------------------------------
112-
- it: test rollout reporter ClusterRoleBinding to argo rollouts role
113-
template: 'event-reporters/rollout-reporter/clusterrolebinding.yaml'
114-
values:
115-
- ./values/mandatory-values.yaml
116-
set:
117-
argo-rollouts.enabled: true
118-
argo-rollouts.fullnameOverride: rollouts-test
119-
asserts:
120-
- equal:
121-
path: roleRef.name
122-
value: rollouts-test

‎charts/gitops-runtime/tests/custom-ca_test.yaml‎

Lines changed: 0 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ templates:
44
- tls-custom-ca/codefresh-tls-certs.yaml
55
- tls-custom-ca/workflow-pipelines-git-webhooks.yaml
66
- app-proxy/deployment.yaml
7-
- event-reporters/workflow-reporter/sensor.yaml
8-
- event-reporters/rollout-reporter/sensor.yaml
97
- hooks/pre-uninstall/delete-runtime-from-platform.yaml
108
- gitops-operator/*
119
- _components/gitops-operator/*
@@ -213,129 +211,6 @@ tests:
213211
name: SSL_CERT_FILE
214212
value: /app/config/codefresh-tls-certs/ca-bundle.crt
215213

216-
- it: rollout reporter sensor - check chart created secret with default key
217-
template: event-reporters/rollout-reporter/sensor.yaml
218-
values:
219-
- ./values/mandatory-values.yaml
220-
set:
221-
global.codefresh.tls.caCerts.secret.annotations.test: 'test'
222-
global.codefresh.tls.caCerts.secret.create: true
223-
global.codefresh.tls.caCerts.secret.content: |
224-
-----BEGIN CERTIFICATE-----
225-
... encoded certificate data here ...
226-
-----END CERTIFICATE-----
227-
asserts:
228-
- equal:
229-
path: spec.triggers[0].template.http.tls
230-
value:
231-
caCertSecret:
232-
name: codefresh-tls-certs
233-
key: ca-bundle.crt
234-
235-
- it: workflow reporter sensor - check chart created secret with default key
236-
template: event-reporters/workflow-reporter/sensor.yaml
237-
values:
238-
- ./values/mandatory-values.yaml
239-
set:
240-
global.codefresh.tls.caCerts.secret.annotations.test: 'test'
241-
global.codefresh.tls.caCerts.secret.create: true
242-
global.codefresh.tls.caCerts.secret.content: |
243-
-----BEGIN CERTIFICATE-----
244-
... encoded certificate data here ...
245-
-----END CERTIFICATE-----
246-
asserts:
247-
- equal:
248-
path: spec.triggers[0].template.http.tls
249-
value:
250-
caCertSecret:
251-
name: codefresh-tls-certs
252-
key: ca-bundle.crt
253-
254-
- it: rollout reporter sensor - secretKeyRef
255-
template: event-reporters/rollout-reporter/sensor.yaml
256-
values:
257-
- ./values/mandatory-values.yaml
258-
set:
259-
global.codefresh.tls.caCerts.secretKeyRef.name: my-secret
260-
global.codefresh.tls.caCerts.secretKeyRef.key: my-key
261-
asserts:
262-
- equal:
263-
path: spec.triggers[0].template.http.tls
264-
value:
265-
caCertSecret:
266-
name: my-secret
267-
key: my-key
268-
269-
- it: workflow reporter sensor - secretKeyRef
270-
template: event-reporters/workflow-reporter/sensor.yaml
271-
values:
272-
- ./values/mandatory-values.yaml
273-
set:
274-
global.codefresh.tls.caCerts.secretKeyRef.name: my-secret
275-
global.codefresh.tls.caCerts.secretKeyRef.key: my-key
276-
asserts:
277-
- equal:
278-
path: spec.triggers[0].template.http.tls
279-
value:
280-
caCertSecret:
281-
name: my-secret
282-
key: my-key
283-
284-
- it: rollout reporter sensor - check chart created secret with custom key
285-
template: event-reporters/rollout-reporter/sensor.yaml
286-
values:
287-
- ./values/mandatory-values.yaml
288-
set:
289-
global.codefresh.tls.caCerts.secret.annotations.test: 'test'
290-
global.codefresh.tls.caCerts.secret.create: true
291-
global.codefresh.tls.caCerts.secret.key: my-key
292-
global.codefresh.tls.caCerts.secret.content: |
293-
-----BEGIN CERTIFICATE-----
294-
... encoded certificate data here ...
295-
-----END CERTIFICATE-----
296-
asserts:
297-
- equal:
298-
path: spec.triggers[0].template.http.tls
299-
value:
300-
caCertSecret:
301-
name: codefresh-tls-certs
302-
key: my-key
303-
304-
- it: workflow reporter sensor - check chart created secret with custom key
305-
template: event-reporters/workflow-reporter/sensor.yaml
306-
values:
307-
- ./values/mandatory-values.yaml
308-
set:
309-
global.codefresh.tls.caCerts.secret.annotations.test: 'test'
310-
global.codefresh.tls.caCerts.secret.create: true
311-
global.codefresh.tls.caCerts.secret.key: my-key
312-
global.codefresh.tls.caCerts.secret.content: |
313-
-----BEGIN CERTIFICATE-----
314-
... encoded certificate data here ...
315-
-----END CERTIFICATE-----
316-
asserts:
317-
- equal:
318-
path: spec.triggers[0].template.http.tls
319-
value:
320-
caCertSecret:
321-
name: codefresh-tls-certs
322-
key: my-key
323-
324-
- it: rollout reporter sensor - no tls
325-
template: event-reporters/rollout-reporter/sensor.yaml
326-
values:
327-
- ./values/mandatory-values.yaml
328-
asserts:
329-
- notExists:
330-
path: spec.triggers[0].template.http.tls
331-
332-
- it: workflow reporter sensor - no tls
333-
template: event-reporters/workflow-reporter/sensor.yaml
334-
values:
335-
- ./values/mandatory-values.yaml
336-
asserts:
337-
- notExists:
338-
path: spec.triggers[0].template.http.tls
339214
# --------------------------------------------------------
340215
# workflowPipelinesGitWebhooks
341216
# --------------------------------------------------------

0 commit comments

Comments
 (0)