Commit 19d4947f authored by Shinya Maeda's avatar Shinya Maeda
Browse files

Merge branch 'master' into 'master' 

feat: Added ingress.tls.acme value

See merge request gitlab-org/cluster-integration/auto-deploy-image!162
parents 8cb7eaa6 5feee521

assets/auto-deploy-app/README.md

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
| ingress.enabled               | If true, enables ingress | `true`                |

| ingress.path                  | Default path for the ingress | `/` |

| 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.tls.useDefaultSecret  | If set to `true`, the `secretName` is not used, which makes Ingress fall back to the default secret (certificate). This requires [configuration of the default secret](https://kubernetes.github.io/ingress-nginx/user-guide/tls/#default-ssl-certificate). | `false` |

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

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
@@ -43,6 +43,7 @@ ingress: 
  path: "/"

  tls:

    enabled: true

    acme: true

    secretName: ""

    useDefaultSecret: false

  annotations: