Merge pull request #33 from gruntwork-io/gke_gmc_name_fix

Make cert name configurable

Author: yorinasub17

charts/k8s-service/templates/gmc.yaml

@@ -7,12 +7,12 @@ that will provision a Google managed SSL certificate.
 We declare some variables defined on the Values. These are reused in `with` and `range` blocks where the scoped variable
 (`.`) is rebound within the block.
 */ -}}
-{{- $fullName := include "k8s-service.fullname" . -}}
 {{- $domainName := .Values.google.managedCertificate.domainName -}}
+{{- $certificateName := .Values.google.managedCertificate.name -}}
 apiVersion: networking.gke.io/v1beta1
 kind: ManagedCertificate
 metadata:
-  name: {{ $fullName }}
+  name: {{ $certificateName }}
   labels:
     gruntwork.io/app-name: {{ .Values.applicationName }}
     # These labels are required by helm. You can read more about required labels in the chart best practices guide:

charts/k8s-service/values.yaml

@@ -355,14 +355,17 @@ google:
   # The expected keys are:
   #   - enabled      (bool)   (required) : Whether or not the ManagedCertificate resource should be created.
   #   - domainName   (string)            : Specifies the domain that the SSL certificate will be created for
+  #   - name         (string)            : Specifies the name of the SSL certificate that you reference in Ingress with
+  #                                        networking.gke.io/managed-certificates: name
   #
-  # The following example specifies a ManagedCertificate with a domain name 'api.acme.com':
+  # The following example specifies a ManagedCertificate with a domain name 'api.acme.com' and name 'acme-cert':
   #
   # EXAMPLE:
   #
   # google:
   #   managedCertificate:
   #     enabled: true
+  #     name: acme-cert
   #     domainName: api.acme.com
   #
   # NOTE: if you enable managedCertificate, then Ingress must also be enabled.

test/k8s_service_template_test.go

@@ -438,20 +438,23 @@ func TestK8SServiceIngressAdditionalPathsHigherPriorityNoServiceName(t *testing.
 }
 
 // Test rendering Managed Certificate
-func TestK8SServiceManagedCertDomainName(t *testing.T) {
+func TestK8SServiceManagedCertDomainNameAndName(t *testing.T) {
 	t.Parallel()
 
 	cert := renderK8SServiceManagedCertificateWithSetValues(
 		t,
 		map[string]string{
 			"google.managedCertificate.enabled":    "true",
 			"google.managedCertificate.domainName": "api.acme.io",
+			"google.managedCertificate.name":       "acme-cert",
 		},
 	)
 
 	domains := cert.Spec.Domains
+	certName := cert.ObjectMeta.Name
 	assert.Equal(t, len(domains), 1)
 	assert.Equal(t, domains[0], "api.acme.io")
+	assert.Equal(t, certName, "acme-cert")
 }
 
 // Test that setting ingress.enabled = false will cause the helm template to not render the ManagedCertificate resource