Merge pull request #53 from nicholasjackson/dev

Fix webhook deployment

Author: nicholasjackson

deploy/kubernetes/charts/consul-release-controller/templates/controller-cert.yaml

@@ -7,7 +7,7 @@ metadata:
 spec:
   secretName: consul-release-controller-certificate
   dnsNames:
-  - {{ printf "%s.%s.svc" (default (include "consul-release-controller.fullname" .) .Values.webhook.service) .Release.Namespace  | quote }}
+  - {{ printf "%s.%s.svc" (default (include "consul-release-controller.fullname" .) .Values.webhook.service) (default .Release.Namespace .Values.webhook.namespace) | quote }}
   {{- range $dnsName := .Values.webhook.additionalDNSNames }}
   - {{ $dnsName | quote }}
   {{- end }}

deploy/kubernetes/charts/consul-release-controller/templates/webhook.yaml

@@ -15,8 +15,8 @@ webhooks:
     sideEffects: None
     clientConfig:
       service:
-        name: {{ default (include "consul-release-controller.fullname" .) .Values.webhook.serviceOverride }}
-        namespace: {{ default .Release.Namespace .Values.webhook.namespaceOverride | quote }}
+        name: {{ default (include "consul-release-controller.fullname" .) .Values.webhook.service }}
+        namespace: {{ default .Release.Namespace .Values.webhook.namespace | quote }}
         path: /validate-v1-deployment
         port: 19443
     rules:

deploy/kubernetes/charts/consul-release-controller/values.tpl

@@ -143,8 +143,12 @@ webhook:
   enabled: "true"
   type: ClusterIP
   port: 443
-  service: consul-release-controller-webhook
-  namespaceOverride: ""
+
+  # Override the default webhook service name and namespace
+  # This can be used when running the controller locally
+  service: "" 
+  namespace: "" 
+
 
   # Allows adding additional DNS Names to the cert generated
   # for the webhook

deploy/kubernetes/charts/consul-release-controller/values.yaml

@@ -143,8 +143,11 @@ webhook:
   enabled: "true"
   type: ClusterIP
   port: 443
-  service: consul-release-controller-webhook
-  namespaceOverride: ""
+
+  # Override the default webhook service name and namespace
+  # This can be used when running the controller locally
+  service: "" 
+  namespace: "" 
 
   # Allows adding additional DNS Names to the cert generated
   # for the webhook

example/kubernetes/canary/api_release.yaml

@@ -24,6 +24,33 @@ spec:
       trafficStep: 20
       maxTraffic: 100
       errorThreshold: 5
+      
+      # Post Deployment Test executes after a deployment has been marked healthy
+      # and before the initial traffic is sent to the deployment and monitoring started.
+      # It is a way of actively health checking the deployment before exposing it to production
+      # traffic.
+      #
+      # Once a deployment has been marked healthy, Consul Release Controller will
+      # execute requests against the candidate deployment and monitor the results
+      # using the defined monitoring queries.
+      #
+      # If the deployment fails to pass the monitoring queries, the deployment will
+      # be rolled back and the release will be marked as failed.
+      #postDeploymentTest:
+      #  # The path of the API 
+      #  url: /myapi
+      #  # The HTTP method of the request
+      #  method: POST
+      #  # The payload to send with the request
+      #  payload: |
+      #    {
+      #      "something": "something"
+      #    }
+      #  # The number of itterations to run the test
+      #  itterations: 3
+      #  # The number of seconds to wait between itterations
+      #  delay: "1s"
+
   monitor:
     pluginName: "prometheus"
     config:

shipyard/kubernetes/controller.hcl

@@ -14,10 +14,8 @@ acls:
   enabled: #{{ .Vars.acls_enabled }}
 #{{- if eq .Vars.controller_enabled false }}
 webhook:
-  additionalDNSNames:
-    - controller-webhook.shipyard.svc
-  serviceOverride: controller-webhook
-  namespaceOverride: shipyard
+  service: controller-webhook
+  namespace: shipyard
 #{{ end }}
 EOF
 
@@ -32,40 +30,6 @@ EOF
   }
 }
 
-//template "controller_service" {
-//  disabled = !var.helm_chart_install
-//
-//  source = <<EOF
-//---
-//apiVersion: v1
-//kind: Service
-//metadata:
-//  name: external-webhook
-//  namespace: consul
-//spec:
-//  type: ExternalName
-//  externalName: controller-webhook.shipyard.svc
-//  EOF
-//
-//  destination = "${data("kube_setup")}/service.yaml"
-//}
-//
-//k8s_config "controller_service" {
-//  disabled = !var.helm_chart_install
-//
-//  depends_on = [
-//    "module.consul",
-//  ]
-//
-//  cluster = "k8s_cluster.dc1"
-//
-//  paths = [
-//    "${data("kube_setup")}/service.yaml"
-//  ]
-//
-//  wait_until_ready = true
-//}
-
 helm "consul-release-controller" {
   disabled = !var.helm_chart_install