Merge pull request #38 from meisterplan/feature/allow-multiple-hosts

meisterplan · Mar 7, 2023 · a9b00f5 · a9b00f5
2 parents aaccc12 + 02c509a
commit a9b00f5
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,12 @@
 # spring-service
 
+## 3.11.0
+
+- Allow multiple hosts for ingress resources, to allow URL migrations.
+
 ## 3.10.0
 
-- Remove pod CPU limits 
+- Remove pod CPU limits
 
 ## 3.9.0
 

diff --git a/charts/spring-service/Chart.yaml b/charts/spring-service/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v1
 name: spring-service
 description: A generalized deployment for Meisterplan Spring Boot services in Kubernetes.
-version: 3.10.0
+version: 3.11.0
diff --git a/charts/spring-service/templates/post-deployment/ingress.yaml b/charts/spring-service/templates/post-deployment/ingress.yaml
@@ -31,3 +31,15 @@ spec:
                 name: {{ .Values.serviceName }}
                 port:
                   number: 80
+{{- range $host := .Values.ingress.additionalHosts }}
+    - host: {{ $host }}
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: {{ $.Values.serviceName }}
+                port:
+                  number: 80
+{{- end }}
diff --git a/charts/spring-service/values.yaml b/charts/spring-service/values.yaml
@@ -35,6 +35,7 @@ resources:
 
 ingress:
   host: "" # Hostname under which the service is available, normally configured per deployment target
+  additionalHosts: [] # Some more hosts that should be used to make the service available
 
 # Optional: Manual configuration of special timeouts for deployments.
 timeouts:

diff --git a/...ng-service/complex-service/expected/spring-service/templates/post-deployment/ingress.yaml b/...ng-service/complex-service/expected/spring-service/templates/post-deployment/ingress.yaml
@@ -23,3 +23,13 @@ spec:
                 name: myservice
                 port:
                   number: 80
+    - host: myservice.othercompany.tld
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: myservice
+                port:
+                  number: 80
diff --git a/tests/spring-service/complex-service/values.yaml b/tests/spring-service/complex-service/values.yaml
@@ -17,6 +17,8 @@ resources:
 
 ingress:
   host: "myservice.mycompany.tld"
+  additionalHosts:
+   - "myservice.othercompany.tld"
   overwriteCustomHttpErrors: "502"
   basicAuthSecretParameterName: myservice/auth