From d494a91f56e03d1d6772931c77805a3e7b04892b Mon Sep 17 00:00:00 2001
From: Oliver Marks <oly@digitaloctave.com>
Date: Tue, 5 Nov 2019 22:19:20 +0000
Subject: [PATCH] Updated blocks.

---
 src/kube_deploy/blocks.clj | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/kube_deploy/blocks.clj b/src/kube_deploy/blocks.clj
index f8bcc92..7e68899 100644
--- a/src/kube_deploy/blocks.clj
+++ b/src/kube_deploy/blocks.clj
@@ -35,8 +35,11 @@
                                            (lkh/add-liveness-probe-cmd ["pg_isready"])
                                            (lkh/add-to-spec :envFrom [{:secretRef {:name "environment"}}])))
                      (lk/deployment 1)
+                     ; web sockeet
+                     (lk/expose-cluster-ip :mosquitto-service-websocket
+                                           (lk/port :mosquitto :mosquitto-websocket-port 8883 8883))
                      (lk/expose-cluster-ip :mosquitto-master
-                                           (lk/port :mosquitto :mosquitto 1883 1883)))))))
+                                           (lk/port :mosquitto :mosquitto-service-port 1883 1883)))))))
 
 (defn test-block [kube-injector]
   (-> kube-injector
@@ -72,6 +75,7 @@
                          app-container-name
                          app-image
                          (-> {}
+                             (lkh/add-to-spec :envFrom [{:secretRef {:name "environment"}}])
                              (lkh/add-to-spec :resources app-resources)))
                         (lk/deployment 1)
                         (lk/expose-cluster-ip
@@ -134,6 +138,7 @@
                          app-container-name
                          app-image
                          (-> {}
+                             (lkh/add-to-spec :envFrom [{:secretRef {:name "environment"}}])
                              (lkh/add-to-spec :resources app-resources)
                              (lkh/add-readiness-probe-cmd ["redis-cli" "--version"])
                              (lkh/add-liveness-probe-cmd ["redis-cli" "--version"])))
@@ -259,7 +264,7 @@
                         #_(lkh/add-readiness-probe-cmd ["wget" "127.0.0.1:5000"])
                         #_(lkh/add-liveness-probe-cmd ["wget" "127.0.0.1:5000"])})
 
-                      #_(lk/add-init-container
+                      (lk/add-init-container
                          pod
                          (keyword (str app-name "-init-migrations"))
                          app-image
@@ -279,7 +284,8 @@
                                         ;(lkh/add-to-spec :ports [{:containerPort 80 :name "nginx-port"}])
                                  #_(lkh/add-readiness-probe-get "127.0.0.1/static/images/favicon.ico" 80)
                                  (lkh/add-liveness-probe-get "http://127.0.0.1/static/admin/css/responsive.css" 80)))
-                            (lk/add-init-container
+                            #_(lk/add-init-container
+                               pod
                              (keyword (str app-name "-init-static-files"))
                              app-image
                              (-> {}
@@ -356,10 +362,7 @@
          (lk/rule app-rule-name []
                   (fn []
                     (-> (lk/pod app-pod-name
-                                {:app :hackspace
-                                 :env :stage
-                                 :role :master
-                                 :tier :queue}
+                                app-labels
                                 {:imagePullSecrets [{:name "docker-registry"}]})
                         (lk/add-container
                          app-container-name
@@ -367,8 +370,9 @@
                          (-> {}
                              (lkh/add-to-spec :resources resources-small)
                              (lkh/add-to-spec :command ["/app/manage.py" "run_huey"])
+                             (lkh/add-to-spec :imagePullPolicy "Always")
                              (lkh/add-to-spec :envFrom [{:secretRef {:name "environment"}}])))
-                        (lk/deployment 2))))))))
+                        (lk/deployment app-containers))))))))
 
 ;; (into [] (flatten ["c" [:b 2]] ))