update tests

camunda · Nov 17, 2024 · d7777b3 · d7777b3
1 parent d818dd3
commit d7777b3
Show file tree

Hide file tree

Showing 60 changed files with 266 additions and 895 deletions.
diff --git a/charts/camunda-platform-alpha/test/unit/camunda/constraints_test.go b/charts/camunda-platform-alpha/test/unit/camunda/constraints_test.go
@@ -70,7 +70,7 @@ func (s *constraintTemplateTest) TestExistingSecretConstraintDoesNotDisplayError
 		SetValues: map[string]string{
 			"global.identity.auth.issuerBackendUrl":                "http://keycloak:80/auth/realms/camunda-platform",
 			"global.testDeprecationFlags.existingSecretsMustBeSet": "error",
-			"global.identity.auth.core.existingSecret.name":       "zeebe-secret",
+			"global.identity.auth.core.existingSecret.name":        "zeebe-secret",
 		},
 		KubectlOptions: k8s.NewKubectlOptions("", "", s.namespace),
 	}
@@ -81,23 +81,7 @@ func (s *constraintTemplateTest) TestExistingSecretConstraintDoesNotDisplayError
 	// then
 	s.Require().NotContains(err.Error(), "global.identity.auth.core.existingSecret")
 }
-func (s *constraintTemplateTest) TestExistingSecretConstraintDoesNotDisplayErrorForComponentThatsDisabled() {
-	// given
-	options := &helm.Options{
-		SetValues: map[string]string{
-			"global.identity.auth.issuerBackendUrl":                "http://keycloak:80/auth/realms/camunda-platform",
-			"global.testDeprecationFlags.existingSecretsMustBeSet": "error",
-			"operate.enabled": "false",
-		},
-		KubectlOptions: k8s.NewKubectlOptions("", "", s.namespace),
-	}
-
-	// when
-	_, err := helm.RenderTemplateE(s.T(), options, s.chartPath, s.release, s.templates)
 
-	// then
-	s.Require().NotContains(err.Error(), "global.identity.auth.operate.existingSecret")
-}
 func (s *constraintTemplateTest) TestExistingSecretConstraintInWarningModeDoesNotPreventInstall() {
 	// given
 	options := &helm.Options{
@@ -114,19 +98,3 @@ func (s *constraintTemplateTest) TestExistingSecretConstraintInWarningModeDoesNo
 	// then
 	s.Require().Nil(err)
 }
-
-func (s *ConstraintsTemplateTest) TestContextPathAndRestPathForZeebeGatewayConstraintBothValuesShouldBeTheSame() {
-	options := &helm.Options{
-		SetValues: map[string]string{
-			"zeebeGateway.ingress.rest.enabled": "true",
-			"zeebeGateway.ingress.rest.path":    "/zeebe",
-			"zeebeGateway.contextPath":          "/zeebeRest",
-		},
-		KubectlOptions: k8s.NewKubectlOptions("", "", s.namespace),
-	}
-
-	_, err := helm.RenderTemplateE(s.T(), options, s.chartPath, s.release, s.templates)
-
-	s.Require().ErrorContains(err, "[camunda][error]")
-
-}
diff --git a/charts/camunda-platform-alpha/test/unit/camunda/global_deployment_test.go b/charts/camunda-platform-alpha/test/unit/camunda/global_deployment_test.go
@@ -138,15 +138,12 @@ func (s *deploymentTemplateTest) TestContainerSetImageNameGlobal() {
 	// given
 	options := &helm.Options{
 		SetValues: map[string]string{
-			"global.image.registry":  "global.custom.registry.io",
-			"global.image.tag":       "8.x.x",
-			"connectors.image.tag":   "",
-			"identity.image.tag":     "",
-			"operate.image.tag":      "",
-			"optimize.image.tag":     "",
-			"tasklist.image.tag":     "",
-			"zeebe.image.tag":        "",
-			"zeebeGateway.image.tag": "",
+			"global.image.registry": "global.custom.registry.io",
+			"global.image.tag":      "8.x.x",
+			"connectors.image.tag":  "",
+			"identity.image.tag":    "",
+			"optimize.image.tag":    "",
+			"core.image.tag":        "",
 		},
 		KubectlOptions: k8s.NewKubectlOptions("", "", s.namespace),
 	}
@@ -157,8 +154,6 @@ func (s *deploymentTemplateTest) TestContainerSetImageNameGlobal() {
 	// then
 	s.Require().Contains(output, "image: global.custom.registry.io/camunda/connectors-bundle:8.x.x")
 	s.Require().Contains(output, "image: global.custom.registry.io/camunda/identity:8.x.x")
-	s.Require().Contains(output, "image: global.custom.registry.io/camunda/operate:8.x.x")
 	s.Require().Contains(output, "image: global.custom.registry.io/camunda/optimize:8.x.x")
-	s.Require().Contains(output, "image: global.custom.registry.io/camunda/tasklist:8.x.x")
-	s.Require().Contains(output, "image: global.custom.registry.io/camunda/zeebe:8.x.x")
+	s.Require().Contains(output, "image: global.custom.registry.io/camunda/camunda:8.x.x")
 }
diff --git a/.../golden/zeebe-service-monitor.golden.yaml → ...a/golden/core-service-monitor.golden.yaml b/.../golden/zeebe-service-monitor.golden.yaml → ...a/golden/core-service-monitor.golden.yaml
@@ -1,9 +1,9 @@
 ---
-# Source: camunda-platform/templates/service-monitor/zeebe-service-monitor.yaml
+# Source: camunda-platform/templates/service-monitor/core-service-monitor.yaml
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: camunda-platform-test-zeebe
+  name: camunda-platform-test-core
   labels:
     app: camunda-platform
     app.kubernetes.io/name: camunda-platform
@@ -15,7 +15,7 @@ spec:
   selector:
     matchLabels:
       app: camunda-platform
-      app.kubernetes.io/component: zeebe-broker
+      app.kubernetes.io/component: core
   endpoints:
     - honorLabels: true
       path: /actuator/prometheus

diff --git a/charts/camunda-platform-alpha/test/unit/camunda/golden/operate-service-monitor.golden.yaml b/charts/camunda-platform-alpha/test/unit/camunda/golden/operate-service-monitor.golden.yaml
diff --git a/...t/camunda/golden/secret-zeebe.golden.yaml → ...it/camunda/golden/secret-core.golden.yaml b/...t/camunda/golden/secret-zeebe.golden.yaml → ...it/camunda/golden/secret-core.golden.yaml
@@ -1,9 +1,9 @@
 ---
-# Source: camunda-platform/templates/camunda/secret-zeebe.yaml
+# Source: camunda-platform/templates/camunda/secret-core.yaml
 apiVersion: v1
 kind: Secret
 metadata:
-  name: camunda-platform-test-zeebe-identity-secret
+  name: camunda-platform-test-core-identity-secret
   labels:
     app: camunda-platform
     app.kubernetes.io/name: identity

diff --git a/charts/camunda-platform-alpha/test/unit/camunda/golden/secret-operate.golden.yaml b/charts/camunda-platform-alpha/test/unit/camunda/golden/secret-operate.golden.yaml
diff --git a/charts/camunda-platform-alpha/test/unit/camunda/golden/secret-tasklist.golden.yaml b/charts/camunda-platform-alpha/test/unit/camunda/golden/secret-tasklist.golden.yaml
diff --git a/charts/camunda-platform-alpha/test/unit/camunda/golden/tasklist-service-monitor.golden.yaml b/charts/camunda-platform-alpha/test/unit/camunda/golden/tasklist-service-monitor.golden.yaml
diff --git a/...camunda-platform-alpha/test/unit/camunda/golden/zeebe-gateway-service-monitor.golden.yaml b/...camunda-platform-alpha/test/unit/camunda/golden/zeebe-gateway-service-monitor.golden.yaml
diff --git a/charts/camunda-platform-alpha/test/unit/camunda/goldenfiles_test.go b/charts/camunda-platform-alpha/test/unit/camunda/goldenfiles_test.go
@@ -33,10 +33,8 @@ func TestGoldenDefaultsTemplateSecrets(t *testing.T) {
 	templateNames := []string{
 		"secret-connectors",
 		"secret-console",
-		"secret-operate",
 		"secret-optimize",
-		"secret-tasklist",
-		"secret-zeebe",
+		"secret-core",
 	}
 
 	for _, name := range templateNames {

diff --git a/charts/camunda-platform-alpha/test/unit/camunda/ingress_test.go b/charts/camunda-platform-alpha/test/unit/camunda/ingress_test.go
@@ -48,7 +48,7 @@ func TestIngressTemplate(t *testing.T) {
 		chartPath: chartPath,
 		release:   "camunda-platform-test",
 		namespace: "camunda-platform-" + strings.ToLower(random.UniqueId()),
-		templates: []string{"templates/camunda/ingress.yaml"},
+		templates: []string{"templates/camunda/ingress-http.yaml"},
 	})
 }
 
@@ -157,13 +157,11 @@ func (s *ingressTemplateTest) TestIngressWithContextPath() {
 		SetValues: map[string]string{
 			"global.ingress.enabled":              "true",
 			"identity.contextPath":                "/identity",
-			"operate.contextPath":                 "/operate",
 			"optimize.contextPath":                "/optimize",
-			"tasklist.contextPath":                "/tasklist",
 			"webModeler.enabled":                  "true",
 			"webModeler.restapi.mail.fromAddress": "[email protected]",
 			"webModeler.contextPath":              "/modeler",
-			"zeebeGateway.contextPath":            "/zeebe",
+			"core.contextPath":                    "/core",
 		},
 		KubectlOptions: k8s.NewKubectlOptions("", "", s.namespace),
 		ExtraArgs:      map[string][]string{"install": {"--debug"}},
@@ -176,12 +174,10 @@ func (s *ingressTemplateTest) TestIngressWithContextPath() {
 	s.Require().Contains(output, "kind: Ingress")
 	s.Require().Contains(output, "path: /auth")
 	s.Require().Contains(output, "path: /identity")
-	s.Require().Contains(output, "path: /operate")
 	s.Require().Contains(output, "path: /optimize")
-	s.Require().Contains(output, "path: /tasklist")
 	s.Require().Contains(output, "path: /modeler")
 	s.Require().Contains(output, "path: /modeler-ws")
-	s.Require().Contains(output, "path: /zeebe")
+	s.Require().Contains(output, "path: /core")
 }
 
 func (s *ingressTemplateTest) TestIngressComponentWithNoContextPath() {
@@ -190,12 +186,11 @@ func (s *ingressTemplateTest) TestIngressComponentWithNoContextPath() {
 		SetValues: map[string]string{
 			"global.ingress.enabled":              "true",
 			"identity.contextPath":                "",
-			"operate.contextPath":                 "",
 			"optimize.contextPath":                "",
-			"tasklist.contextPath":                "",
 			"webModeler.enabled":                  "true",
 			"webModeler.restapi.mail.fromAddress": "[email protected]",
 			"webModeler.contextPath":              "",
+			"core.contextPath":                    "",
 		},
 		KubectlOptions: k8s.NewKubectlOptions("", "", s.namespace),
 		ExtraArgs:      map[string][]string{"install": {"--debug"}},
@@ -206,25 +201,20 @@ func (s *ingressTemplateTest) TestIngressComponentWithNoContextPath() {
 
 	// then
 	s.Require().NotContains(output, "name: camunda-platform-test-identity")
-	s.Require().NotContains(output, "name: camunda-platform-test-operate")
 	s.Require().NotContains(output, "name: camunda-platform-test-optimize")
-	s.Require().NotContains(output, "name: camunda-platform-test-tasklist")
 	s.Require().NotContains(output, "name: camunda-platform-test-web-modeler-webapp")
 	s.Require().NotContains(output, "name: camunda-platform-test-web-modeler-websockets")
-	s.Require().NotContains(output, "name: camunda-platform-test-zeebe-gateway")
+	s.Require().NotContains(output, "name: camunda-platform-test-core")
 }
 
 func (s *ingressTemplateTest) TestIngressComponentDisabled() {
 	// given
 	options := &helm.Options{
 		SetValues: map[string]string{
 			"global.ingress.enabled": "true",
-			"operate.identity":       "false",
-			"operate.enabled":        "false",
 			"optimize.enabled":       "false",
-			"tasklist.enabled":       "false",
 			"webModeler.enabled":     "false",
-			"zeebe.enabled":          "false",
+			"core.enabled":           "false",
 		},
 		KubectlOptions: k8s.NewKubectlOptions("", "", s.namespace),
 		ExtraArgs:      map[string][]string{"install": {"--debug"}},
@@ -235,10 +225,8 @@ func (s *ingressTemplateTest) TestIngressComponentDisabled() {
 
 	// then
 	s.Require().NotContains(output, "name: camunda-platform-test-identity")
-	s.Require().NotContains(output, "name: camunda-platform-test-operate")
 	s.Require().NotContains(output, "name: camunda-platform-test-optimize")
-	s.Require().NotContains(output, "name: camunda-platform-test-tasklist")
 	s.Require().NotContains(output, "name: camunda-platform-test-web-modeler-webapp")
 	s.Require().NotContains(output, "name: camunda-platform-test-web-modeler-websockets")
-	s.Require().NotContains(output, "name: camunda-platform-test-zeebe-gateway")
+	s.Require().NotContains(output, "name: camunda-platform-test-core")
 }
diff --git a/charts/camunda-platform-alpha/test/unit/camunda/secret_test.go b/charts/camunda-platform-alpha/test/unit/camunda/secret_test.go
@@ -60,19 +60,15 @@ func (s *secretTest) TestContainerGenerateSecret() {
 	s.templates = []string{
 		"templates/camunda/secret-connectors.yaml",
 		"templates/camunda/secret-console.yaml",
-		"templates/camunda/secret-operate.yaml",
 		"templates/camunda/secret-optimize.yaml",
-		"templates/camunda/secret-tasklist.yaml",
-		"templates/camunda/secret-zeebe.yaml",
+		"templates/camunda/secret-core.yaml",
 	}
 
 	s.secretName = []string{
 		"connectors-secret",
 		"console-secret",
-		"operate-secret",
 		"optimize-secret",
-		"tasklist-secret",
-		"zeebe-secret",
+		"core-secret",
 	}
 
 	s.Require().GreaterOrEqual(6, len(s.templates))