Merge pull request #107 from codecademy-engineering/DEVOPS-6728

[DEVOPS-6728] Deprecate secondary ingress resource
codecademy-engineering · Sep 25, 2023 · b26b236 · b26b236
2 parents 4c99b55 + 19d8000
commit b26b236
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 58 deletions.
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.6
+version: 1.8.7
 maintainers:
   - email: [email protected]
     name: devops
diff --git a/charts/service/templates/ingress-nlb.yaml b/charts/service/templates/ingress-nlb.yaml
diff --git a/charts/service/templates/ingress.yaml b/charts/service/templates/ingress.yaml
@@ -3,10 +3,10 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ $fullName }}
+  name: {{ $fullName }}-nlb
   labels:
     {{- include "service.labels" . | nindent 4 }}
-  {{- with .Values.ingress.annotations }}
+  {{- with merge .Values.ingress.nlbIngressClassAnnotation .Values.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}

diff --git a/charts/service/values.yaml b/charts/service/values.yaml
@@ -82,17 +82,12 @@ service:
 ingress:
   enabled: false
   annotations: {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
+    # kubernetes.io/ingress.class: nginx-nlb
   nlbIngressClassAnnotation:
     kubernetes.io/ingress.class: nginx-nlb
   hosts:
     - host: chart-example.local
       paths: []
-  tls: []
-  #  - secretName: chart-example-tls
-  #    hosts:
-  #      - chart-example.local
 
 serviceAccount:
   # Specifies whether a service account should be created