Parameterise inttest ingress to be able to deploy on different servers (

#616) * Parameterise inttests ingress values Signed-off-by: Eamonn Mansour <[email protected]> * Fix CONTEXTROOT to serve inttests on a different server path Signed-off-by: Eamonn Mansour <[email protected]> --------- Signed-off-by: Eamonn Mansour <[email protected]>
galasa-dev · Sep 26, 2024 · c5159f3 · c5159f3
1 parent 4bb9e28
commit c5159f3
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/infrastructure/galasa-plan-b-lon02/galasa-development/inttests/templates/deployment.yaml b/infrastructure/galasa-plan-b-lon02/galasa-development/inttests/templates/deployment.yaml
@@ -27,6 +27,6 @@ spec:
           name: inttests-{{ .Values.branch }}
           env:
           - name: CONTEXTROOT
-            value: {{ .Values.branch }}/maven-repo/inttests
+            value: {{ .Values.branch }}/maven-repo/{{ .Values.ingress.pathSuffix }}
           ports:
             - containerPort: 80
diff --git a/infrastructure/galasa-plan-b-lon02/galasa-development/inttests/templates/ingress.yaml b/infrastructure/galasa-plan-b-lon02/galasa-development/inttests/templates/ingress.yaml
@@ -9,22 +9,24 @@ kind: Ingress
 metadata:
   name: inttests-{{ .Values.branch }}
   namespace: {{ .Values.namespace }}
+  {{- with .Values.ingress.annotations }}
   annotations:
-    kubernetes.io/ingress.class: "public-iks-k8s-nginx"
-    
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
+  ingressClassName: {{ .Values.ingress.ingressClassName }}
+  {{- with .Values.ingress.tls }}
   tls:
-  - hosts:
-    - development.galasa.dev
-    secretName: galasa-wildcard-cert
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   rules:
-  - host: development.galasa.dev
+  - host: {{ .Values.ingress.externalHostname }}
     http:
       paths:
       - backend:
           service:
             name: inttests-{{ .Values.branch }}
             port:
               number: 80
-        path: /{{ .Values.branch }}/maven-repo/{{ .Values.ingressPathSuffix }}
+        path: /{{ .Values.branch }}/maven-repo/{{ .Values.ingress.pathSuffix }}
         pathType: Prefix
diff --git a/infrastructure/galasa-plan-b-lon02/galasa-development/inttests/values.yaml b/infrastructure/galasa-plan-b-lon02/galasa-development/inttests/values.yaml
@@ -8,4 +8,13 @@ namespace: galasa-development
 branch: main
 imageName: ghcr.io/galasa-dev/inttests-maven-artefacts
 imageTag: main
-ingressPathSuffix: inttests
+
+ingress:
+  externalHostname: development.galasa.dev
+  ingressClassName: public-iks-k8s-nginx
+  pathSuffix: inttests
+  annotations: {}
+  tls:
+  - hosts:
+      - development.galasa.dev
+    secretName: galasa-wildcard-cert