From 90b14171adbaf567e0adfc0f368b4ec0dbe7863c Mon Sep 17 00:00:00 2001 From: Ahmed AbouZaid <6760103+aabouzaid@users.noreply.github.com> Date: Mon, 10 Jun 2024 23:38:37 +0200 Subject: [PATCH] chore: fix auto-generated golden values --- .../test/unit/operate/deployment_test.go | 2 +- .../test/unit/camunda/goldenfiles_test.go | 5 ++++- .../test/unit/connectors/goldenfiles_test.go | 4 ++++ .../test/unit/identity/golden/deployment.golden.yaml | 1 - .../test/unit/identity/goldenfiles_test.go | 4 ++++ .../test/unit/operate/golden/deployment.golden.yaml | 1 - .../test/unit/operate/goldenfiles_test.go | 4 ++++ .../test/unit/optimize/goldenfiles_test.go | 4 ++++ .../test/unit/tasklist/golden/deployment.golden.yaml | 1 - .../test/unit/tasklist/goldenfiles_test.go | 4 ++++ .../test/unit/web-modeler/goldenfiles_test.go | 7 ++++++- .../test/unit/zeebe-gateway/goldenfiles_test.go | 4 ++++ .../test/unit/zeebe/goldenfiles_test.go | 4 ++++ .../test/unit/camunda/goldenfiles_test.go | 5 ++++- .../test/unit/connectors/goldenfiles_test.go | 4 ++++ .../test/unit/console/golden/configmap.golden.yaml | 9 --------- .../test/unit/console/goldenfiles_test.go | 5 +++++ .../test/unit/identity/golden/deployment.golden.yaml | 1 - .../test/unit/identity/goldenfiles_test.go | 4 ++++ .../test/unit/operate/golden/deployment.golden.yaml | 1 - .../test/unit/operate/goldenfiles_test.go | 4 ++++ .../test/unit/optimize/goldenfiles_test.go | 4 ++++ .../test/unit/tasklist/golden/deployment.golden.yaml | 1 - .../test/unit/tasklist/goldenfiles_test.go | 4 ++++ .../test/unit/web-modeler/goldenfiles_test.go | 7 ++++++- .../test/unit/zeebe-gateway/goldenfiles_test.go | 4 ++++ .../test/unit/zeebe/goldenfiles_test.go | 4 ++++ .../test/unit/camunda/goldenfiles_test.go | 5 ++++- .../test/unit/camunda/keycloak_statefulset_test.go | 5 ++--- .../test/unit/connectors/golden/deployment.golden.yaml | 1 - .../test/unit/connectors/goldenfiles_test.go | 4 ++++ .../test/unit/console/golden/configmap.golden.yaml | 9 --------- .../test/unit/console/golden/deployment.golden.yaml | 1 - .../test/unit/console/goldenfiles_test.go | 5 +++++ .../test/unit/identity/golden/deployment.golden.yaml | 1 - .../test/unit/identity/goldenfiles_test.go | 4 ++++ .../test/unit/operate/golden/deployment.golden.yaml | 1 - .../test/unit/operate/goldenfiles_test.go | 4 ++++ .../test/unit/optimize/golden/deployment.golden.yaml | 1 - .../test/unit/optimize/goldenfiles_test.go | 4 ++++ .../test/unit/tasklist/golden/deployment.golden.yaml | 1 - .../test/unit/tasklist/goldenfiles_test.go | 4 ++++ .../test/unit/web-modeler/goldenfiles_test.go | 7 ++++++- .../unit/zeebe-gateway/golden/deployment.golden.yaml | 1 - .../test/unit/zeebe-gateway/goldenfiles_test.go | 4 ++++ .../test/unit/zeebe/golden/statefulset.golden.yaml | 1 - .../camunda-platform/test/unit/zeebe/goldenfiles_test.go | 4 ++++ 47 files changed, 127 insertions(+), 42 deletions(-) diff --git a/charts/camunda-platform-8.2/test/unit/operate/deployment_test.go b/charts/camunda-platform-8.2/test/unit/operate/deployment_test.go index 9d5953e2fa..d4566091d9 100644 --- a/charts/camunda-platform-8.2/test/unit/operate/deployment_test.go +++ b/charts/camunda-platform-8.2/test/unit/operate/deployment_test.go @@ -192,7 +192,7 @@ func (s *deploymentTemplateTest) TestContainerOverwriteGlobalImageTag() { // given options := &helm.Options{ SetValues: map[string]string{ - "global.image.tag": "a.b.c", + "global.image.tag": "a.b.c", "operate.image.tag": "", }, KubectlOptions: k8s.NewKubectlOptions("", "", s.namespace), diff --git a/charts/camunda-platform-8.3/test/unit/camunda/goldenfiles_test.go b/charts/camunda-platform-8.3/test/unit/camunda/goldenfiles_test.go index 1f132e2533..4f96ed6977 100644 --- a/charts/camunda-platform-8.3/test/unit/camunda/goldenfiles_test.go +++ b/charts/camunda-platform-8.3/test/unit/camunda/goldenfiles_test.go @@ -45,8 +45,11 @@ func TestGoldenDefaultsTemplateSecrets(t *testing.T) { Release: "camunda-platform-test", Namespace: "camunda-platform-" + strings.ToLower(random.UniqueId()), GoldenFileName: name, - IgnoredLines: []string{`\s+.*-secret:\s+.*`}, // secrets are auto-generated and need to be ignored. Templates: []string{"templates/camunda/" + name + ".yaml"}, + IgnoredLines: []string{ + `\s+.*-secret:\s+.*`, // secrets are auto-generated and need to be ignored. + `\s+checksum/.+?:\s+.*`, // ignore configmap checksum. + }, }) } } diff --git a/charts/camunda-platform-8.3/test/unit/connectors/goldenfiles_test.go b/charts/camunda-platform-8.3/test/unit/connectors/goldenfiles_test.go index 07a4243bd1..8945ef37b4 100644 --- a/charts/camunda-platform-8.3/test/unit/connectors/goldenfiles_test.go +++ b/charts/camunda-platform-8.3/test/unit/connectors/goldenfiles_test.go @@ -45,6 +45,10 @@ func TestGoldenDefaultsTemplate(t *testing.T) { "connectors.ingress.enabled": "true", "connectors.serviceAccount.enabled": "true", }, + IgnoredLines: []string{ + `\s+.*-secret:\s+.*`, // secrets are auto-generated and need to be ignored. + `\s+checksum/.+?:\s+.*`, // ignore configmap checksum. + }, }) } } diff --git a/charts/camunda-platform-8.3/test/unit/identity/golden/deployment.golden.yaml b/charts/camunda-platform-8.3/test/unit/identity/golden/deployment.golden.yaml index 54fe57528b..50f2576c01 100644 --- a/charts/camunda-platform-8.3/test/unit/identity/golden/deployment.golden.yaml +++ b/charts/camunda-platform-8.3/test/unit/identity/golden/deployment.golden.yaml @@ -35,7 +35,6 @@ spec: app.kubernetes.io/version: "8.3.12" app.kubernetes.io/component: identity annotations: - checksum/configmap-env-vars: 6c7ef0fa2711107bd9ddbc1bf38a6a288d33a245938705b6bc491d259e25dda1 spec: imagePullSecrets: [] diff --git a/charts/camunda-platform-8.3/test/unit/identity/goldenfiles_test.go b/charts/camunda-platform-8.3/test/unit/identity/goldenfiles_test.go index 3e294f2bd1..f8511f341f 100644 --- a/charts/camunda-platform-8.3/test/unit/identity/goldenfiles_test.go +++ b/charts/camunda-platform-8.3/test/unit/identity/goldenfiles_test.go @@ -39,6 +39,10 @@ func TestGoldenDefaultsTemplate(t *testing.T) { Namespace: "camunda-platform-" + strings.ToLower(random.UniqueId()), GoldenFileName: name, Templates: []string{"charts/identity/templates/" + name + ".yaml"}, + IgnoredLines: []string{ + `\s+.*-secret:\s+.*`, // secrets are auto-generated and need to be ignored. + `\s+checksum/.+?:\s+.*`, // ignore configmap checksum. + }, }) } } diff --git a/charts/camunda-platform-8.3/test/unit/operate/golden/deployment.golden.yaml b/charts/camunda-platform-8.3/test/unit/operate/golden/deployment.golden.yaml index b4af2a39dc..536da5e9bd 100644 --- a/charts/camunda-platform-8.3/test/unit/operate/golden/deployment.golden.yaml +++ b/charts/camunda-platform-8.3/test/unit/operate/golden/deployment.golden.yaml @@ -35,7 +35,6 @@ spec: app.kubernetes.io/version: "8.3.12" app.kubernetes.io/component: operate annotations: - checksum/config: bde67447bdbca7a7a4150d94d3bbc25e7d0d895acf449212e396d359748fdcbe spec: imagePullSecrets: [] diff --git a/charts/camunda-platform-8.3/test/unit/operate/goldenfiles_test.go b/charts/camunda-platform-8.3/test/unit/operate/goldenfiles_test.go index ad1537615e..23e173d171 100644 --- a/charts/camunda-platform-8.3/test/unit/operate/goldenfiles_test.go +++ b/charts/camunda-platform-8.3/test/unit/operate/goldenfiles_test.go @@ -39,6 +39,10 @@ func TestGoldenDefaultsTemplate(t *testing.T) { Namespace: "camunda-platform-" + strings.ToLower(random.UniqueId()), GoldenFileName: name, Templates: []string{"templates/operate/" + name + ".yaml"}, + IgnoredLines: []string{ + `\s+.*-secret:\s+.*`, // secrets are auto-generated and need to be ignored. + `\s+checksum/.+?:\s+.*`, // ignore configmap checksum. + }, }) } } diff --git a/charts/camunda-platform-8.3/test/unit/optimize/goldenfiles_test.go b/charts/camunda-platform-8.3/test/unit/optimize/goldenfiles_test.go index 9b3cc34d00..f709bde426 100644 --- a/charts/camunda-platform-8.3/test/unit/optimize/goldenfiles_test.go +++ b/charts/camunda-platform-8.3/test/unit/optimize/goldenfiles_test.go @@ -39,6 +39,10 @@ func TestGoldenDefaultsTemplate(t *testing.T) { Namespace: "camunda-platform-" + strings.ToLower(random.UniqueId()), GoldenFileName: name, Templates: []string{"templates/optimize/" + name + ".yaml"}, + IgnoredLines: []string{ + `\s+.*-secret:\s+.*`, // secrets are auto-generated and need to be ignored. + `\s+checksum/.+?:\s+.*`, // ignore configmap checksum. + }, }) } } diff --git a/charts/camunda-platform-8.3/test/unit/tasklist/golden/deployment.golden.yaml b/charts/camunda-platform-8.3/test/unit/tasklist/golden/deployment.golden.yaml index 40a375e819..362d43385a 100644 --- a/charts/camunda-platform-8.3/test/unit/tasklist/golden/deployment.golden.yaml +++ b/charts/camunda-platform-8.3/test/unit/tasklist/golden/deployment.golden.yaml @@ -35,7 +35,6 @@ spec: app.kubernetes.io/version: "8.3.12" app.kubernetes.io/component: tasklist annotations: - checksum/config: 03c5340155f4923f819495fa345f4ca73b6b85caeb40444e4c9df530c1006703 spec: imagePullSecrets: [] diff --git a/charts/camunda-platform-8.3/test/unit/tasklist/goldenfiles_test.go b/charts/camunda-platform-8.3/test/unit/tasklist/goldenfiles_test.go index 95da7dadae..b289d81fd8 100644 --- a/charts/camunda-platform-8.3/test/unit/tasklist/goldenfiles_test.go +++ b/charts/camunda-platform-8.3/test/unit/tasklist/goldenfiles_test.go @@ -40,6 +40,10 @@ func TestGoldenDefaultsTemplate(t *testing.T) { Namespace: "camunda-platform-" + strings.ToLower(random.UniqueId()), GoldenFileName: name, Templates: []string{"templates/tasklist/" + name + ".yaml"}, + IgnoredLines: []string{ + `\s+.*-secret:\s+.*`, // secrets are auto-generated and need to be ignored. + `\s+checksum/.+?:\s+.*`, // ignore configmap checksum. + }, }) } } diff --git a/charts/camunda-platform-8.3/test/unit/web-modeler/goldenfiles_test.go b/charts/camunda-platform-8.3/test/unit/web-modeler/goldenfiles_test.go index b4e61428cc..c62892d10d 100644 --- a/charts/camunda-platform-8.3/test/unit/web-modeler/goldenfiles_test.go +++ b/charts/camunda-platform-8.3/test/unit/web-modeler/goldenfiles_test.go @@ -48,13 +48,18 @@ func TestGoldenDefaultsTemplate(t *testing.T) { Release: "camunda-platform-test", Namespace: "camunda-platform-" + strings.ToLower(random.UniqueId()), GoldenFileName: name, - IgnoredLines: []string{`\s+pusher-app-key:\s+.*`, `\s+pusher-app-secret:\s+.*`}, // secrets are auto-generated and need to be ignored Templates: []string{"templates/web-modeler/" + name + ".yaml"}, SetValues: map[string]string{ "webModeler.enabled": "true", "webModeler.restapi.mail.fromAddress": "example@example.com", "postgresql.enabled": "true", }, + IgnoredLines: []string{ + `\s+pusher-app-key:\s+.*`, // auto-generated and need to be ignored. + `\s+pusher-app-secret:\s+.*`, // auto-generated and need to be ignored. + `\s+.*-secret:\s+.*`, // secrets are auto-generated and need to be ignored. + `\s+checksum/.+?:\s+.*`, // ignore configmap checksum. + }, }) } } diff --git a/charts/camunda-platform-8.3/test/unit/zeebe-gateway/goldenfiles_test.go b/charts/camunda-platform-8.3/test/unit/zeebe-gateway/goldenfiles_test.go index 129f58df56..ab82cbd3ae 100644 --- a/charts/camunda-platform-8.3/test/unit/zeebe-gateway/goldenfiles_test.go +++ b/charts/camunda-platform-8.3/test/unit/zeebe-gateway/goldenfiles_test.go @@ -39,6 +39,10 @@ func TestGoldenDefaultsTemplate(t *testing.T) { Namespace: "camunda-platform-" + strings.ToLower(random.UniqueId()), GoldenFileName: name, Templates: []string{"templates/zeebe-gateway/" + name + ".yaml"}, + IgnoredLines: []string{ + `\s+.*-secret:\s+.*`, // secrets are auto-generated and need to be ignored. + `\s+checksum/.+?:\s+.*`, // ignore configmap checksum. + }, }) } } diff --git a/charts/camunda-platform-8.3/test/unit/zeebe/goldenfiles_test.go b/charts/camunda-platform-8.3/test/unit/zeebe/goldenfiles_test.go index 6706328d91..281f15dbb1 100644 --- a/charts/camunda-platform-8.3/test/unit/zeebe/goldenfiles_test.go +++ b/charts/camunda-platform-8.3/test/unit/zeebe/goldenfiles_test.go @@ -39,6 +39,10 @@ func TestGoldenDefaultsTemplate(t *testing.T) { Namespace: "camunda-platform-" + strings.ToLower(random.UniqueId()), GoldenFileName: name, Templates: []string{"templates/zeebe/" + name + ".yaml"}, + IgnoredLines: []string{ + `\s+.*-secret:\s+.*`, // secrets are auto-generated and need to be ignored. + `\s+checksum/.+?:\s+.*`, // ignore configmap checksum. + }, }) } } diff --git a/charts/camunda-platform-8.4/test/unit/camunda/goldenfiles_test.go b/charts/camunda-platform-8.4/test/unit/camunda/goldenfiles_test.go index 1f132e2533..4f96ed6977 100644 --- a/charts/camunda-platform-8.4/test/unit/camunda/goldenfiles_test.go +++ b/charts/camunda-platform-8.4/test/unit/camunda/goldenfiles_test.go @@ -45,8 +45,11 @@ func TestGoldenDefaultsTemplateSecrets(t *testing.T) { Release: "camunda-platform-test", Namespace: "camunda-platform-" + strings.ToLower(random.UniqueId()), GoldenFileName: name, - IgnoredLines: []string{`\s+.*-secret:\s+.*`}, // secrets are auto-generated and need to be ignored. Templates: []string{"templates/camunda/" + name + ".yaml"}, + IgnoredLines: []string{ + `\s+.*-secret:\s+.*`, // secrets are auto-generated and need to be ignored. + `\s+checksum/.+?:\s+.*`, // ignore configmap checksum. + }, }) } } diff --git a/charts/camunda-platform-8.4/test/unit/connectors/goldenfiles_test.go b/charts/camunda-platform-8.4/test/unit/connectors/goldenfiles_test.go index 07a4243bd1..8945ef37b4 100644 --- a/charts/camunda-platform-8.4/test/unit/connectors/goldenfiles_test.go +++ b/charts/camunda-platform-8.4/test/unit/connectors/goldenfiles_test.go @@ -45,6 +45,10 @@ func TestGoldenDefaultsTemplate(t *testing.T) { "connectors.ingress.enabled": "true", "connectors.serviceAccount.enabled": "true", }, + IgnoredLines: []string{ + `\s+.*-secret:\s+.*`, // secrets are auto-generated and need to be ignored. + `\s+checksum/.+?:\s+.*`, // ignore configmap checksum. + }, }) } } diff --git a/charts/camunda-platform-8.4/test/unit/console/golden/configmap.golden.yaml b/charts/camunda-platform-8.4/test/unit/console/golden/configmap.golden.yaml index dadb666b8f..35be8d0b69 100644 --- a/charts/camunda-platform-8.4/test/unit/console/golden/configmap.golden.yaml +++ b/charts/camunda-platform-8.4/test/unit/console/golden/configmap.golden.yaml @@ -22,50 +22,41 @@ data: releases: - name: camunda-platform-test namespace: camunda-platform - version: 9.3.5 components: - name: Console id: console - version: 8.4.60 url: readiness: http://camunda-platform-test-console.camunda-platform:9100/health/readiness metrics: http://camunda-platform-test-console.camunda-platform:9100/prometheus - name: Keycloak id: keycloak - version: 22.0.5 url: http:///auth - name: Identity id: identity - version: 8.4.8 url: readiness: http://camunda-platform-test.camunda-platform:82/actuator/health metrics: http://camunda-platform-test.camunda-platform:82/actuator/prometheus - name: Operate id: operate - version: 8.4.9 url: readiness: http://camunda-platform-test-operate.camunda-platform:80/actuator/health/readiness metrics: http://camunda-platform-test-operate.camunda-platform:80/actuator/prometheus - name: Optimize id: optimize - version: 8.4.5 url: readiness: http://camunda-platform-test-optimize.camunda-platform:80/api/readyz metrics: http://camunda-platform-test-optimize.camunda-platform:8092/actuator/prometheus - name: Tasklist id: tasklist - version: 8.4.8 url: readiness: http://camunda-platform-test-tasklist.camunda-platform:80/actuator/health/readiness metrics: http://camunda-platform-test-tasklist.camunda-platform:80/actuator/prometheus - name: Zeebe Gateway id: zeebeGateway - version: 8.4.8 url: grpc:// readiness: http://camunda-platform-test-zeebe-gateway.camunda-platform:9600/actuator/health/readiness metrics: http://camunda-platform-test-zeebe-gateway.camunda-platform:9600/actuator/prometheus - name: Zeebe id: zeebe - version: 8.4.8 readiness: http://camunda-platform-test-zeebe.camunda-platform:9600/actuator/health/readiness metrics: http://camunda-platform-test-zeebe.camunda-platform:9600/actuator/prometheus \ No newline at end of file diff --git a/charts/camunda-platform-8.4/test/unit/console/goldenfiles_test.go b/charts/camunda-platform-8.4/test/unit/console/goldenfiles_test.go index b848a76056..62bd36ee11 100644 --- a/charts/camunda-platform-8.4/test/unit/console/goldenfiles_test.go +++ b/charts/camunda-platform-8.4/test/unit/console/goldenfiles_test.go @@ -45,6 +45,11 @@ func TestGoldenDefaultsTemplate(t *testing.T) { SetValues: map[string]string{ "console.enabled": "true", }, + IgnoredLines: []string{ + `\s+.*-secret:\s+.*`, // secrets are auto-generated and need to be ignored. + `\s+checksum/.+?:\s+.*`, // ignore configmap checksum. + `\s+version:\s+.*`, // ignore release version in console config. + }, }) } } diff --git a/charts/camunda-platform-8.4/test/unit/identity/golden/deployment.golden.yaml b/charts/camunda-platform-8.4/test/unit/identity/golden/deployment.golden.yaml index 3466efbcf3..860fb48567 100644 --- a/charts/camunda-platform-8.4/test/unit/identity/golden/deployment.golden.yaml +++ b/charts/camunda-platform-8.4/test/unit/identity/golden/deployment.golden.yaml @@ -35,7 +35,6 @@ spec: app.kubernetes.io/version: "8.4.8" app.kubernetes.io/component: identity annotations: - checksum/configmap-env-vars: 702d88fa1b3ad2380ef0ac28cbd05ea166d457ece20fb94ff0f97c5438cdfb28 spec: imagePullSecrets: [] diff --git a/charts/camunda-platform-8.4/test/unit/identity/goldenfiles_test.go b/charts/camunda-platform-8.4/test/unit/identity/goldenfiles_test.go index 3e294f2bd1..f8511f341f 100644 --- a/charts/camunda-platform-8.4/test/unit/identity/goldenfiles_test.go +++ b/charts/camunda-platform-8.4/test/unit/identity/goldenfiles_test.go @@ -39,6 +39,10 @@ func TestGoldenDefaultsTemplate(t *testing.T) { Namespace: "camunda-platform-" + strings.ToLower(random.UniqueId()), GoldenFileName: name, Templates: []string{"charts/identity/templates/" + name + ".yaml"}, + IgnoredLines: []string{ + `\s+.*-secret:\s+.*`, // secrets are auto-generated and need to be ignored. + `\s+checksum/.+?:\s+.*`, // ignore configmap checksum. + }, }) } } diff --git a/charts/camunda-platform-8.4/test/unit/operate/golden/deployment.golden.yaml b/charts/camunda-platform-8.4/test/unit/operate/golden/deployment.golden.yaml index 954935f0bb..0d674a7c91 100644 --- a/charts/camunda-platform-8.4/test/unit/operate/golden/deployment.golden.yaml +++ b/charts/camunda-platform-8.4/test/unit/operate/golden/deployment.golden.yaml @@ -35,7 +35,6 @@ spec: app.kubernetes.io/version: "8.4.8" app.kubernetes.io/component: operate annotations: - checksum/config: c677453ef2facee65e51e8d7202133f3117fcc609bbc7d85acb8d8aac035a119 spec: imagePullSecrets: [] diff --git a/charts/camunda-platform-8.4/test/unit/operate/goldenfiles_test.go b/charts/camunda-platform-8.4/test/unit/operate/goldenfiles_test.go index ad1537615e..23e173d171 100644 --- a/charts/camunda-platform-8.4/test/unit/operate/goldenfiles_test.go +++ b/charts/camunda-platform-8.4/test/unit/operate/goldenfiles_test.go @@ -39,6 +39,10 @@ func TestGoldenDefaultsTemplate(t *testing.T) { Namespace: "camunda-platform-" + strings.ToLower(random.UniqueId()), GoldenFileName: name, Templates: []string{"templates/operate/" + name + ".yaml"}, + IgnoredLines: []string{ + `\s+.*-secret:\s+.*`, // secrets are auto-generated and need to be ignored. + `\s+checksum/.+?:\s+.*`, // ignore configmap checksum. + }, }) } } diff --git a/charts/camunda-platform-8.4/test/unit/optimize/goldenfiles_test.go b/charts/camunda-platform-8.4/test/unit/optimize/goldenfiles_test.go index 9b3cc34d00..f709bde426 100644 --- a/charts/camunda-platform-8.4/test/unit/optimize/goldenfiles_test.go +++ b/charts/camunda-platform-8.4/test/unit/optimize/goldenfiles_test.go @@ -39,6 +39,10 @@ func TestGoldenDefaultsTemplate(t *testing.T) { Namespace: "camunda-platform-" + strings.ToLower(random.UniqueId()), GoldenFileName: name, Templates: []string{"templates/optimize/" + name + ".yaml"}, + IgnoredLines: []string{ + `\s+.*-secret:\s+.*`, // secrets are auto-generated and need to be ignored. + `\s+checksum/.+?:\s+.*`, // ignore configmap checksum. + }, }) } } diff --git a/charts/camunda-platform-8.4/test/unit/tasklist/golden/deployment.golden.yaml b/charts/camunda-platform-8.4/test/unit/tasklist/golden/deployment.golden.yaml index f8ad005344..f576ef16e5 100644 --- a/charts/camunda-platform-8.4/test/unit/tasklist/golden/deployment.golden.yaml +++ b/charts/camunda-platform-8.4/test/unit/tasklist/golden/deployment.golden.yaml @@ -35,7 +35,6 @@ spec: app.kubernetes.io/version: "8.4.8" app.kubernetes.io/component: tasklist annotations: - checksum/config: 330b5f9fd849adec522bfb1ab4eeac8ee63270cb767cf88a799756ecc3d5e3b0 spec: imagePullSecrets: [] diff --git a/charts/camunda-platform-8.4/test/unit/tasklist/goldenfiles_test.go b/charts/camunda-platform-8.4/test/unit/tasklist/goldenfiles_test.go index 95da7dadae..b289d81fd8 100644 --- a/charts/camunda-platform-8.4/test/unit/tasklist/goldenfiles_test.go +++ b/charts/camunda-platform-8.4/test/unit/tasklist/goldenfiles_test.go @@ -40,6 +40,10 @@ func TestGoldenDefaultsTemplate(t *testing.T) { Namespace: "camunda-platform-" + strings.ToLower(random.UniqueId()), GoldenFileName: name, Templates: []string{"templates/tasklist/" + name + ".yaml"}, + IgnoredLines: []string{ + `\s+.*-secret:\s+.*`, // secrets are auto-generated and need to be ignored. + `\s+checksum/.+?:\s+.*`, // ignore configmap checksum. + }, }) } } diff --git a/charts/camunda-platform-8.4/test/unit/web-modeler/goldenfiles_test.go b/charts/camunda-platform-8.4/test/unit/web-modeler/goldenfiles_test.go index b4e61428cc..c62892d10d 100644 --- a/charts/camunda-platform-8.4/test/unit/web-modeler/goldenfiles_test.go +++ b/charts/camunda-platform-8.4/test/unit/web-modeler/goldenfiles_test.go @@ -48,13 +48,18 @@ func TestGoldenDefaultsTemplate(t *testing.T) { Release: "camunda-platform-test", Namespace: "camunda-platform-" + strings.ToLower(random.UniqueId()), GoldenFileName: name, - IgnoredLines: []string{`\s+pusher-app-key:\s+.*`, `\s+pusher-app-secret:\s+.*`}, // secrets are auto-generated and need to be ignored Templates: []string{"templates/web-modeler/" + name + ".yaml"}, SetValues: map[string]string{ "webModeler.enabled": "true", "webModeler.restapi.mail.fromAddress": "example@example.com", "postgresql.enabled": "true", }, + IgnoredLines: []string{ + `\s+pusher-app-key:\s+.*`, // auto-generated and need to be ignored. + `\s+pusher-app-secret:\s+.*`, // auto-generated and need to be ignored. + `\s+.*-secret:\s+.*`, // secrets are auto-generated and need to be ignored. + `\s+checksum/.+?:\s+.*`, // ignore configmap checksum. + }, }) } } diff --git a/charts/camunda-platform-8.4/test/unit/zeebe-gateway/goldenfiles_test.go b/charts/camunda-platform-8.4/test/unit/zeebe-gateway/goldenfiles_test.go index 129f58df56..ab82cbd3ae 100644 --- a/charts/camunda-platform-8.4/test/unit/zeebe-gateway/goldenfiles_test.go +++ b/charts/camunda-platform-8.4/test/unit/zeebe-gateway/goldenfiles_test.go @@ -39,6 +39,10 @@ func TestGoldenDefaultsTemplate(t *testing.T) { Namespace: "camunda-platform-" + strings.ToLower(random.UniqueId()), GoldenFileName: name, Templates: []string{"templates/zeebe-gateway/" + name + ".yaml"}, + IgnoredLines: []string{ + `\s+.*-secret:\s+.*`, // secrets are auto-generated and need to be ignored. + `\s+checksum/.+?:\s+.*`, // ignore configmap checksum. + }, }) } } diff --git a/charts/camunda-platform-8.4/test/unit/zeebe/goldenfiles_test.go b/charts/camunda-platform-8.4/test/unit/zeebe/goldenfiles_test.go index 6706328d91..281f15dbb1 100644 --- a/charts/camunda-platform-8.4/test/unit/zeebe/goldenfiles_test.go +++ b/charts/camunda-platform-8.4/test/unit/zeebe/goldenfiles_test.go @@ -39,6 +39,10 @@ func TestGoldenDefaultsTemplate(t *testing.T) { Namespace: "camunda-platform-" + strings.ToLower(random.UniqueId()), GoldenFileName: name, Templates: []string{"templates/zeebe/" + name + ".yaml"}, + IgnoredLines: []string{ + `\s+.*-secret:\s+.*`, // secrets are auto-generated and need to be ignored. + `\s+checksum/.+?:\s+.*`, // ignore configmap checksum. + }, }) } } diff --git a/charts/camunda-platform/test/unit/camunda/goldenfiles_test.go b/charts/camunda-platform/test/unit/camunda/goldenfiles_test.go index 1f132e2533..4f96ed6977 100644 --- a/charts/camunda-platform/test/unit/camunda/goldenfiles_test.go +++ b/charts/camunda-platform/test/unit/camunda/goldenfiles_test.go @@ -45,8 +45,11 @@ func TestGoldenDefaultsTemplateSecrets(t *testing.T) { Release: "camunda-platform-test", Namespace: "camunda-platform-" + strings.ToLower(random.UniqueId()), GoldenFileName: name, - IgnoredLines: []string{`\s+.*-secret:\s+.*`}, // secrets are auto-generated and need to be ignored. Templates: []string{"templates/camunda/" + name + ".yaml"}, + IgnoredLines: []string{ + `\s+.*-secret:\s+.*`, // secrets are auto-generated and need to be ignored. + `\s+checksum/.+?:\s+.*`, // ignore configmap checksum. + }, }) } } diff --git a/charts/camunda-platform/test/unit/camunda/keycloak_statefulset_test.go b/charts/camunda-platform/test/unit/camunda/keycloak_statefulset_test.go index 5f729c70af..d60dadcd74 100644 --- a/charts/camunda-platform/test/unit/camunda/keycloak_statefulset_test.go +++ b/charts/camunda-platform/test/unit/camunda/keycloak_statefulset_test.go @@ -40,10 +40,9 @@ func TestGoldenKeycloakDefaults(t *testing.T) { Release: "camunda-platform-test", Namespace: "camunda", GoldenFileName: "keycloak-statefulset", - // secrets are auto-generated and need to be ignored. IgnoredLines: []string{ - `\s+checksum/configmap-env-vars:\s+.*`, - `\s+checksum/secrets:\s+.*`, + `\s+.*-secret:\s+.*`, // secrets are auto-generated and need to be ignored. + `\s+checksum/.+?:\s+.*`, // ignore configmap checksum. }, // ExtraHelmArgs is used instead of Templates here because Keycloak is a dependency chart. ExtraHelmArgs: []string{"--show-only", "charts/identityKeycloak/templates/statefulset.yaml"}, diff --git a/charts/camunda-platform/test/unit/connectors/golden/deployment.golden.yaml b/charts/camunda-platform/test/unit/connectors/golden/deployment.golden.yaml index 364bfd89e8..d994899624 100644 --- a/charts/camunda-platform/test/unit/connectors/golden/deployment.golden.yaml +++ b/charts/camunda-platform/test/unit/connectors/golden/deployment.golden.yaml @@ -35,7 +35,6 @@ spec: app.kubernetes.io/component: connectors app.kubernetes.io/version: "8.5.3" annotations: - checksum/config: 7b71d45df3fbf369b3ee7daf19401d44957b31fd1167aaf20ee383733395d7c6 spec: imagePullSecrets: [] diff --git a/charts/camunda-platform/test/unit/connectors/goldenfiles_test.go b/charts/camunda-platform/test/unit/connectors/goldenfiles_test.go index 07a4243bd1..8945ef37b4 100644 --- a/charts/camunda-platform/test/unit/connectors/goldenfiles_test.go +++ b/charts/camunda-platform/test/unit/connectors/goldenfiles_test.go @@ -45,6 +45,10 @@ func TestGoldenDefaultsTemplate(t *testing.T) { "connectors.ingress.enabled": "true", "connectors.serviceAccount.enabled": "true", }, + IgnoredLines: []string{ + `\s+.*-secret:\s+.*`, // secrets are auto-generated and need to be ignored. + `\s+checksum/.+?:\s+.*`, // ignore configmap checksum. + }, }) } } diff --git a/charts/camunda-platform/test/unit/console/golden/configmap.golden.yaml b/charts/camunda-platform/test/unit/console/golden/configmap.golden.yaml index 5ce820f138..a67efe6cf3 100644 --- a/charts/camunda-platform/test/unit/console/golden/configmap.golden.yaml +++ b/charts/camunda-platform/test/unit/console/golden/configmap.golden.yaml @@ -22,45 +22,37 @@ data: releases: - name: camunda-platform-test namespace: camunda-platform - version: 10.0.5 components: - name: Console id: console - version: 8.5.50 url: readiness: http://camunda-platform-test-console.camunda-platform:9100/health/readiness metrics: http://camunda-platform-test-console.camunda-platform:9100/prometheus - name: Keycloak id: keycloak - version: 23.0.7 url: http:///auth - name: Identity id: identity - version: 8.5.2 url: readiness: http://camunda-platform-test-identity.camunda-platform:82/actuator/health metrics: http://camunda-platform-test-identity.camunda-platform:82/actuator/prometheus - name: Operate id: operate - version: 8.5.2 url: readiness: http://camunda-platform-test-operate.camunda-platform:80/actuator/health/readiness metrics: http://camunda-platform-test-operate.camunda-platform:80/actuator/prometheus - name: Optimize id: optimize - version: 8.5.2 url: readiness: http://camunda-platform-test-optimize.camunda-platform:80/api/readyz metrics: http://camunda-platform-test-optimize.camunda-platform:8092/actuator/prometheus - name: Tasklist id: tasklist - version: 8.5.2 url: readiness: http://camunda-platform-test-tasklist.camunda-platform:80/actuator/health/readiness metrics: http://camunda-platform-test-tasklist.camunda-platform:80/actuator/prometheus - name: Zeebe Gateway id: zeebeGateway - version: 8.5.2 urls: grpc: http:// http: http:// @@ -68,6 +60,5 @@ data: metrics: http://camunda-platform-test-zeebe-gateway.camunda-platform:9600/actuator/prometheus - name: Zeebe id: zeebe - version: 8.5.2 readiness: http://camunda-platform-test-zeebe.camunda-platform:9600/actuator/health/readiness metrics: http://camunda-platform-test-zeebe.camunda-platform:9600/actuator/prometheus \ No newline at end of file diff --git a/charts/camunda-platform/test/unit/console/golden/deployment.golden.yaml b/charts/camunda-platform/test/unit/console/golden/deployment.golden.yaml index 7feb5002e7..4358913dcf 100644 --- a/charts/camunda-platform/test/unit/console/golden/deployment.golden.yaml +++ b/charts/camunda-platform/test/unit/console/golden/deployment.golden.yaml @@ -27,7 +27,6 @@ spec: template: metadata: annotations: - checksum/config: 8065ecd23d0dd8bae403feb8a5144a6a36a2fa979e47f817b398d2381ab7c3b5 labels: app: camunda-platform app.kubernetes.io/name: camunda-platform diff --git a/charts/camunda-platform/test/unit/console/goldenfiles_test.go b/charts/camunda-platform/test/unit/console/goldenfiles_test.go index b848a76056..62bd36ee11 100644 --- a/charts/camunda-platform/test/unit/console/goldenfiles_test.go +++ b/charts/camunda-platform/test/unit/console/goldenfiles_test.go @@ -45,6 +45,11 @@ func TestGoldenDefaultsTemplate(t *testing.T) { SetValues: map[string]string{ "console.enabled": "true", }, + IgnoredLines: []string{ + `\s+.*-secret:\s+.*`, // secrets are auto-generated and need to be ignored. + `\s+checksum/.+?:\s+.*`, // ignore configmap checksum. + `\s+version:\s+.*`, // ignore release version in console config. + }, }) } } diff --git a/charts/camunda-platform/test/unit/identity/golden/deployment.golden.yaml b/charts/camunda-platform/test/unit/identity/golden/deployment.golden.yaml index 3e6e8fcaba..1e3f806a45 100644 --- a/charts/camunda-platform/test/unit/identity/golden/deployment.golden.yaml +++ b/charts/camunda-platform/test/unit/identity/golden/deployment.golden.yaml @@ -35,7 +35,6 @@ spec: app.kubernetes.io/component: identity app.kubernetes.io/version: "8.5.2" annotations: - checksum/config: 8b7886297808443e2b08a49799fb0cc6d0f250b8f23589e7cfaf8949f05ac45f spec: imagePullSecrets: [] diff --git a/charts/camunda-platform/test/unit/identity/goldenfiles_test.go b/charts/camunda-platform/test/unit/identity/goldenfiles_test.go index 964f8f9ea8..69fa487c0b 100644 --- a/charts/camunda-platform/test/unit/identity/goldenfiles_test.go +++ b/charts/camunda-platform/test/unit/identity/goldenfiles_test.go @@ -44,6 +44,10 @@ func TestGoldenDefaultsTemplate(t *testing.T) { Namespace: "camunda-platform-" + strings.ToLower(random.UniqueId()), GoldenFileName: name, Templates: []string{"templates/identity/" + name + ".yaml"}, + IgnoredLines: []string{ + `\s+.*-secret:\s+.*`, // secrets are auto-generated and need to be ignored. + `\s+checksum/.+?:\s+.*`, // ignore configmap checksum. + }, }) } } diff --git a/charts/camunda-platform/test/unit/operate/golden/deployment.golden.yaml b/charts/camunda-platform/test/unit/operate/golden/deployment.golden.yaml index 78bc95cb63..c57fe38a43 100644 --- a/charts/camunda-platform/test/unit/operate/golden/deployment.golden.yaml +++ b/charts/camunda-platform/test/unit/operate/golden/deployment.golden.yaml @@ -35,7 +35,6 @@ spec: app.kubernetes.io/component: operate app.kubernetes.io/version: "8.5.2" annotations: - checksum/config: 2ee798717ba328f6f59be7dc49a7b2666556967e4ad9bff808cf628ad8a42c1b spec: imagePullSecrets: [] diff --git a/charts/camunda-platform/test/unit/operate/goldenfiles_test.go b/charts/camunda-platform/test/unit/operate/goldenfiles_test.go index ad1537615e..23e173d171 100644 --- a/charts/camunda-platform/test/unit/operate/goldenfiles_test.go +++ b/charts/camunda-platform/test/unit/operate/goldenfiles_test.go @@ -39,6 +39,10 @@ func TestGoldenDefaultsTemplate(t *testing.T) { Namespace: "camunda-platform-" + strings.ToLower(random.UniqueId()), GoldenFileName: name, Templates: []string{"templates/operate/" + name + ".yaml"}, + IgnoredLines: []string{ + `\s+.*-secret:\s+.*`, // secrets are auto-generated and need to be ignored. + `\s+checksum/.+?:\s+.*`, // ignore configmap checksum. + }, }) } } diff --git a/charts/camunda-platform/test/unit/optimize/golden/deployment.golden.yaml b/charts/camunda-platform/test/unit/optimize/golden/deployment.golden.yaml index 75ab9285fd..1e8fed1ba7 100644 --- a/charts/camunda-platform/test/unit/optimize/golden/deployment.golden.yaml +++ b/charts/camunda-platform/test/unit/optimize/golden/deployment.golden.yaml @@ -35,7 +35,6 @@ spec: app.kubernetes.io/component: optimize app.kubernetes.io/version: "8.5.2" annotations: - checksum/config: f13ded7d136b662a03f5b6efb7417085b8d22df1e319e0b754e9711eeb5d081e spec: imagePullSecrets: [] diff --git a/charts/camunda-platform/test/unit/optimize/goldenfiles_test.go b/charts/camunda-platform/test/unit/optimize/goldenfiles_test.go index 9b3cc34d00..f709bde426 100644 --- a/charts/camunda-platform/test/unit/optimize/goldenfiles_test.go +++ b/charts/camunda-platform/test/unit/optimize/goldenfiles_test.go @@ -39,6 +39,10 @@ func TestGoldenDefaultsTemplate(t *testing.T) { Namespace: "camunda-platform-" + strings.ToLower(random.UniqueId()), GoldenFileName: name, Templates: []string{"templates/optimize/" + name + ".yaml"}, + IgnoredLines: []string{ + `\s+.*-secret:\s+.*`, // secrets are auto-generated and need to be ignored. + `\s+checksum/.+?:\s+.*`, // ignore configmap checksum. + }, }) } } diff --git a/charts/camunda-platform/test/unit/tasklist/golden/deployment.golden.yaml b/charts/camunda-platform/test/unit/tasklist/golden/deployment.golden.yaml index e4ad549c9e..7df229e942 100644 --- a/charts/camunda-platform/test/unit/tasklist/golden/deployment.golden.yaml +++ b/charts/camunda-platform/test/unit/tasklist/golden/deployment.golden.yaml @@ -35,7 +35,6 @@ spec: app.kubernetes.io/component: tasklist app.kubernetes.io/version: "8.5.2" annotations: - checksum/config: 0648f98f01fd4336d7e3ad9ba72bdaf472e7f4054b9784a1205fdb9f29d7f12b spec: imagePullSecrets: [] diff --git a/charts/camunda-platform/test/unit/tasklist/goldenfiles_test.go b/charts/camunda-platform/test/unit/tasklist/goldenfiles_test.go index 95da7dadae..b289d81fd8 100644 --- a/charts/camunda-platform/test/unit/tasklist/goldenfiles_test.go +++ b/charts/camunda-platform/test/unit/tasklist/goldenfiles_test.go @@ -40,6 +40,10 @@ func TestGoldenDefaultsTemplate(t *testing.T) { Namespace: "camunda-platform-" + strings.ToLower(random.UniqueId()), GoldenFileName: name, Templates: []string{"templates/tasklist/" + name + ".yaml"}, + IgnoredLines: []string{ + `\s+.*-secret:\s+.*`, // secrets are auto-generated and need to be ignored. + `\s+checksum/.+?:\s+.*`, // ignore configmap checksum. + }, }) } } diff --git a/charts/camunda-platform/test/unit/web-modeler/goldenfiles_test.go b/charts/camunda-platform/test/unit/web-modeler/goldenfiles_test.go index b4e61428cc..2a89644787 100644 --- a/charts/camunda-platform/test/unit/web-modeler/goldenfiles_test.go +++ b/charts/camunda-platform/test/unit/web-modeler/goldenfiles_test.go @@ -48,13 +48,18 @@ func TestGoldenDefaultsTemplate(t *testing.T) { Release: "camunda-platform-test", Namespace: "camunda-platform-" + strings.ToLower(random.UniqueId()), GoldenFileName: name, - IgnoredLines: []string{`\s+pusher-app-key:\s+.*`, `\s+pusher-app-secret:\s+.*`}, // secrets are auto-generated and need to be ignored Templates: []string{"templates/web-modeler/" + name + ".yaml"}, SetValues: map[string]string{ "webModeler.enabled": "true", "webModeler.restapi.mail.fromAddress": "example@example.com", "postgresql.enabled": "true", }, + IgnoredLines: []string{ + `\s+pusher-app-key:\s+.*`, // Auto-generated and need to be ignored. + `\s+pusher-app-secret:\s+.*`, // Auto-generated and need to be ignored. + `\s+.*-secret:\s+.*`, // secrets are auto-generated and need to be ignored. + `\s+checksum/.+?:\s+.*`, // ignore configmap checksum. + }, }) } } diff --git a/charts/camunda-platform/test/unit/zeebe-gateway/golden/deployment.golden.yaml b/charts/camunda-platform/test/unit/zeebe-gateway/golden/deployment.golden.yaml index 468b8a47bc..d1595c9a0d 100644 --- a/charts/camunda-platform/test/unit/zeebe-gateway/golden/deployment.golden.yaml +++ b/charts/camunda-platform/test/unit/zeebe-gateway/golden/deployment.golden.yaml @@ -35,7 +35,6 @@ spec: app.kubernetes.io/component: zeebe-gateway app.kubernetes.io/version: "8.5.2" annotations: - checksum/config: c8d9da5f7fa89aa26e2010ed85d99d8cdf68ee15588a936e0879f342624201c7 spec: imagePullSecrets: [] diff --git a/charts/camunda-platform/test/unit/zeebe-gateway/goldenfiles_test.go b/charts/camunda-platform/test/unit/zeebe-gateway/goldenfiles_test.go index 129f58df56..ab82cbd3ae 100644 --- a/charts/camunda-platform/test/unit/zeebe-gateway/goldenfiles_test.go +++ b/charts/camunda-platform/test/unit/zeebe-gateway/goldenfiles_test.go @@ -39,6 +39,10 @@ func TestGoldenDefaultsTemplate(t *testing.T) { Namespace: "camunda-platform-" + strings.ToLower(random.UniqueId()), GoldenFileName: name, Templates: []string{"templates/zeebe-gateway/" + name + ".yaml"}, + IgnoredLines: []string{ + `\s+.*-secret:\s+.*`, // secrets are auto-generated and need to be ignored. + `\s+checksum/.+?:\s+.*`, // ignore configmap checksum. + }, }) } } diff --git a/charts/camunda-platform/test/unit/zeebe/golden/statefulset.golden.yaml b/charts/camunda-platform/test/unit/zeebe/golden/statefulset.golden.yaml index 232455eb15..07218fc44b 100644 --- a/charts/camunda-platform/test/unit/zeebe/golden/statefulset.golden.yaml +++ b/charts/camunda-platform/test/unit/zeebe/golden/statefulset.golden.yaml @@ -38,7 +38,6 @@ spec: app.kubernetes.io/component: zeebe-broker app.kubernetes.io/version: "8.5.2" annotations: - checksum/config: 8b7886297808443e2b08a49799fb0cc6d0f250b8f23589e7cfaf8949f05ac45f spec: imagePullSecrets: [] diff --git a/charts/camunda-platform/test/unit/zeebe/goldenfiles_test.go b/charts/camunda-platform/test/unit/zeebe/goldenfiles_test.go index 6706328d91..281f15dbb1 100644 --- a/charts/camunda-platform/test/unit/zeebe/goldenfiles_test.go +++ b/charts/camunda-platform/test/unit/zeebe/goldenfiles_test.go @@ -39,6 +39,10 @@ func TestGoldenDefaultsTemplate(t *testing.T) { Namespace: "camunda-platform-" + strings.ToLower(random.UniqueId()), GoldenFileName: name, Templates: []string{"templates/zeebe/" + name + ".yaml"}, + IgnoredLines: []string{ + `\s+.*-secret:\s+.*`, // secrets are auto-generated and need to be ignored. + `\s+checksum/.+?:\s+.*`, // ignore configmap checksum. + }, }) } }