Add appProtocol to service (#18)

* Add appProtocol to service * increment patch * make service protocol configurable * give listening more time Co-authored-by: Dominic Gabriel <[email protected]> Co-authored-by: Elio Bischof <[email protected]>
zitadel · Jul 19, 2022 · c61c96d · c61c96d
1 parent 167f42b
commit c61c96d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/charts/zitadel/Chart.yaml b/charts/zitadel/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: zitadel
 description: A Helm chart for ZITADEL v2
 type: application
-version: 2.2.1
+version: 2.2.2
 appVersion: "v2.0.0-v2-alpha.23-amd64"
 kubeVersion: '>= 1.16.15-0'
 icon: https://zitadel.zitadel.cloud/ui/login/resources/themes/zitadel/logo-dark.svg

diff --git a/charts/zitadel/templates/deployment.yaml b/charts/zitadel/templates/deployment.yaml
@@ -68,7 +68,7 @@ spec:
             {{- end}}
           ports:
           - containerPort: 8080
-            name: server
+            name: {{ .Values.service.protocol }}-server
             protocol: TCP
           volumeMounts:
           - name: zitadel-config-yaml

diff --git a/charts/zitadel/templates/service.yaml b/charts/zitadel/templates/service.yaml
@@ -10,6 +10,9 @@ spec:
     - port: {{ .Values.service.port }}
       targetPort: 8080
       protocol: TCP
-      name: server
+      name: {{ .Values.service.protocol }}-server
+      {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
+      appProtocol: {{ .Values.service.protocol }}
+      {{- end }}
   selector:
     {{- include "zitadel.selectorLabels" . | nindent 4 }}
diff --git a/charts/zitadel/test/integration/listening.go b/charts/zitadel/test/integration/listening.go
@@ -13,7 +13,7 @@ import (
 )
 
 func (s *integrationTest) awaitListening(pods []corev1.Pod) {
-	ctx, cancel := context.WithTimeout(s.context, 3*time.Minute)
+	ctx, cancel := context.WithTimeout(s.context, 5*time.Minute)
 	defer cancel()
 
 	k8sClient, err := k8s.GetKubernetesClientE(s.T())

diff --git a/charts/zitadel/values.yaml b/charts/zitadel/values.yaml
@@ -81,6 +81,7 @@ securityContext: {}
 service:
   type: ClusterIP
   port: 80
+  protocol: http2
 
 ingress:
   enabled: false