Commit 5feee521 authored by Mikhail Shevtsov's avatar Mikhail Shevtsov Committed by Shinya Maeda
Browse files

Added ingress.tls.acme value 

Allow specifiying value for  annotation.
parent d190c626

assets/auto-deploy-app/README.md

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
| service.internalPort          |             | `5000`                             |

| ingress.enabled               | If true, enables ingress | `true`                |

| ingress.tls.enabled           | If true, enables SSL | `true`                    |

| ingress.tls.acme              | Controls `kubernetes.io/tls-acme` annotation | `true` |

| ingress.tls.secretName        | Name of the secret used to terminate SSL traffic | `""` |

| ingress.modSecurity.enabled | Enable custom configuration for modsecurity, defaulting to [the Core Rule Set](https://coreruleset.org) | `false` |

| ingress.modSecurity.secRuleEngine | Configuration for [ModSecurity's rule engine](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual-(v2.x)#SecRuleEngine) | `DetectionOnly` |

assets/auto-deploy-app/templates/ingress.yaml

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ metadata: 
{{ toYaml .Values.ingress.annotations | indent 4 }}

{{- end }}

{{- if .Values.ingress.tls.enabled }}

    kubernetes.io/tls-acme: "true"

    kubernetes.io/tls-acme: {{ .Values.ingress.tls.acme | quote }}

{{- end }}

{{- if eq .Values.application.track "canary" }}

    nginx.ingress.kubernetes.io/canary: "true"

assets/auto-deploy-app/test/template_test.go

+11 −0
Original line number Diff line number Diff line
@@ -158,6 +158,17 @@ func TestIngressTemplate_TLS(t *testing.T) { 
				},

			},

		},

		{

			name:                "with tls-acme disabled",

			values:              map[string]string{"ingress.tls.acme": "false"},

			expectedAnnotations: map[string]string{"kubernetes.io/ingress.class": "nginx", "kubernetes.io/tls-acme": "false"},

			expectedIngressTLS: []extensions.IngressTLS{

				extensions.IngressTLS{

					Hosts:      []string{"my.host.com"},

					SecretName: releaseName + "-auto-deploy-tls",

				},

			},

		},

		{

			name:                "with tls disabled",

			values:              map[string]string{"ingress.tls.enabled": "false"},

assets/auto-deploy-app/values.yaml

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ ingress: 
  enabled: true

  tls:

    enabled: true

    acme: true

    secretName: ""

  annotations:

    kubernetes.io/ingress.class: "nginx"