Merge pull request #106 from codecademy-engineering/DEVOPS-6644

[DEVOPS-6644] Extend service chart to allow ingress resource to specify a different service name for a path
codecademy-engineering · Sep 18, 2023 · 4c99b55 · 4c99b55
2 parents 088de44 + dcc60c1
commit 4c99b55
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 1 deletion.
diff --git a/charts/service/Chart.yaml b/charts/service/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: service
 description: A generic k8s service chart
 type: application
-version: 1.8.5
+version: 1.8.6
 maintainers:
   - email: [email protected]
     name: devops
diff --git a/charts/service/ci/ingress-with-custom-service-name-values.yaml b/charts/service/ci/ingress-with-custom-service-name-values.yaml
@@ -0,0 +1,17 @@
+image:
+  command:
+    - nginx-debug
+    - '-g'
+    - 'daemon off;'
+
+ingress:
+  enabled: true
+  annotations:
+    kubernetes.io/ingress.class: nginx
+  hosts:
+    - host: example.internal.codecademy.com
+      paths:
+        - path: '/'
+          service: 'this-service'
+        - path: '/other'
+          service: 'other-service'
diff --git a/charts/service/ci/keda-values.yaml b/charts/service/ci/keda-values.yaml
@@ -1,8 +1,10 @@
 resources:
   requests:
     cpu: 5m
+    memory: 5M
   limits:
     cpu: 100m
+    memory: 10M
 
 env:
   - name: FOO

diff --git a/charts/service/templates/ingress-nlb.yaml b/charts/service/templates/ingress-nlb.yaml
@@ -27,6 +27,15 @@ spec:
       http:
         paths:
           {{- range .paths }}
+          {{- if (kindIs "map" .) }}
+          - path: {{ .path }}
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: {{ .service }}
+                port:
+                  name: http
+          {{- else }}
           - path: {{ . }}
             pathType: ImplementationSpecific
             backend:
@@ -35,5 +44,6 @@ spec:
                 port:
                   name: http
           {{- end }}
+          {{- end }}
     {{- end }}
 {{- end }}
diff --git a/charts/service/templates/ingress.yaml b/charts/service/templates/ingress.yaml
@@ -27,6 +27,15 @@ spec:
       http:
         paths:
           {{- range .paths }}
+          {{- if (kindIs "map" .) }}
+          - path: {{ .path }}
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: {{ .service }}
+                port:
+                  name: http
+          {{- else }}
           - path: {{ . }}
             pathType: ImplementationSpecific
             backend:
@@ -35,5 +44,6 @@ spec:
                 port:
                   name: http
           {{- end }}
+          {{- end }}
     {{- end }}
 {{- end }}