chore: set testsuites vars per chart version (#2038)

Signed-off-by: Ahmed AbouZaid <[email protected]>
camunda · Jun 24, 2024 · be4abe7 · be4abe7
1 parent 6bb9a39
commit be4abe7
Show file tree

Hide file tree

Showing 28 changed files with 341 additions and 22 deletions.
diff --git a/.github/workflows/test-alpha.yaml b/.github/workflows/test-alpha.yaml
@@ -52,6 +52,5 @@ jobs:
       identifier: "${{ github.event.pull_request.number }}-intg-alpha"
       platforms: "gke"
       flows: "install,upgrade"
-      test-enabled: false
       camunda-helm-dir: "camunda-platform-alpha"
       camunda-helm-git-ref: "${{ github.event.pull_request.head.sha }}"
diff --git a/charts/camunda-platform-8.2/test/integration/testsuites/vars/files/variables-default.yaml b/charts/camunda-platform-8.2/test/integration/testsuites/vars/files/variables-default.yaml
@@ -0,0 +1,29 @@
+preflightVars:
+  baseURLs:
+    elasticsearch: http://integration-elasticsearch:9200
+    console: http://integration-console:9100
+    keycloak: http://integration-keycloak
+    identity: http://integration-identity:82
+    optimize: http://integration-optimize
+    operate: http://integration-operate
+    tasklist: http://integration-tasklist
+    connectors: http://integration-connectors:8080
+    webModelerRestapi: http://integration-web-modeler-restapi:8091
+    webModelerWebapp: http://integration-web-modeler-webapp:8071
+    zeebeGateway: http://integration-zeebe-gateway:9600
+
+coreVars:
+  authURL: "http://integration-keycloak/auth/realms/camunda-platform/protocol/openid-connect/token"
+  baseURLs:
+    console: http://integration-console
+    keycloak: http://integration-keycloak
+    identity: http://integration-identity
+    optimize: http://integration-optimize
+    operate: http://integration-operate
+    tasklist: http://integration-tasklist
+    connectors: http://integration-connectors:8080/inbound
+    webModelerRestapi: http://integration-web-modeler-restapi
+    zeebeGatewayGRPC: http://integration-zeebe-gateway:9600
+    zeebeGatewayREST: http://integration-zeebe-gateway:8080
+  zbctl:
+    extraArgs: "--insecure"
diff --git a/...munda-platform-8.2/test/integration/testsuites/vars/files/variables-ingress-combined.yaml b/...munda-platform-8.2/test/integration/testsuites/vars/files/variables-ingress-combined.yaml
@@ -0,0 +1,32 @@
+preflightVars:
+  baseURLs:
+    elasticsearch: http://integration-elasticsearch:9200
+    console: http://integration-console:9100
+    keycloak: http://integration-keycloak
+    identity: http://integration-identity:82
+    optimize: http://integration-optimize/optimize
+    operate: http://integration-operate/operate
+    tasklist: http://integration-tasklist/tasklist
+    connectors: http://integration-connectors:8080/connectors
+    webModelerRestapi: http://integration-web-modeler-restapi:8091
+    webModelerWebapp: http://integration-web-modeler-webapp:8071
+    zeebeGateway: http://integration-zeebe-gateway:9600/zeebe
+
+coreVars:
+  authURL: "https://{{ .TEST_INGRESS_HOST }}/auth/realms/camunda-platform/protocol/openid-connect/token"
+  testNamespace: "{{ .K8S_NAMESPACE }}"
+  baseURLs:
+    console: "https://{{ .TEST_INGRESS_HOST }}"
+    keycloak: "https://{{ .TEST_INGRESS_HOST }}/auth/"
+    identity: "https://{{ .TEST_INGRESS_HOST }}/identity"
+    operate: "https://{{ .TEST_INGRESS_HOST }}/operate"
+    optimize: "https://{{ .TEST_INGRESS_HOST }}/optimize"
+    tasklist: "https://{{ .TEST_INGRESS_HOST }}/tasklist"
+    connectors: "https://{{ .TEST_INGRESS_HOST }}/connectors/inbound"
+    webModeler: "https://{{ .TEST_INGRESS_HOST }}/modeler"
+    webModelerRestapi: http://integration-web-modeler-restapi
+    zeebeGatewayGRPC: "zeebe-{{ .TEST_INGRESS_HOST }}:443"
+    zeebeGatewayREST: "https://{{ .TEST_INGRESS_HOST }}/zeebe"
+    prometheus: "prometheus-operated.kube-prometheus-stack.svc.cluster.local:9090"
+  zbctl:
+    extraArgs: ""
diff --git a/...ation/testsuites/base/files/variables.env → ...ation/testsuites/vars/files/variables.env b/...ation/testsuites/base/files/variables.env → ...ation/testsuites/vars/files/variables.env
diff --git a/charts/camunda-platform-8.2/test/integration/testsuites/vars/kustomization.yaml b/charts/camunda-platform-8.2/test/integration/testsuites/vars/kustomization.yaml
@@ -0,0 +1,15 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+configMapGenerator:
+- name: venom-vars
+  options:
+    disableNameSuffixHash: true
+  files:
+  - files/variables-default.yaml
+  - files/variables-ingress-combined.yaml
+- name: venom-env-vars
+  options:
+    disableNameSuffixHash: true
+  envs:
+  - files/variables.env
diff --git a/charts/camunda-platform-8.3/charts/identity/templates/deployment.yaml b/charts/camunda-platform-8.3/charts/identity/templates/deployment.yaml
@@ -27,7 +27,7 @@ spec:
         {{- tpl (.Values.initContainers | default list | toYaml | nindent 8) $ }}
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ include "camundaPlatform.image" . | quote }}
+          image: {{ include "camundaPlatform.image" . }}
           imagePullPolicy: {{ .Values.global.image.pullPolicy }}
           {{- if .Values.containerSecurityContext }}
           securityContext: {{- toYaml .Values.containerSecurityContext | nindent 12 }}

diff --git a/charts/camunda-platform-8.3/test/integration/testsuites/vars/files/variables-default.yaml b/charts/camunda-platform-8.3/test/integration/testsuites/vars/files/variables-default.yaml
@@ -0,0 +1,29 @@
+preflightVars:
+  baseURLs:
+    elasticsearch: http://integration-elasticsearch:9200
+    console: http://integration-console:9100
+    keycloak: http://integration-keycloak
+    identity: http://integration-identity:82
+    optimize: http://integration-optimize
+    operate: http://integration-operate
+    tasklist: http://integration-tasklist
+    connectors: http://integration-connectors:8080
+    webModelerRestapi: http://integration-web-modeler-restapi:8091
+    webModelerWebapp: http://integration-web-modeler-webapp:8071
+    zeebeGateway: http://integration-zeebe-gateway:9600
+
+coreVars:
+  authURL: "http://integration-keycloak/auth/realms/camunda-platform/protocol/openid-connect/token"
+  baseURLs:
+    console: http://integration-console
+    keycloak: http://integration-keycloak
+    identity: http://integration-identity
+    optimize: http://integration-optimize
+    operate: http://integration-operate
+    tasklist: http://integration-tasklist
+    connectors: http://integration-connectors:8080/inbound
+    webModelerRestapi: http://integration-web-modeler-restapi
+    zeebeGatewayGRPC: http://integration-zeebe-gateway:9600
+    zeebeGatewayREST: http://integration-zeebe-gateway:8080
+  zbctl:
+    extraArgs: "--insecure"
diff --git a/...munda-platform-8.3/test/integration/testsuites/vars/files/variables-ingress-combined.yaml b/...munda-platform-8.3/test/integration/testsuites/vars/files/variables-ingress-combined.yaml
@@ -0,0 +1,32 @@
+preflightVars:
+  baseURLs:
+    elasticsearch: http://integration-elasticsearch:9200
+    console: http://integration-console:9100
+    keycloak: http://integration-keycloak
+    identity: http://integration-identity:82
+    optimize: http://integration-optimize/optimize
+    operate: http://integration-operate/operate
+    tasklist: http://integration-tasklist/tasklist
+    connectors: http://integration-connectors:8080/connectors
+    webModelerRestapi: http://integration-web-modeler-restapi:8091
+    webModelerWebapp: http://integration-web-modeler-webapp:8071
+    zeebeGateway: http://integration-zeebe-gateway:9600/zeebe
+
+coreVars:
+  authURL: "https://{{ .TEST_INGRESS_HOST }}/auth/realms/camunda-platform/protocol/openid-connect/token"
+  testNamespace: "{{ .K8S_NAMESPACE }}"
+  baseURLs:
+    console: "https://{{ .TEST_INGRESS_HOST }}"
+    keycloak: "https://{{ .TEST_INGRESS_HOST }}/auth/"
+    identity: "https://{{ .TEST_INGRESS_HOST }}/identity"
+    operate: "https://{{ .TEST_INGRESS_HOST }}/operate"
+    optimize: "https://{{ .TEST_INGRESS_HOST }}/optimize"
+    tasklist: "https://{{ .TEST_INGRESS_HOST }}/tasklist"
+    connectors: "https://{{ .TEST_INGRESS_HOST }}/connectors/inbound"
+    webModeler: "https://{{ .TEST_INGRESS_HOST }}/modeler"
+    webModelerRestapi: http://integration-web-modeler-restapi
+    zeebeGatewayGRPC: "zeebe-{{ .TEST_INGRESS_HOST }}:443"
+    zeebeGatewayREST: "https://{{ .TEST_INGRESS_HOST }}/zeebe"
+    prometheus: "prometheus-operated.kube-prometheus-stack.svc.cluster.local:9090"
+  zbctl:
+    extraArgs: ""
diff --git a/charts/camunda-platform-8.3/test/integration/testsuites/vars/files/variables.env b/charts/camunda-platform-8.3/test/integration/testsuites/vars/files/variables.env
@@ -0,0 +1 @@
+# The values here will be autogenerated at the deploy time.
diff --git a/charts/camunda-platform-8.3/test/integration/testsuites/vars/kustomization.yaml b/charts/camunda-platform-8.3/test/integration/testsuites/vars/kustomization.yaml
@@ -0,0 +1,15 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+configMapGenerator:
+- name: venom-vars
+  options:
+    disableNameSuffixHash: true
+  files:
+  - files/variables-default.yaml
+  - files/variables-ingress-combined.yaml
+- name: venom-env-vars
+  options:
+    disableNameSuffixHash: true
+  envs:
+  - files/variables.env
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
@@ -42,7 +42,7 @@ spec:
         []
       containers:
         - name: identity
-          image: "camunda/identity:8.3.12"
+          image: camunda/identity:8.3.12
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false

diff --git a/charts/camunda-platform-8.4/charts/identity/templates/deployment.yaml b/charts/camunda-platform-8.4/charts/identity/templates/deployment.yaml
@@ -27,7 +27,7 @@ spec:
         {{- tpl (.Values.initContainers | default list | toYaml | nindent 8) $ }}
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ include "camundaPlatform.image" . | quote }}
+          image: {{ include "camundaPlatform.image" . }}
           imagePullPolicy: {{ .Values.global.image.pullPolicy }}
           {{- if .Values.containerSecurityContext }}
           securityContext: {{- toYaml .Values.containerSecurityContext | nindent 12 }}

diff --git a/charts/camunda-platform-8.4/test/integration/testsuites/vars/files/variables-default.yaml b/charts/camunda-platform-8.4/test/integration/testsuites/vars/files/variables-default.yaml
@@ -0,0 +1,29 @@
+preflightVars:
+  baseURLs:
+    elasticsearch: http://integration-elasticsearch:9200
+    console: http://integration-console:9100
+    keycloak: http://integration-keycloak
+    identity: http://integration-identity:82
+    optimize: http://integration-optimize
+    operate: http://integration-operate
+    tasklist: http://integration-tasklist
+    connectors: http://integration-connectors:8080
+    webModelerRestapi: http://integration-web-modeler-restapi:8091
+    webModelerWebapp: http://integration-web-modeler-webapp:8071
+    zeebeGateway: http://integration-zeebe-gateway:9600
+
+coreVars:
+  authURL: "http://integration-keycloak/auth/realms/camunda-platform/protocol/openid-connect/token"
+  baseURLs:
+    console: http://integration-console
+    keycloak: http://integration-keycloak
+    identity: http://integration-identity
+    optimize: http://integration-optimize
+    operate: http://integration-operate
+    tasklist: http://integration-tasklist
+    connectors: http://integration-connectors:8080/inbound
+    webModelerRestapi: http://integration-web-modeler-restapi
+    zeebeGatewayGRPC: http://integration-zeebe-gateway:9600
+    zeebeGatewayREST: http://integration-zeebe-gateway:8080
+  zbctl:
+    extraArgs: "--insecure"
diff --git a/...munda-platform-8.4/test/integration/testsuites/vars/files/variables-ingress-combined.yaml b/...munda-platform-8.4/test/integration/testsuites/vars/files/variables-ingress-combined.yaml
@@ -0,0 +1,32 @@
+preflightVars:
+  baseURLs:
+    elasticsearch: http://integration-elasticsearch:9200
+    console: http://integration-console:9100
+    keycloak: http://integration-keycloak
+    identity: http://integration-identity:82
+    optimize: http://integration-optimize/optimize
+    operate: http://integration-operate/operate
+    tasklist: http://integration-tasklist/tasklist
+    connectors: http://integration-connectors:8080/connectors
+    webModelerRestapi: http://integration-web-modeler-restapi:8091
+    webModelerWebapp: http://integration-web-modeler-webapp:8071
+    zeebeGateway: http://integration-zeebe-gateway:9600/zeebe
+
+coreVars:
+  authURL: "https://{{ .TEST_INGRESS_HOST }}/auth/realms/camunda-platform/protocol/openid-connect/token"
+  testNamespace: "{{ .K8S_NAMESPACE }}"
+  baseURLs:
+    console: "https://{{ .TEST_INGRESS_HOST }}"
+    keycloak: "https://{{ .TEST_INGRESS_HOST }}/auth/"
+    identity: "https://{{ .TEST_INGRESS_HOST }}/identity"
+    operate: "https://{{ .TEST_INGRESS_HOST }}/operate"
+    optimize: "https://{{ .TEST_INGRESS_HOST }}/optimize"
+    tasklist: "https://{{ .TEST_INGRESS_HOST }}/tasklist"
+    connectors: "https://{{ .TEST_INGRESS_HOST }}/connectors/inbound"
+    webModeler: "https://{{ .TEST_INGRESS_HOST }}/modeler"
+    webModelerRestapi: http://integration-web-modeler-restapi
+    zeebeGatewayGRPC: "zeebe-{{ .TEST_INGRESS_HOST }}:443"
+    zeebeGatewayREST: "https://{{ .TEST_INGRESS_HOST }}/zeebe"
+    prometheus: "prometheus-operated.kube-prometheus-stack.svc.cluster.local:9090"
+  zbctl:
+    extraArgs: ""
diff --git a/charts/camunda-platform-8.4/test/integration/testsuites/vars/files/variables.env b/charts/camunda-platform-8.4/test/integration/testsuites/vars/files/variables.env
@@ -0,0 +1 @@
+# The values here will be autogenerated at the deploy time.
diff --git a/charts/camunda-platform-8.4/test/integration/testsuites/vars/kustomization.yaml b/charts/camunda-platform-8.4/test/integration/testsuites/vars/kustomization.yaml
@@ -0,0 +1,15 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+configMapGenerator:
+- name: venom-vars
+  options:
+    disableNameSuffixHash: true
+  files:
+  - files/variables-default.yaml
+  - files/variables-ingress-combined.yaml
+- name: venom-env-vars
+  options:
+    disableNameSuffixHash: true
+  envs:
+  - files/variables.env
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
@@ -42,7 +42,7 @@ spec:
         []
       containers:
         - name: identity
-          image: "camunda/identity:8.4.8"
+          image: camunda/identity:8.4.8
           imagePullPolicy: IfNotPresent
           securityContext:
             allowPrivilegeEscalation: false

diff --git a/...tsuites/base/files/variables-default.yaml → ...tsuites/vars/files/variables-default.yaml b/...tsuites/base/files/variables-default.yaml → ...tsuites/vars/files/variables-default.yaml
diff --git a/...ase/files/variables-ingress-combined.yaml → ...ars/files/variables-ingress-combined.yaml b/...ase/files/variables-ingress-combined.yaml → ...ars/files/variables-ingress-combined.yaml
diff --git a/charts/camunda-platform-alpha/test/integration/testsuites/vars/files/variables.env b/charts/camunda-platform-alpha/test/integration/testsuites/vars/files/variables.env
@@ -0,0 +1 @@
+# The values here will be autogenerated at the deploy time.
diff --git a/charts/camunda-platform-alpha/test/integration/testsuites/vars/kustomization.yaml b/charts/camunda-platform-alpha/test/integration/testsuites/vars/kustomization.yaml
@@ -0,0 +1,15 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+configMapGenerator:
+- name: venom-vars
+  options:
+    disableNameSuffixHash: true
+  files:
+  - files/variables-default.yaml
+  - files/variables-ingress-combined.yaml
+- name: venom-env-vars
+  options:
+    disableNameSuffixHash: true
+  envs:
+  - files/variables.env
diff --git a/charts/camunda-platform-latest/test/integration/testsuites/vars/files/variables-default.yaml b/charts/camunda-platform-latest/test/integration/testsuites/vars/files/variables-default.yaml
@@ -0,0 +1,29 @@
+preflightVars:
+  baseURLs:
+    elasticsearch: http://integration-elasticsearch:9200
+    console: http://integration-console:9100
+    keycloak: http://integration-keycloak
+    identity: http://integration-identity:82
+    optimize: http://integration-optimize
+    operate: http://integration-operate
+    tasklist: http://integration-tasklist
+    connectors: http://integration-connectors:8080
+    webModelerRestapi: http://integration-web-modeler-restapi:8091
+    webModelerWebapp: http://integration-web-modeler-webapp:8071
+    zeebeGateway: http://integration-zeebe-gateway:9600
+
+coreVars:
+  authURL: "http://integration-keycloak/auth/realms/camunda-platform/protocol/openid-connect/token"
+  baseURLs:
+    console: http://integration-console
+    keycloak: http://integration-keycloak
+    identity: http://integration-identity
+    optimize: http://integration-optimize
+    operate: http://integration-operate
+    tasklist: http://integration-tasklist
+    connectors: http://integration-connectors:8080/inbound
+    webModelerRestapi: http://integration-web-modeler-restapi
+    zeebeGatewayGRPC: http://integration-zeebe-gateway:9600
+    zeebeGatewayREST: http://integration-zeebe-gateway:8080
+  zbctl:
+    extraArgs: "--insecure"
diff --git a/...da-platform-latest/test/integration/testsuites/vars/files/variables-ingress-combined.yaml b/...da-platform-latest/test/integration/testsuites/vars/files/variables-ingress-combined.yaml
@@ -0,0 +1,32 @@
+preflightVars:
+  baseURLs:
+    elasticsearch: http://integration-elasticsearch:9200
+    console: http://integration-console:9100
+    keycloak: http://integration-keycloak
+    identity: http://integration-identity:82
+    optimize: http://integration-optimize/optimize
+    operate: http://integration-operate/operate
+    tasklist: http://integration-tasklist/tasklist
+    connectors: http://integration-connectors:8080/connectors
+    webModelerRestapi: http://integration-web-modeler-restapi:8091
+    webModelerWebapp: http://integration-web-modeler-webapp:8071
+    zeebeGateway: http://integration-zeebe-gateway:9600/zeebe
+
+coreVars:
+  authURL: "https://{{ .TEST_INGRESS_HOST }}/auth/realms/camunda-platform/protocol/openid-connect/token"
+  testNamespace: "{{ .K8S_NAMESPACE }}"
+  baseURLs:
+    console: "https://{{ .TEST_INGRESS_HOST }}"
+    keycloak: "https://{{ .TEST_INGRESS_HOST }}/auth/"
+    identity: "https://{{ .TEST_INGRESS_HOST }}/identity"
+    operate: "https://{{ .TEST_INGRESS_HOST }}/operate"
+    optimize: "https://{{ .TEST_INGRESS_HOST }}/optimize"
+    tasklist: "https://{{ .TEST_INGRESS_HOST }}/tasklist"
+    connectors: "https://{{ .TEST_INGRESS_HOST }}/connectors/inbound"
+    webModeler: "https://{{ .TEST_INGRESS_HOST }}/modeler"
+    webModelerRestapi: http://integration-web-modeler-restapi
+    zeebeGatewayGRPC: "zeebe-{{ .TEST_INGRESS_HOST }}:443"
+    zeebeGatewayREST: "https://{{ .TEST_INGRESS_HOST }}/zeebe"
+    prometheus: "prometheus-operated.kube-prometheus-stack.svc.cluster.local:9090"
+  zbctl:
+    extraArgs: ""
diff --git a/charts/camunda-platform-latest/test/integration/testsuites/vars/files/variables.env b/charts/camunda-platform-latest/test/integration/testsuites/vars/files/variables.env
@@ -0,0 +1 @@
+# The values here will be autogenerated at the deploy time.
diff --git a/charts/camunda-platform-latest/test/integration/testsuites/vars/kustomization.yaml b/charts/camunda-platform-latest/test/integration/testsuites/vars/kustomization.yaml
@@ -0,0 +1,15 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+configMapGenerator:
+- name: venom-vars
+  options:
+    disableNameSuffixHash: true
+  files:
+  - files/variables-default.yaml
+  - files/variables-ingress-combined.yaml
+- name: venom-env-vars
+  options:
+    disableNameSuffixHash: true
+  envs:
+  - files/variables.env
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		# The values here will be autogenerated at the deploy time.