Merge lp:~ricardokirkner/isitdeployable/improve-makefile-config-templates into lp:isitdeployable

[Ricardo Kirkner]

better config rendering from templates

- simplified rendering of templates
- deleted no longer necessary files (crt/key)
- separate environment variables definition from makefile
- automatically create namespace before deploying dev services

[lp:~ricardokirkner/isitdeployable/improve-makefile-config-templates]

273. By Ricardo Kirkner on 2017-10-19

update configmaps template

[Colin Watson (cjwatson)]

I don't know the underlying system particularly well, but mostly looks OK. Just some comments on the make/shell interface.

review: Approve

[lp:~ricardokirkner/isitdeployable/improve-makefile-config-templates]

274. By Ricardo Kirkner on 2017-10-19

apply quoting to exported env vars

275. By Ricardo Kirkner on 2017-10-19

make envrc the default target

=== modified file 'Makefile.k8s'
--- Makefile.k8s	2017-09-12 18:18:08 +0000
+++ Makefile.k8s	2017-10-19 17:13:30 +0000
@@ -1,22 +1,17 @@
 KUBECONFIG ?= $(HOME)/.kube/config
 KUBECTL = kubectl --kubeconfig=$(KUBECONFIG) --insecure-skip-tls-verify=true
+REGISTRY_CONFIG = deployment/registry.yaml
 
-DOCKER_REGISTRY ?= localhost:5000
-REGISTRY_CONFIG = deployment/registry.yml
 IMAGE_NAME ?= isitdeployable
 IMAGE_TAG ?= $(shell bzr version-info --custom --template={branch_nick}-{revno})
-NAMESPACE ?= isitdeployable
-DB_EXTERNAL_NAME ?= db.default.svc.cluster.local
-AMQP_EXTERNAL_NAME ?= amqp.default.svc.cluster.local
-
-DOMAIN ?= dpa.k8s
-TLS_CRT ?= $(shell cat deployment/$(DOMAIN).crt | base64 -w0)
-TLS_KEY ?= $(shell cat deployment/$(DOMAIN).key | base64 -w0)
 
 HTTP_PROXY ?= $(http_proxy)
 HTTPS_PROXY ?= $(https_proxy)
 NO_PROXY ?= $(no_proxy)
 
+# automatically source environment variables
+include envrc.mk
+
 # public targets
 
 k8s-bootstrap: $(ENV) fetch-sourcedeps  ## Bootstrap k8s environment
@@ -30,6 +25,7 @@
 	$(KUBECTL) --namespace kube-system port-forward $(REGISTRY_POD) 5000:5000
 
 k8s-build: fetch-sourcedeps  ## Build container image
+	@$(check-env-vars)
 	@echo 'Building image on:' $(shell lsb_release -cs)
 	@echo 'Building image using docker version:' $(shell docker version -f "Server: {{.Server.Version}} Client: {{.Client.Version}}")
 	$(eval BUILD_ARGS = --label revision="$(shell bzr revno)")
@@ -45,10 +41,14 @@
 	docker build $(BUILD_ARGS) -t $(IMAGE_NAME):$(IMAGE_TAG) .
 
 k8s-upload:  ## Upload image to registry
+	@$(check-env-vars)
 	docker tag $(IMAGE_NAME):$(IMAGE_TAG) $(DOCKER_REGISTRY)/$(IMAGE_NAME):$(IMAGE_TAG) 
 	docker push $(DOCKER_REGISTRY)/$(IMAGE_NAME):$(IMAGE_TAG)
 
-k8s-render-templates: $(shell find deployment -name *.yml.j2 -printf 'tmp/%f\n' | sed -e 's/.j2//g')
+k8s-render-config: $(shell find deployment -name '*.yaml.tpl' -printf 'tmp/%f\n' | sed -e 's/.tpl//g')
+
+k8s-clean-config:
+	rm -f tmp/*.yaml
 
 k8s-deploy-all:  ## Deploy isitdeployable full stack (PRODUCTION)
 	$(MAKE) k8s-deploy-namespace
@@ -58,50 +58,79 @@
 	$(MAKE) k8s-deploy-app
 	$(MAKE) k8s-deploy-firewall
 
-k8s-deploy-namespace: k8s-render-templates  ## Deploy namespace for isitdeployable (PRODUCTION)
-	$(KUBECTL) create -f tmp/namespace.yml || true
+k8s-deploy-namespace: k8s-render-config  ## Deploy namespace for isitdeployable (PRODUCTION)
+	$(KUBECTL) create -f tmp/namespace.yaml || true
 
-k8s-deploy-config: k8s-render-templates  ## Deploy configuration for isitdeployable (PRODUCTION)
-	$(KUBECTL) create -f tmp/configmaps.yml || true
+k8s-deploy-config: k8s-render-config  ## Deploy configuration for isitdeployable (PRODUCTION)
+	$(KUBECTL) create -f tmp/configmaps.yaml || true
 
 k8s-deploy-registry-secret: k8s-deploy-namespace  ## Deploy secret for registry access into isitdeployable namespace (PRODUCTION)
+	@$(check-env-vars)
 	$(KUBECTL) get secret registry-access -o yaml | sed 's/default/$(NAMESPACE)/g' | kubectl -n $(NAMESPACE) create -f - || true
 
-k8s-deploy-services: k8s-render-templates  ## Deploy isitdeployable supporting services (PRODUCTION)
-	$(KUBECTL) create -f tmp/services.yml || true
+k8s-deploy-services: k8s-render-config  ## Deploy isitdeployable supporting services (PRODUCTION)
+	$(KUBECTL) create -f tmp/services.yaml || true
 
-k8s-deploy-app: k8s-render-templates  ## Deploy isitdeployable app
-	$(KUBECTL) create --record -f tmp/secrets.yml -f tmp/deployments.yml || true
+k8s-deploy-app: k8s-render-config  ## Deploy isitdeployable app
+	@$(check-env-vars)
+	$(KUBECTL) create --record -f tmp/secrets.yaml -f tmp/deployments.yaml || true
 	$(KUBECTL) --namespace $(NAMESPACE) rollout status deployment/app
 
-k8s-deploy-firewall: k8s-render-templates  ## Deploy ingress rules
-	$(KUBECTL) create -f tmp/ingress.yml || true
+k8s-deploy-firewall: k8s-render-config  ## Deploy ingress rules
+	$(KUBECTL) create -f tmp/ingress.yaml || true
 
 k8s-update-app:  ## Update isitdeployable app
+	@$(check-env-vars)
 	$(KUBECTL) --namespace $(NAMESPACE) set image deployment/app app=$(DOCKER_REGISTRY)/$(IMAGE_NAME):$(IMAGE_TAG) worker=$(DOCKER_REGISTRY)/$(IMAGE_NAME):$(IMAGE_TAG) 
 	$(KUBECTL) --namespace $(NAMESPACE) rollout status deployment/app
 
-k8s-deploy-all-dev: k8s-render-templates  ## Deploy isitdeployable full stack for development
+k8s-deploy-all-dev: k8s-render-config  ## Deploy isitdeployable full stack for development
+	$(MAKE) k8s-deploy-namespace
 	$(MAKE) k8s-deploy-services-dev
 	$(MAKE) k8s-deploy-all
 
-k8s-deploy-services-dev: k8s-render-templates  ## Deploy isitdeployable supporting services for development
-	$(KUBECTL) create -f deployment/services-dev.yml || true
-	$(KUBECTL) rollout status deployment/db
-	$(KUBECTL) rollout status deployment/amqp
+k8s-deploy-services-dev: k8s-render-config  ## Deploy isitdeployable supporting services for development
+	@$(check-env-vars)
+	$(KUBECTL) create -f tmp/services-dev.yaml || true
+	$(KUBECTL) --namespace $(NAMESPACE) rollout status deployment/db
+	$(KUBECTL) --namespace $(NAMESPACE) rollout status deployment/amqp
 
 # helper targets
 
-tmp/%.yml: deployment/%.yml.j2
-	$(MAKE) generate-config K8S_CONFIG=$@ K8S_CONFIG_TEMPLATE=$<
-
-generate-config:
-	IMAGE_NAME="$(IMAGE_NAME)" IMAGE_TAG="$(IMAGE_TAG)" \
-	DOCKER_REGISTRY="$(DOCKER_REGISTRY)" \
-	BUILD_REVISION="$(shell docker inspect -f '{{ .Config.Labels.revision }}' $(DOCKER_REGISTRY):$(IMAGE_NAME):$(IMAGE_TAG))" \
-	NAMESPACE=$(NAMESPACE) \
-	DB_EXTERNAL_NAME=$(DB_EXTERNAL_NAME) \
-	AMQP_EXTERNAL_NAME=$(AMQP_EXTERNAL_NAME) \
-	DOMAIN="$(DOMAIN)" TLS_CRT="$(TLS_CRT)" TLS_KEY="$(TLS_KEY)" \
-	LP_BOT="$(shell bzr lp-login)" \
-	python scripts/generate-config $(K8S_CONFIG_TEMPLATE) > $(K8S_CONFIG)
+tmp/%.yaml: deployment/%.yaml.tpl
+	$(MAKE) render-template SRC=$< DST=$@
+
+render-template:
+	@$(check-env-vars)
+	@$(eval REVISION=$(shell docker inspect -f '{{.Config.Labels.revision}}' $(DOCKER_REGISTRY)/$(IMAGE_NAME):$(IMAGE_TAG)))
+	@REVISION=$(REVISION) IMAGE_NAME=$(IMAGE_NAME) IMAGE_TAG=$(IMAGE_TAG) envsubst < $(SRC) > $(DST)
+
+# defines
+
+define check-env-vars
+	if test -z "$(NAMESPACE)"; then \
+		echo "NAMESPACE variable not defined; aborting."; \
+		exit 1; \
+	elif test -z "$(DOMAIN)"; then \
+		echo "DOMAIN variable not defined; aborting."; \
+		exit 1; \
+	elif test -z "$(DB_EXTERNAL_NAME)"; then \
+		echo "DB_EXTERNAL_NAME variable not defined; aborting."; \
+		exit 1; \
+	elif test -z "$(AMQP_EXTERNAL_NAME)"; then \
+		echo "AMQP_EXTERNAL_NAME variable not defined; aborting."; \
+		exit 1; \
+	elif test -z "$(DOCKER_REGISTRY)"; then \
+		echo "DOCKER_REGISTRY variable not defined; aborting."; \
+		exit 1; \
+	elif test -z "$(IMAGE_NAME)"; then \
+		echo "IMAGE_NAME variable not defined; aborting."; \
+		exit 1; \
+	elif test -z "$(IMAGE_TAG)"; then \
+		echo "IMAGE_TAG variable not defined; aborting."; \
+		exit 1; \
+	elif test -z "$(LP_BOT)"; then \
+		echo "LP_BOT variable not defined; aborting."; \
+		exit 1; \
+	fi
+endef

=== modified file 'README.k8s'
--- README.k8s	2017-08-31 15:05:26 +0000
+++ README.k8s	2017-10-19 17:13:30 +0000
@@ -77,7 +77,7 @@
 
     $ make k8s-deploy-all-dev
     [...]
-    kubectl --kubeconfig=/home/ricardo/.kube/config --insecure-skip-tls-verify=true create -f deployment/services-dev.yml
+    kubectl --kubeconfig=/home/ricardo/.kube/config --insecure-skip-tls-verify=true create -f deployment/services-dev.yaml
     deployment "amqp" created
     service "amqp" created
     persistentvolumeclaim "db-data" created
@@ -90,13 +90,13 @@
     kubectl --kubeconfig=/home/ricardo/.kube/config --insecure-skip-tls-verify=true rollout status deployment/amqp
     deployment "amqp" successfully rolled out
     [...]
-    kubectl --kubeconfig=/home/ricardo/.kube/config --insecure-skip-tls-verify=true create -f /tmp/configmaps.yml
+    kubectl --kubeconfig=/home/ricardo/.kube/config --insecure-skip-tls-verify=true create -f /tmp/configmaps.yaml
     configmap "app" created
     [...]
-kubectl --kubeconfig=/home/ricardo/.kube/config --insecure-skip-tls-verify=true create -f deployment/services.yml
+kubectl --kubeconfig=/home/ricardo/.kube/config --insecure-skip-tls-verify=true create -f deployment/services.yaml
     service "app" created
     [...]
-    kubectl --kubeconfig=/home/ricardo/.kube/config --insecure-skip-tls-verify=true create --record -f secrets.yml -f /tmp/deployments.yml
+    kubectl --kubeconfig=/home/ricardo/.kube/config --insecure-skip-tls-verify=true create --record -f secrets.yaml -f /tmp/deployments.yaml
     secret "app" created
     deployment "app" created
     kubectl --kubeconfig=/home/ricardo/.kube/config --insecure-skip-tls-verify=true rollout status deployment/app
@@ -104,7 +104,7 @@
     Waiting for rollout to finish: 1 of 2 updated replicas are available...
     deployment "app" successfully rolled out
     [...]
-    kubectl --kubeconfig=/home/ricardo/.kube/config --insecure-skip-tls-verify=true create -f /tmp/ingress.yml
+    kubectl --kubeconfig=/home/ricardo/.kube/config --insecure-skip-tls-verify=true create -f /tmp/ingress.yaml
     ingress "app" created
     secret "dpa.k8s" created
     [...]
@@ -140,9 +140,9 @@
 -------
 
 The files used by kubectl to trigger deployments are generated from the templates in the `deployment` directory.
-See the Makefile targets handling these .yml files.
+See the Makefile targets handling these .yaml files.
 
-Two important parts of these .yml files are at the bottom: the ingress object and the secret object.
+Two important parts of these .yaml files are at the bottom: the ingress object and the secret object.
 The secret object contains a .crt and a .key file both currently self-signed and base64'ed.
 They relate to a ingress rule that says which DNS record (which domain) will use them.
 By default this is dpa.k8s.

=== renamed file 'deployment/configmaps.yml.j2' => 'deployment/configmaps.yaml.tpl'
--- deployment/configmaps.yml.j2	2017-09-08 12:44:47 +0000
+++ deployment/configmaps.yaml.tpl	2017-10-19 17:13:30 +0000
@@ -2,13 +2,13 @@
 kind: ConfigMap
 metadata:
   name: app
-  namespace: {{ NAMESPACE }}
+  namespace: ${NAMESPACE}
 data:
   ADMINAUDIT_EMAILS_RECIPIENTS: "[]"
-  ALLOWED_HOSTS: '["{{ DOMAIN }}", "dpa-app"]'
+  ALLOWED_HOSTS: "['${DOMAIN}', 'dpa-app']"
   BRANCH_CACHE_DIR: "tmp/branches"
   GIT_SSH_DEFAULT_PORT: "9422"
-  GIT_SSH_DEFAULT_USERNAME: ""
+  GIT_SSH_DEFAULT_USERNAME: "${LP_BOT}"
   METRICS_PREFIX: ""
   METRICS_TARGET: ""
   OOPS_REPORTER: "DEFAULT"

=== renamed file 'deployment/deployments.yml.j2' => 'deployment/deployments.yaml.tpl'
--- deployment/deployments.yml.j2	2017-10-18 20:19:33 +0000
+++ deployment/deployments.yaml.tpl	2017-10-19 17:13:30 +0000
@@ -3,28 +3,27 @@
 metadata:
   labels:
     app: app
-    revision: {{ BUILD_REVISION }}
+    revision: "${REVISION}"
   name: app
-  namespace: {{ NAMESPACE }}
+  namespace: ${NAMESPACE}
 spec:
   replicas: 2
   revisionHistoryLimit: 2
   strategy:
     type: RollingUpdate
     rollingUpdate:
-      maxSurge: 0
-      maxUnavailable: 1
+      maxSurge: 1
+      maxUnavailable: 0
   minReadySeconds: 5
   selector:
     matchLabels:
       app: app
-      revision: {{ BUILD_REVISION }}
   template:
     metadata:
-      namespace: {{ NAMESPACE }}
+      namespace: ${NAMESPACE}
       labels:
         app: app
-        revision: {{ BUILD_REVISION }}
+        revision: "${REVISION}"
     spec:
       imagePullSecrets:
       - name: registry-access
@@ -41,12 +40,8 @@
             mode: 0644
       initContainers:
       - name: migrate-db
-        image: {{ DOCKER_REGISTRY }}/{{ IMAGE_NAME }}:{{ IMAGE_TAG }}
+        image: ${DOCKER_REGISTRY}/${IMAGE_NAME}:${IMAGE_TAG}
         imagePullPolicy: Always
-        volumeMounts:
-          - name: ssh-config
-            readOnly: true
-            mountPath: /home/ubuntu/.ssh
         env:
           # config
           - name: DJANGO_SETTINGS_MODULE
@@ -70,14 +65,18 @@
         command: ["make", "app-update-db"]
       containers:
       - name: app
-        image: {{ DOCKER_REGISTRY }}/{{ IMAGE_NAME }}:{{ IMAGE_TAG }}
+        image: ${DOCKER_REGISTRY}/${IMAGE_NAME}:${IMAGE_TAG}
         imagePullPolicy: Always
         readinessProbe:
           httpGet:
             port: 8000
             path: /_status/ping
+            httpHeaders:
+              - name: Host
+                value: ${DOMAIN}
           initialDelaySeconds: 5
-          periodSeconds: 1
+          periodSeconds: 10
+          timeoutSeconds: 5
         ports:
           - containerPort: 8000
             protocol: TCP
@@ -166,7 +165,7 @@
                 name: app
                 key: SECRET_KEY
       - name: worker
-        image: {{ DOCKER_REGISTRY }}/{{ IMAGE_NAME }}:{{ IMAGE_TAG }}
+        image: ${DOCKER_REGISTRY}/${IMAGE_NAME}:${IMAGE_TAG}
         imagePullPolicy: Always
         volumeMounts:
           - name: ssh-config
@@ -259,7 +258,7 @@
               command: ["/bin/sh", "-c", "mkdir -p ~/.ssh && \
                                           ln -sf ~/.secrets/ssh-config/id_rsa ~/.ssh/id_rsa && \
                                           ln -sf ~/.secrets/ssh-config/id_rsa.pub ~/.ssh/id_rsa.pub && \
-                                          /usr/src/app/scripts/setup-bzr {{ LP_BOT }}"]
+                                          /usr/src/app/scripts/setup-bzr ${LP_BOT}"]
       securityContext:
         runAsNonRoot: true
         runAsUser: 1000

=== removed file 'deployment/dpa.k8s.crt'
--- deployment/dpa.k8s.crt	2017-07-31 17:22:13 +0000
+++ deployment/dpa.k8s.crt	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC9zCCAd+gAwIBAgIJAIrLU+VQJq3pMA0GCSqGSIb3DQEBCwUAMBIxEDAOBgNV
-BAMMB2RwYS5rOHMwHhcNMTcwNzMxMTIwMTIwWhcNMTgwNzMxMTIwMTIwWjASMRAw
-DgYDVQQDDAdkcGEuazhzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-mL0iObnJePe4XF9Dyl/X0boLtcWDGzf5ol6mKjWYe4RTlmUvPcwPBF4U/rMe/o4c
-fKDZMUrR0ZqYDuZfjD0fL/cJ/6Z11L3Bbt2kDHg/+Mk5Ez72YRrFSylEopPBAN1E
-89fSDhfWedgg7RmaV/9AaCD34mK3BMS1yvlX5utLY+sTOUMZhINzuNt1fKgQiVmF
-Sv20lHvNh8aRUn2YVvDYsG9hLYBRT6oemxKTGoecnhAUpu2FjMLgrftDYwLl1jc8
-w5JBQpyFxvT1NjEIF/3nTgrb/qaXmY2//fdYdZ82ERFwZsQCKK/voJZIf1NAmGge
-bwle8oe47nfJKlfMXjl/GQIDAQABo1AwTjAdBgNVHQ4EFgQUAfgwyLQvF5ZaRW3m
-rNGwA4gmpukwHwYDVR0jBBgwFoAUAfgwyLQvF5ZaRW3mrNGwA4gmpukwDAYDVR0T
-BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAV0lbypxz90lYQuGSQwLj9KvgBPoi
-GOoxG2yAd7s0MQ8wLBYUcrUX/e/ol6yIJI1kRqBNhjx2DWXZtc1PD8SNJenjRdwS
-rOLZyDFX96QKp74S81OIHDD+iFSKhIyNTlj/d7Lb+VT0JFjuLIWemVSO9vctovtx
-z3p3c60j+KfOjhy6OMGNJCojJIkkih5cA3PCAeuxHBxaH7wBIxZk18UJaNmpnQgx
-dwCwKqrCbuIEjvOf6HhNXpLtZZDoXg5qvzXGyxxvvPIuw1kHTbzvAWX03Luphoc+
-RCaiZVQC5xAVBWvzM636QIfR3NLA/asDxuDyrf++AeJm4aRI2pUXaO0owQ==
------END CERTIFICATE-----

=== removed file 'deployment/dpa.k8s.key'
--- deployment/dpa.k8s.key	2017-07-31 17:22:13 +0000
+++ deployment/dpa.k8s.key	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCYvSI5ucl497hc
-X0PKX9fRugu1xYMbN/miXqYqNZh7hFOWZS89zA8EXhT+sx7+jhx8oNkxStHRmpgO
-5l+MPR8v9wn/pnXUvcFu3aQMeD/4yTkTPvZhGsVLKUSik8EA3UTz19IOF9Z52CDt
-GZpX/0BoIPfiYrcExLXK+Vfm60tj6xM5QxmEg3O423V8qBCJWYVK/bSUe82HxpFS
-fZhW8Niwb2EtgFFPqh6bEpMah5yeEBSm7YWMwuCt+0NjAuXWNzzDkkFCnIXG9PU2
-MQgX/edOCtv+ppeZjb/991h1nzYREXBmxAIor++glkh/U0CYaB5vCV7yh7jud8kq
-V8xeOX8ZAgMBAAECggEAUORSPQpVVrizrlBR4dtyvMNwsjtB3Wd+0WyZSl+KO1hw
-wIUkSPFKvsBpFB+feaegFK1HeiCrEPx0Lef6kJZKbyfB5uCtJRe+W04NNQF2t/cy
-QCwnZnQ8KztW+1ePbzrA6vfRat9bGrrJbWkS4inwXXWgcwhe76qSsUXvNQBGtEqZ
-LdYy1UP3Q7jZGSIp2rzm5XCaovKzbD+eAMh5cOBYHMB9erzWHJwBJpr5pvVxora3
-t0ZA4vWjjNFlM13vqnnymqpaebKVOSVrPXzW3xLmPVFVP0sp3UZTNcI6nalGNbT3
-yw4V54blZjFqG7eQok9gGO2YDbL8K4FcPiEYbRuGgQKBgQDJYuZP7VwwH+dD9y19
-zic5DbKwFx9xtHZnx7kuKyKq7C5Xx461ZgSscvZhmraDXSSnNG73gZIv+tb9hIzR
-V1y3aej2zVPdn2E8uJ5f0RFZAK4iIcJLKJrUX55Nz9zhnEw1QJjEVW2+ThdBZ1Ix
-9aPUs9PvoIj/KCM51I7wzYGbkQKBgQDCKOoz00YAbhuvDAmX+7/lvtWkO+KQAhxv
-bi0FdkOEdXS7C6Ju2CwvcJbc0gZNSY+t3amEP1Eu87r022ggCu03rFW1nFCq12CX
-EKCOxdhft1w4ZsxCpKaI9jezedpYiPTHJTYCm/y6z3C9KsUke7hflyEo0I9oFhQv
-/KuFUiEXCQKBgQDH2ZKvbOEYjQCHLSuC9mtsLhDOuROmVi1OziASFhKARoOy7sHL
-eKNYs3mX4N4QvQVbvSgGDRqS7L4ftkO8l5LWHY9oJNl+TOVFSf05HxO1HHyyOIhE
-59XGveEuXQJZDi9+hU1VQWX3/i0L5cnm9FsSASdoXQq3FBDpGeyEQZzGUQKBgDe8
-QQbhhj3HXeERBov/c6XC81cy7aXDRWBjcz8XJOiYQwsSmu1Q1tZDbrsy+yYikMEr
-WWciOe7NfoSdmzVfjZsmuG/q0GlKbGrRFhYGC0fmve1e7RHQbBHzBChcOWai4gls
-0CVNm+4QcF+NMIx5i4K9QoKR5CjP9bmUwbQC0IbpAoGAZXKTFey67ODrfgXfst4s
-w/ZB/LD9n+5ycwAvgP6RwH0sWsObpN3GI5V4ibDTxX16lXf+BHbf+qFxAZ8Ec/M5
-EFY5HkOEBICV7EBzJFBalFVRbb1/esNCQzMxcUlmsTJW0+9i3yT64gpK6mBam/LW
-VYrB6/uyKXre1BShf3xC6AA=
------END PRIVATE KEY-----

=== renamed file 'deployment/ingress.yml.j2' => 'deployment/ingress.yaml.tpl'
--- deployment/ingress.yml.j2	2017-08-31 12:09:44 +0000
+++ deployment/ingress.yaml.tpl	2017-10-19 17:13:30 +0000
@@ -2,12 +2,12 @@
 kind: Ingress
 metadata:
   name: app
-  namespace: {{ NAMESPACE }}
+  namespace: ${NAMESPACE}
   annotations:
     ingress.kubernetes.io/rewrite-target: /
 spec:
   rules:
-  - host: {{ DOMAIN }}
+  - host: ${DOMAIN}
     http:
       paths:
       - path: /

=== renamed file 'deployment/namespace.yml.j2' => 'deployment/namespace.yaml.tpl'
--- deployment/namespace.yml.j2	2017-08-14 12:29:47 +0000
+++ deployment/namespace.yaml.tpl	2017-10-19 17:13:30 +0000
@@ -1,6 +1,6 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: {{ NAMESPACE }}
+  name: ${NAMESPACE}
   labels:
-    name: {{ NAMESPACE }}
+    name: ${NAMESPACE}

=== renamed file 'deployment/registry.yml' => 'deployment/registry.yaml'
=== renamed file 'deployment/secrets.yml.j2' => 'deployment/secrets.yaml.tpl'
--- deployment/secrets.yml.j2	2017-08-31 15:05:26 +0000
+++ deployment/secrets.yaml.tpl	2017-10-19 17:13:30 +0000
@@ -2,7 +2,7 @@
 kind: Secret
 metadata:
   name: app
-  namespace: {{ NAMESPACE }}
+  namespace: ${NAMESPACE}
 type: Opaque
 data:
   CELERY_BROKER_URL: YW1xcDovL2FtcXA=
@@ -15,7 +15,7 @@
 kind: Secret
 metadata:
   name: ssh-config
-  namespace: {{ NAMESPACE }}
+  namespace: ${NAMESPACE}
 type: Opaque
 data:
   id_rsa: Cg==

=== added file 'deployment/services-dev.yaml.tpl'
--- deployment/services-dev.yaml.tpl	1970-01-01 00:00:00 +0000
+++ deployment/services-dev.yaml.tpl	2017-10-19 17:13:30 +0000
@@ -0,0 +1,113 @@
+################
+# AMQP Service #
+################
+kind: Deployment
+apiVersion: extensions/v1beta1
+metadata:
+  labels:
+    app: amqp
+  name: amqp
+  namespace: ${NAMESPACE}
+spec:
+  replicas: 1
+  revisionHistoryLimit: 2
+  selector:
+    matchLabels:
+      app: amqp
+  template:
+    metadata:
+      labels:
+        app: amqp
+      namespace: ${NAMESPACE}
+    spec:
+      containers:
+      - name: amqp
+        image: rabbitmq
+---
+kind: Service
+apiVersion: v1
+metadata:
+  labels:
+    app: amqp
+  name: amqp
+  namespace: ${NAMESPACE}
+spec:
+  ports:
+  - port: 5672
+    protocol: TCP
+    targetPort: 5672
+  selector:
+    app: amqp
+---
+######################
+# PostgreSQL Service #
+######################
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: db-data
+  namespace: ${NAMESPACE}
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 5Gi
+---
+kind: PersistentVolume
+apiVersion: v1
+metadata:
+  name: pv0001
+  namespace: ${NAMESPACE}
+spec:
+  accessModes:
+    - ReadWriteOnce
+  capacity:
+    storage: 5Gi
+  hostPath:
+    path: /data/pv0001/
+---
+kind: Deployment
+apiVersion: extensions/v1beta1
+metadata:
+  labels:
+    app: db
+  name: db
+  namespace: ${NAMESPACE}
+spec:
+  replicas: 1
+  revisionHistoryLimit: 2
+  selector:
+    matchLabels:
+      app: db
+  template:
+    metadata:
+      labels:
+        app: db
+      namespace: ${NAMESPACE}
+    spec:
+      containers:
+      - name: postgres
+        image: postgres:9.5
+        volumeMounts:
+        - name: postgresdata
+          mountPath: /var/lib/postgresql/data
+      volumes:
+      - name: postgresdata
+        persistentVolumeClaim:
+          claimName: db-data
+---
+kind: Service
+apiVersion: v1
+metadata:
+  labels:
+    app: db
+  name: db
+  namespace: ${NAMESPACE}
+spec:
+  ports:
+  - port: 5432
+    protocol: TCP
+    targetPort: 5432
+  selector:
+    app: db

=== removed file 'deployment/services-dev.yml'
--- deployment/services-dev.yml	2017-08-31 15:05:26 +0000
+++ deployment/services-dev.yml	1970-01-01 00:00:00 +0000
@@ -1,105 +0,0 @@
-################
-# AMQP Service #
-################
-kind: Deployment
-apiVersion: extensions/v1beta1
-metadata:
-  labels:
-    app: amqp
-  name: amqp
-spec:
-  replicas: 1
-  revisionHistoryLimit: 2
-  selector:
-    matchLabels:
-      app: amqp
-  template:
-    metadata:
-      labels:
-        app: amqp
-    spec:
-      containers:
-      - name: amqp
-        image: rabbitmq
----
-kind: Service
-apiVersion: v1
-metadata:
-  labels:
-    app: amqp
-  name: amqp
-spec:
-  ports:
-  - port: 5672
-    protocol: TCP
-    targetPort: 5672
-  selector:
-    app: amqp
----
-######################
-# PostgreSQL Service #
-######################
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: db-data
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 5Gi
----
-kind: PersistentVolume
-apiVersion: v1
-metadata:
-  name: pv0001
-spec:
-  accessModes:
-    - ReadWriteOnce
-  capacity:
-    storage: 5Gi
-  hostPath:
-    path: /data/pv0001/
----
-kind: Deployment
-apiVersion: extensions/v1beta1
-metadata:
-  labels:
-    app: db
-  name: db
-spec:
-  replicas: 1
-  revisionHistoryLimit: 2
-  selector:
-    matchLabels:
-      app: db
-  template:
-    metadata:
-      labels:
-        app: db
-    spec:
-      containers:
-      - name: postgres
-        image: postgres:9.5
-        volumeMounts:
-        - name: postgresdata
-          mountPath: /var/lib/postgresql/data
-      volumes:
-      - name: postgresdata
-        persistentVolumeClaim:
-          claimName: db-data
----
-kind: Service
-apiVersion: v1
-metadata:
-  labels:
-    app: db
-  name: db
-spec:
-  ports:
-  - port: 5432
-    protocol: TCP
-    targetPort: 5432
-  selector:
-    app: db

=== renamed file 'deployment/services.yml.j2' => 'deployment/services.yaml.tpl'
--- deployment/services.yml.j2	2017-08-31 12:09:44 +0000
+++ deployment/services.yaml.tpl	2017-10-19 17:13:30 +0000
@@ -4,7 +4,7 @@
   labels:
     app: app
   name: app
-  namespace: {{ NAMESPACE }}
+  namespace: ${NAMESPACE}
 spec:
   ports:
   - port: 8000
@@ -24,10 +24,10 @@
   labels:
     app: db
   name: db
-  namespace: {{ NAMESPACE }}
+  namespace: ${NAMESPACE}
 spec:
   type: ExternalName
-  externalName: {{ DB_EXTERNAL_NAME }}
+  externalName: ${DB_EXTERNAL_NAME}
 ---
 apiVersion: v1
 kind: Service
@@ -35,7 +35,7 @@
   labels:
     app: amqp
   name: amqp
-  namespace: {{ NAMESPACE }}
+  namespace: ${NAMESPACE}
 spec:
   type: ExternalName
-  externalName: {{ AMQP_EXTERNAL_NAME }}
+  externalName: ${AMQP_EXTERNAL_NAME}

=== added file 'envrc'
--- envrc	1970-01-01 00:00:00 +0000
+++ envrc	2017-10-19 17:13:30 +0000
@@ -0,0 +1,1 @@
+eval $(make -f envrc.mk)

=== added file 'envrc.mk'
--- envrc.mk	1970-01-01 00:00:00 +0000
+++ envrc.mk	2017-10-19 17:13:30 +0000
@@ -0,0 +1,24 @@
+DOCKER_REGISTRY = localhost:5000
+NAMESPACE = isitdeployable
+DOMAIN = dpa.k8s
+DB_EXTERNAL_NAME = db.$(NAMESPACE).svc.cluster.local
+AMQP_EXTERNAL_NAME = amqp.$(NAMESPACE).svc.cluster.local
+LP_BOT = $(shell bzr lp-login)
+
+.DEFAULT_GOAL := envrc
+
+# Quote a string for the shell.
+quote = '$(subst ','\'',$(1))'
+# Produce a shell command that exports a shell variable with the value of
+# the corresponding make variable.  We need an extra layer of quoting here
+# because the echo command itself will expand its arguments.
+exportvar = echo $(call quote,export $(1)=$(call quote,$($(1))))
+
+.PHONY: envrc
+envrc:
+	@$(call exportvar,DOCKER_REGISTRY)
+	@$(call exportvar,NAMESPACE)
+	@$(call exportvar,DOMAIN)
+	@$(call exportvar,DB_EXTERNAL_NAME)
+	@$(call exportvar,AMQP_EXTERNAL_NAME)
+	@$(call exportvar,LP_BOT)

=== removed file 'scripts/generate-config'
--- scripts/generate-config	2017-07-31 17:21:03 +0000
+++ scripts/generate-config	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-#!/usr/bin/env python3
-
-from os import environ, path
-from sys import argv, exit
-
-from jinja2 import Environment, FileSystemLoader
-import yaml
-
-
-def main():
-    template_name = argv[1]
-    env = Environment(
-        loader=FileSystemLoader(path.dirname(path.dirname(__file__))))
-    template = env.get_template(template_name)
-
-    config = template.render(**environ)
-
-    # Test we can load all the documents without error
-    if '.yml' in template_name:
-        list(yaml.load_all(config))
-
-    print(config)
-    return 0
-
-
-if __name__ == '__main__':
-    exit(main())