Merge pull request #160 from chiayu-su/fix/ingress-policy-only-for-https

feat: ssl policy add acm-arn condition
shoplineapp · Aug 9, 2024 · ef659fb · ef659fb
2 parents 3c4a483 + 46977f0
commit ef659fb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/simple/Chart.yaml b/simple/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 description: Helm chart with simple deployment/service template
 name: simple
-version: 0.21.0
+version: 0.21.1
 appVersion: 0.0.1
 tillerVersion: ">=2.14.3"
diff --git a/simple/templates/_ingress_multiple.tpl b/simple/templates/_ingress_multiple.tpl
@@ -14,7 +14,7 @@ metadata:
     {{- end }}
   annotations:
 {{ toYaml $ref.annotations | indent 4 }}
-    {{- if and (not (index $ref.annotations "alb.ingress.kubernetes.io/ssl-policy")) (index $ref.annotations "alb.ingress.kubernetes.io/load-balancer-name") }}
+    {{- if and (not (index $ref.annotations "alb.ingress.kubernetes.io/ssl-policy")) (index $ref.annotations "alb.ingress.kubernetes.io/load-balancer-name") (index $ref.annotations "alb.ingress.kubernetes.io/certificate-arn") }}
     alb.ingress.kubernetes.io/ssl-policy: "ELBSecurityPolicy-TLS13-1-2-2021-06"
     {{- end }}
     {{- if eq (index $ref.annotations "kubernetes.io/ingress.class") "alb" }}

diff --git a/simple/templates/_ingress_single.tpl b/simple/templates/_ingress_single.tpl
@@ -10,7 +10,7 @@ metadata:
     {{- end }}
   annotations:
 {{ toYaml .Values.ingress.annotations | indent 4 }}
-    {{- if and (not (index .Values.ingress.annotations "alb.ingress.kubernetes.io/ssl-policy")) (index .Values.ingress.annotations "alb.ingress.kubernetes.io/load-balancer-name") }}
+    {{- if and (not (index .Values.ingress.annotations "alb.ingress.kubernetes.io/ssl-policy")) (index .Values.ingress.annotations "alb.ingress.kubernetes.io/load-balancer-name") (index .Values.ingress.annotations "alb.ingress.kubernetes.io/certificate-arn") }}
     alb.ingress.kubernetes.io/ssl-policy: "ELBSecurityPolicy-TLS13-1-2-2021-06"
     {{- end }}
     {{- if eq (index .Values.ingress.annotations "kubernetes.io/ingress.class") "alb" }}