Merge pull request #20 from gruntwork-io/yori-fix-ingress

Fix Ingress bugs

Author: yorinasub17

.circleci/config.yml

@@ -1,21 +1,17 @@
 defaults: &defaults
-  machine: true
+  machine:
+    enabled: true
+    image: "ubuntu-1604:201903-01"
   environment:
     GRUNTWORK_INSTALLER_VERSION: v0.0.21
     TERRATEST_LOG_PARSER_VERSION: v0.13.13
     HELM_VERSION: v2.12.2
-    MODULE_CI_VERSION: v0.13.3
+    MODULE_CI_VERSION: v0.13.12
     TERRAFORM_VERSION: NONE
     TERRAGRUNT_VERSION: NONE
     PACKER_VERSION: NONE
     GOLANG_VERSION: 1.11.2
-    K8S_VERSION: v1.10.0  # Same as EKS
     KUBECONFIG: /home/circleci/.kube/config
-    MINIKUBE_VERSION: v0.28.2  # See https://github.com/kubernetes/minikube/issues/2704
-    MINIKUBE_WANTUPDATENOTIFICATION: "false"
-    MINIKUBE_WANTREPORTERRORPROMPT: "false"
-    MINIKUBE_HOME: /home/circleci
-    CHANGE_MINIKUBE_NONE_USER: "true"
 
 
 install_helm_client: &install_helm_client
@@ -28,55 +24,12 @@ install_helm_client: &install_helm_client
     sudo mv linux-amd64/helm /usr/local/bin/
 
 
-deploy_tiller: &deploy_tiller
-  name: deploy tiller
-  command: |
-    # Grant the default service account cluster admin rights so helm works
-    kubectl create clusterrolebinding default-service-account-cluster-admin-binding --clusterrole cluster-admin --serviceaccount kube-system:default
-    # Deploy Tiller
-    helm init --wait
-
-
-# Install and setup minikube
-# https://github.com/kubernetes/minikube#linux-continuous-integration-without-vm-support
-setup_minikube: &setup_minikube
-  name: install kubectl and minikube
-  command: |
-    # install kubectl
-    curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/${K8S_VERSION}/bin/linux/amd64/kubectl
-    chmod +x kubectl
-    sudo mv kubectl /usr/local/bin/
-    mkdir -p ${HOME}/.kube
-    touch ${HOME}/.kube/config
-
-    # Install minikube
-    curl -Lo minikube https://github.com/kubernetes/minikube/releases/download/${MINIKUBE_VERSION}/minikube-linux-amd64
-    chmod +x minikube
-    sudo mv minikube /usr/local/bin/
-
-    # start minikube and wait for it
-    # Ignore warnings on minikube start command, as it will log a warning due to using deprecated localkube
-    # bootstrapper. However, the localkube bootstrapper is necessary to run on CircleCI which doesn't have
-    # systemd.
-    sudo -E minikube start --vm-driver=none --kubernetes-version=${K8S_VERSION} --bootstrapper=localkube --extra-config=apiserver.Authorization.Mode=RBAC
-    # this for loop waits until kubectl can access the api server that Minikube has created
-    $(
-      for i in {1..150}; do # timeout for 5 minutes
-        kubectl get po &> /dev/null
-        if [ $? -ne 1 ]; then
-          break
-        fi
-        sleep 2
-      done
-      true
-    )
-
-
 install_gruntwork_utils: &install_gruntwork_utils
   name: install gruntwork utils
   command: |
     curl -Ls https://raw.githubusercontent.com/gruntwork-io/gruntwork-installer/master/bootstrap-gruntwork-installer.sh | bash /dev/stdin --version "${GRUNTWORK_INSTALLER_VERSION}"
     gruntwork-install --module-name "gruntwork-module-circleci-helpers" --repo "https://github.com/gruntwork-io/module-ci" --tag "${MODULE_CI_VERSION}"
+    gruntwork-install --module-name "kubernetes-circleci-helpers" --repo "https://github.com/gruntwork-io/module-ci" --tag "${MODULE_CI_VERSION}"
     gruntwork-install --binary-name "terratest_log_parser" --repo "https://github.com/gruntwork-io/terratest" --tag "${TERRATEST_LOG_PARSER_VERSION}"
     configure-environment-for-gruntwork-module \
       --circle-ci-2-machine-executor \
@@ -131,13 +84,14 @@ jobs:
           <<: *install_gruntwork_utils
 
       - run:
-          <<: *setup_minikube
+          command: setup-minikube
 
       - run:
           <<: *install_helm_client
 
       - run:
-          <<: *deploy_tiller
+          name: deploy tiller
+          command: helm init --wait
 
       - run:
           name: run tests

charts/k8s-service/templates/ingress.yaml

@@ -10,7 +10,7 @@ We declare some variables defined on the Values. These are reused in `with` and
 {{- $fullName := include "k8s-service.fullname" . -}}
 {{- $ingressPath := .Values.ingress.path -}}
 {{- $servicePort := .Values.ingress.servicePort -}}
-apiVersion: extensions/v1
+apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
@@ -22,7 +22,7 @@ metadata:
     helm.sh/chart: {{ include "k8s-service.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- if .Values.service.annotations }}
+{{- if .Values.ingress.annotations }}
 {{- with .Values.ingress.annotations }}
   annotations:
 {{ toYaml . | indent 4 }}
@@ -36,6 +36,7 @@ spec:
     {{- end }}
   {{- end }}
   rules:
+    {{- if .Values.ingress.hosts }}
     {{- range .Values.ingress.hosts }}
     - host: {{ . | quote }}
       http:
@@ -45,4 +46,13 @@ spec:
               serviceName: {{ $fullName }}
               servicePort: {{ $servicePort }}
     {{- end }}
+    {{- else }}
+    - http:
+        paths:
+          - path: {{ $ingressPath }}
+            backend:
+              serviceName: {{ $fullName }}
+              servicePort: {{ $servicePort }}
+
+    {{- end }}
 {{- end }}

charts/k8s-service/values.yaml

@@ -172,8 +172,8 @@ service:
 #   - tls         (list[map])               : Sets up TLS termination on the ingress rule. Each item is a separate TLS
 #                                             rule that maps to one or more hosts specified in this ingress rule. This
 #                                             is injected directly in to the resource yaml.
-#   - hosts       (list[string]) (required) : Sets up the host routes for the ingress resource. There will be a routing
-#                                             rule for each host defined in this list.
+#   - hosts       (list[string])            : Sets up the host routes for the ingress resource. There will be a routing
+#                                             rule for each host defined in this list. If empty, will match all hosts.
 #   - path        (string)       (required) : The url path to match to route to the Service.
 #   - servicePort (int|string)   (required) : The port (as a number) or the name of the port on the Service to route to.
 #

test/Gopkg.lock

@@ -27,7 +27,7 @@
 
 [[constraint]]
   name = "github.com/gruntwork-io/terratest"
-  version = "0.13.28"
+  version = "0.14.5"
 
 [prune]
   go-tests = true

test/Gopkg.toml

@@ -104,7 +104,7 @@ func verifyServiceAvailable(
 	// Now hit the service endpoint to verify it is accessible
 	// Refresh service object in memory
 	service = *k8s.GetService(t, kubectlOptions, service.Name)
-	serviceEndpoint := k8s.GetServiceEndpoint(t, &service, 80)
+	serviceEndpoint := k8s.GetServiceEndpoint(t, kubectlOptions, &service, 80)
 	http_helper.HttpGetWithRetryWithCustomValidation(
 		t,
 		fmt.Sprintf("http://%s", serviceEndpoint),

test/k8s_service_example_test_helpers.go

@@ -12,17 +12,20 @@ import (
 	"testing"
 
 	"github.com/gruntwork-io/terratest/modules/helm"
+	"github.com/gruntwork-io/terratest/modules/http-helper"
 	"github.com/gruntwork-io/terratest/modules/k8s"
 	"github.com/gruntwork-io/terratest/modules/random"
 	"github.com/stretchr/testify/require"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // Test that:
 //
 // 1. We can deploy the example
 // 2. The deployment succeeds without errors
 // 3. We can open a port forward to one of the Pods and access nginx
-// 4. We can access ngix via the service endpoint
+// 4. We can access nginx via the service endpoint
+// 5. We can access nginx via the ingress endpoint
 func TestK8SServiceNginxExample(t *testing.T) {
 	t.Parallel()
 
@@ -45,16 +48,58 @@ func TestK8SServiceNginxExample(t *testing.T) {
 	options := &helm.Options{
 		KubectlOptions: kubectlOptions,
 		ValuesFiles:    []string{filepath.Join(examplePath, "values.yaml")},
+		SetValues: map[string]string{
+			"ingress.enabled":     "true",
+			"ingress.path":        "/app",
+			"ingress.servicePort": "http",
+			"ingress.annotations.kubernetes\\.io/ingress\\.class":                  "nginx",
+			"ingress.annotations.nginx\\.ingress\\.kubernetes\\.io/rewrite-target": "/",
+		},
 	}
 	defer helm.Delete(t, options, releaseName, true)
 	helm.Install(t, options, helmChartPath, releaseName)
 
 	verifyPodsCreatedSuccessfully(t, kubectlOptions, "nginx", releaseName)
 	verifyAllPodsAvailable(t, kubectlOptions, "nginx", releaseName, nginxValidationFunction)
 	verifyServiceAvailable(t, kubectlOptions, "nginx", releaseName, nginxValidationFunction)
+	verifyIngressAvailable(t, kubectlOptions, "nginx", releaseName, nginxValidationFunction)
 }
 
 // nginxValidationFunction checks that we get a 200 response with the nginx welcome page.
 func nginxValidationFunction(statusCode int, body string) bool {
 	return statusCode == 200 && strings.Contains(body, "Welcome to nginx")
 }
+
+func verifyIngressAvailable(
+	t *testing.T,
+	kubectlOptions *k8s.KubectlOptions,
+	appName string,
+	releaseName string,
+	validationFunction func(int, string) bool,
+) {
+	// Get the service and wait until it is available
+	filters := metav1.ListOptions{
+		LabelSelector: fmt.Sprintf("app.kubernetes.io/name=%s,app.kubernetes.io/instance=%s", appName, releaseName),
+	}
+	ingresses := k8s.ListIngresses(t, kubectlOptions, filters)
+	require.Equal(t, len(ingresses), 1)
+	ingressName := ingresses[0].Name
+	k8s.WaitUntilIngressAvailable(
+		t,
+		kubectlOptions,
+		ingressName,
+		WaitTimerRetries,
+		WaitTimerSleep,
+	)
+
+	// Now hit the service endpoint to verify it is accessible
+	ingress := k8s.GetIngress(t, kubectlOptions, ingressName)
+	ingressEndpoint := ingress.Status.LoadBalancer.Ingress[0].IP
+	http_helper.HttpGetWithRetryWithCustomValidation(
+		t,
+		fmt.Sprintf("http://%s/app", ingressEndpoint),
+		WaitTimerRetries,
+		WaitTimerSleep,
+		validationFunction,
+	)
+}