Skip to content

Commit ead805e

Browse files
aabouzaiddistro-ci[bot]
aabouzaid
and
distro-ci[bot]
authored
ci: add digest for all c8 apps in 8.8 chart (#4120)
Co-authored-by: distro-ci[bot] <122795778+distro-ci[bot]@users.noreply.github.com>
1 parent a70fcd3 commit ead805e

File tree

7 files changed

+127
-30
lines changed

7 files changed

+127
-30
lines changed

‎.github/actions/test-type-vars/action.yaml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,14 @@ runs:
7878
# Configuring TEST_HELM_EXTRA_ARGS
7979
if [[ "${{ inputs.values-enterprise }}" == "true" ]]; then
8080
helm_extra_args="--values ${TEST_RELATIVE_CHART_PATH}/values-enterprise.yaml"
81+
echo "TEST_HELM_EXTRA_ARGS=${helm_extra_args}" | tee -a $GITHUB_ENV
8182
fi
8283
84+
# The values-digest file is used only in:
85+
# - The install step in the install flow.
86+
# - The upgrade step in the upgrade flow.
87+
# It's not used in the install step in the upgrade flow.
8388
if [[ "${{ inputs.values-digest }}" == "true" ]] && [[ -f "${CHART_PATH}/values-digest.yaml" ]]; then
84-
helm_extra_args="${helm_extra_args} --values ${TEST_RELATIVE_CHART_PATH}/values-digest.yaml"
89+
test_helm_digest_values="${TEST_RELATIVE_CHART_PATH}/values-digest.yaml"
90+
echo "TEST_HELM_DIGEST_VALUES=${test_helm_digest_values}" | tee -a $GITHUB_ENV
8591
fi
86-
87-
echo "TEST_HELM_EXTRA_ARGS=${helm_extra_args}" | tee -a $GITHUB_ENV

‎.github/renovate.json5‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,23 @@
153153
],
154154
pinDigests: false,
155155
},
156+
{
157+
groupName: 'camunda-platform-8.8-digest',
158+
matchManagers: [
159+
'regex',
160+
],
161+
addLabels: [
162+
'version/8.8',
163+
'deps/charts',
164+
],
165+
matchFileNames: [
166+
'charts/camunda-platform-8.8/values-digest.yaml',
167+
],
168+
matchUpdateTypes: [
169+
'digest',
170+
],
171+
pinDigests: true,
172+
},
156173
// End of minor cycle chores.
157174

158175
//
@@ -510,6 +527,26 @@
510527
],
511528
versioningTemplate: '{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}',
512529
},
530+
// This regex manager is used to update the image digests in the values-digest.yaml files.
531+
{
532+
customType: 'regex',
533+
fileMatch: [
534+
'values-digest\\.yaml$'
535+
],
536+
matchStrings: [
537+
/*
538+
# Example.
539+
orchestration:
540+
image:
541+
repository: camunda/camunda
542+
tag: SNAPSHOT
543+
digest: "sha256:abcdef123456789..."
544+
*/
545+
'repository:\\s+(?<depName>\\S+)[\\s\\S]*?tag:\\s+(?<currentValue>[^\\s]+)[\\s\\S]*?digest:\\s+\"?(?<currentDigest>sha256:[a-f0-9]{64})\"?'
546+
],
547+
datasourceTemplate: 'docker',
548+
versioningTemplate: 'docker',
549+
}
513550
],
514551
hostRules: [
515552
{

‎charts/camunda-platform-8.8/values-digest.yaml‎

Lines changed: 58 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,72 @@
1+
#
2+
# Camunda - Digest
3+
#
4+
5+
console:
6+
# https://hub.docker.com/r/camunda/console/tags
7+
image:
8+
repository: camunda/console
9+
tag: latest
10+
digest: "sha256:a6e49d769d540daeaff2ff4972e29c5521a8277108bc2077269f89bf603348b9"
11+
112
connectors:
13+
# https://hub.docker.com/r/camunda/connectors-bundle/tags
214
image:
315
repository: camunda/connectors-bundle
4-
digest: sha256:88f5dab42fefacc830a102bda3e2fbe790809b7a2e7ab49e90baa525e3b9d4e0
16+
tag: SNAPSHOT
17+
digest: "sha256:5239534811f5572c364241527c51e05cb235450584862b508dc63f79edb5fb92"
518

619
optimize:
20+
# https://hub.docker.com/r/camunda/optimize/tags
721
image:
822
repository: camunda/optimize
9-
digest: sha256:38ed7071d6dbb6c5d3d9ec120b98e2c1151136c0093134e31035a72bb6c52da2
23+
tag: 8.8-SNAPSHOT
24+
digest: "sha256:730a72a1f1e6d3064a6a9a6afab4f96bde4673f1e3f5cb3a2e13a70847ebf3d2"
25+
26+
#
27+
# Web Modeler
28+
#
29+
30+
webModeler:
31+
# https://hub.docker.com/r/camunda/web-modeler-restapi/tags
32+
restapi:
33+
image:
34+
repository: camunda/web-modeler-restapi
35+
tag: SNAPSHOT
36+
digest: "sha256:4a1c2aa8a6c2bc7b0b9525b86a67a294be174b2fb6684cf25e701f6b1ab118f7"
37+
38+
# https://hub.docker.com/r/camunda/web-modeler-webapp/tags
39+
webapp:
40+
image:
41+
repository: camunda/web-modeler-webapp
42+
tag: SNAPSHOT
43+
digest: "sha256:a58c849214f3b19c417fee81111ef3ed00c272d253a1f089620a91df1da26557"
44+
45+
# https://hub.docker.com/r/camunda/web-modeler-websockets/tags
46+
websockets:
47+
image:
48+
repository: camunda/web-modeler-websockets
49+
tag: SNAPSHOT
50+
digest: "sha256:1c2764773df6c65b76cbb679647176f6a89fbed4a0dd114221c3205098862604"
51+
52+
#
53+
# Orchestration Cluster
54+
#
1055

1156
orchestration:
57+
# https://hub.docker.com/r/camunda/camunda/tags
1258
image:
1359
repository: camunda/camunda
14-
digest: sha256:19d112a5d8a7916722a13574c54901b8780930d96c5aff5adf99798a9c316149
60+
tag: 8.8-SNAPSHOT
61+
digest: "sha256:29c6ec874b13c70aa83d7d911647daf8e2e45a58d72b5fde963744d931928081"
62+
63+
#
64+
# Identity
65+
#
1566

1667
identity:
68+
# https://hub.docker.com/r/camunda/identity/tags
1769
image:
18-
digest: sha256:3021e0c8d43e0fdfbc2f98184810c1d2dcdabca18080e9c0ca49e981f055ff37
19-
70+
repository: camunda/identity
71+
tag: SNAPSHOT
72+
digest: "sha256:f94b375918862329419563a73ccb9a14c9d2c89d2bc40db1bf77aeb8d0cc3051"

‎charts/camunda-platform-8.8/values-latest.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ global:
99
tag:
1010

1111
console:
12-
# Camunda Enterprise repository.
1312
# https://hub.docker.com/r/camunda/console/tags
1413
image:
1514
repository: camunda/console
@@ -33,13 +32,16 @@ webModeler:
3332
# renovate: datasource=docker depName=camunda/web-modeler-restapi
3433
tag: SNAPSHOT
3534

35+
#
36+
# Orchestration Cluster
37+
#
38+
3639
orchestration:
3740
# https://hub.docker.com/r/camunda/camunda/tags
3841
image:
3942
repository: camunda/camunda
4043
tag: 8.8-SNAPSHOT
4144

42-
4345
#
4446
# Identity
4547
#

‎charts/camunda-platform-8.8/values.schema.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1164,7 +1164,7 @@
11641164
"tag": {
11651165
"type": "string",
11661166
"description": "can be set to overwrite the global tag, which should be used in that chart",
1167-
"default": "8.8.0-alpha7"
1167+
"default": "8.8.0-alpha8"
11681168
},
11691169
"digest": {
11701170
"type": "string",
@@ -2361,7 +2361,7 @@
23612361
"tag": {
23622362
"type": "string",
23632363
"description": "can be used to set the Docker image tag for the Console image (overwrites global.image.tag)",
2364-
"default": "8.8.0-alpha7"
2364+
"default": "8.8.0-alpha8"
23652365
},
23662366
"digest": {
23672367
"type": "string",
@@ -2858,7 +2858,7 @@
28582858
"tag": {
28592859
"type": "string",
28602860
"description": "can be used to set the Docker image tag for the WebModeler images (overwrites global.image.tag)",
2861-
"default": "8.8.0-alpha8-rc1"
2861+
"default": "8.8.0-alpha8"
28622862
},
28632863
"pullSecrets": {
28642864
"type": "array",
@@ -4552,7 +4552,7 @@
45524552
"tag": {
45534553
"type": "string",
45544554
"description": "can be set to overwrite the global tag, which should be used in that chart",
4555-
"default": "8.8.0-alpha7"
4555+
"default": "8.8.0-alpha8"
45564556
},
45574557
"digest": {
45584558
"type": "string",
@@ -5165,7 +5165,7 @@
51655165
"tag": {
51665166
"type": "string",
51675167
"description": "can be set to overwrite the global tag, which should be used in that chart",
5168-
"default": "8.8.0-alpha7"
5168+
"default": "8.8.0-alpha8"
51695169
},
51705170
"digest": {
51715171
"type": "string",
@@ -6213,7 +6213,7 @@
62136213
"tag": {
62146214
"type": "string",
62156215
"description": "can be set to overwrite the global tag, which should be used in that chart",
6216-
"default": "8.8.0-alpha7"
6216+
"default": "8.8.0-alpha8"
62176217
},
62186218
"digest": {
62196219
"type": "string",

‎test/integration/scenarios/chart-full-setup/Taskfile.yaml‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -207,18 +207,19 @@ tasks:
207207
cmds:
208208
- |
209209
helm install integration {{ .TEST_CHART_NAME }} \
210-
--version {{ .TEST_CHART_VERSION }} \
211-
--namespace {{ .TEST_NAMESPACE }} \
212-
{{ (and (eq .TEST_CHART_VERSION "13.0.0-alpha7") (eq .TEST_AUTH_TYPE "keycloak")) | ternary (printf "--values %s/common/values-integration-test-alpha7.yaml" .TEST_VALUES_BASE_DIR) (printf "--values %s/common/values-integration-test.yaml" .TEST_VALUES_BASE_DIR) }} \
213-
--values {{ .TEST_VALUES_BASE_DIR }}/common/values-integration-test-pull-secrets.yaml \
214-
--values {{ .TEST_VALUES_BASE_DIR }}/chart-full-setup/values-integration-test-ingress-{{ .TEST_AUTH_TYPE }}.yaml \
215-
--values {{ .TEST_VALUES_BASE_DIR }}/chart-full-setup/values-integration-test-ingress-{{ .TEST_VALUES_SCENARIO }}.yaml \
216-
{{ eq .PLATFORM "eks" | ternary (printf "--values %s/chart-full-setup/values-integration-test-ingress-infra.yaml" .TEST_VALUES_BASE_DIR) "" }} \
217-
--values {{ .INFRA_TYPE_VALUES }} \
218-
--values /tmp/extra-values-file.yaml \
219-
--timeout 20m0s \
220-
--wait \
221-
{{ .TEST_HELM_EXTRA_ARGS }}
210+
--version {{ .TEST_CHART_VERSION }} \
211+
--namespace {{ .TEST_NAMESPACE }} \
212+
{{ (and (eq .TEST_CHART_VERSION "13.0.0-alpha7") (eq .TEST_AUTH_TYPE "keycloak")) | ternary (printf "--values %s/common/values-integration-test-alpha7.yaml" .TEST_VALUES_BASE_DIR) (printf "--values %s/common/values-integration-test.yaml" .TEST_VALUES_BASE_DIR) }} \
213+
--values {{ .TEST_VALUES_BASE_DIR }}/common/values-integration-test-pull-secrets.yaml \
214+
--values {{ .TEST_VALUES_BASE_DIR }}/chart-full-setup/values-integration-test-ingress-{{ .TEST_AUTH_TYPE }}.yaml \
215+
--values {{ .TEST_VALUES_BASE_DIR }}/chart-full-setup/values-integration-test-ingress-{{ .TEST_VALUES_SCENARIO }}.yaml \
216+
{{ eq .PLATFORM "eks" | ternary (printf "--values %s/chart-full-setup/values-integration-test-ingress-infra.yaml" .TEST_VALUES_BASE_DIR) "" }} \
217+
{{ if eq .TEST_CHART_FLOW "install" }}--values {{ .TEST_HELM_DIGEST_VALUES }}{{ end }} \
218+
--values {{ .INFRA_TYPE_VALUES }} \
219+
--values /tmp/extra-values-file.yaml \
220+
--timeout 20m0s \
221+
--wait \
222+
{{ .TEST_HELM_EXTRA_ARGS }}
222223
223224
setup.post:
224225
cmds:

‎test/integration/scenarios/lib/chart-upgrade-taskfile.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
version: '3'
22

33
vars:
4-
TEST_NAMESPACE: '{{ env "TEST_NAMESPACE" | default "camunda-platform" }}'
4+
TEST_NAMESPACE: '{{ env "TEST_NAMESPACE" }}'
55
TEST_CLUSTER_TYPE: '{{ env "TEST_CLUSTER_TYPE" | default "kubernetes" }}'
66
TEST_HELM_EXTRA_ARGS: '{{ env "TEST_HELM_EXTRA_ARGS" }} {{ .TEST_OPENSHIFT_ARGS }}'
7-
TEST_NAMESPACE: '{{ env "TEST_NAMESPACE" }}'
87

98
tasks:
109
pre:
@@ -26,5 +25,6 @@ tasks:
2625
--values {{ .TEST_VALUES_BASE_DIR }}/common/values-integration-test-pull-secrets.yaml \
2726
{{ eq (env "PLATFORM") "eks" | ternary (printf "--values %s/chart-full-setup/values-integration-test-ingress-infra.yaml" .TEST_VALUES_BASE_DIR) "" }} \
2827
--values {{ env "INFRA_TYPE_VALUES" }} \
28+
--values {{ .TEST_HELM_DIGEST_VALUES }} \
2929
--timeout 20m0s \
3030
--wait {{ .TEST_HELM_EXTRA_ARGS }}

0 commit comments

Comments
 (0)