oly
/
kube
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated blocks.

This commit is contained in:
Oliver Marks 2019-11-05 22:19:20 +00:00
parent c8db5a253d
commit d494a91f56
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/kube_deploy/blocks.clj
View File

@ -35,8 +35,11 @@
(lkh/add-liveness-probe-cmd ["pg_isready"]) (lkh/add-liveness-probe-cmd ["pg_isready"])
(lkh/add-to-spec :envFrom [{:secretRef {:name "environment"}}]))) (lkh/add-to-spec :envFrom [{:secretRef {:name "environment"}}])))
(lk/deployment 1) (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/expose-cluster-ip :mosquitto-master
(lk/port :mosquitto :mosquitto 1883 1883))))))) (lk/port :mosquitto :mosquitto-service-port 1883 1883)))))))
(defn test-block [kube-injector] (defn test-block [kube-injector]
(-> kube-injector (-> kube-injector
@ -72,6 +75,7 @@
app-container-name app-container-name
app-image app-image
(-> {} (-> {}
(lkh/add-to-spec :envFrom [{:secretRef {:name "environment"}}])
(lkh/add-to-spec :resources app-resources))) (lkh/add-to-spec :resources app-resources)))
(lk/deployment 1) (lk/deployment 1)
(lk/expose-cluster-ip (lk/expose-cluster-ip
@ -134,6 +138,7 @@
app-container-name app-container-name
app-image app-image
(-> {} (-> {}
(lkh/add-to-spec :envFrom [{:secretRef {:name "environment"}}])
(lkh/add-to-spec :resources app-resources) (lkh/add-to-spec :resources app-resources)
(lkh/add-readiness-probe-cmd ["redis-cli" "--version"]) (lkh/add-readiness-probe-cmd ["redis-cli" "--version"])
(lkh/add-liveness-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-readiness-probe-cmd ["wget" "127.0.0.1:5000"])
#_(lkh/add-liveness-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 pod
(keyword (str app-name "-init-migrations")) (keyword (str app-name "-init-migrations"))
app-image app-image
@ -279,7 +284,8 @@
;(lkh/add-to-spec :ports [{:containerPort 80 :name "nginx-port"}]) ;(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-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))) (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")) (keyword (str app-name "-init-static-files"))
app-image app-image
(-> {} (-> {}
@ -356,10 +362,7 @@
(lk/rule app-rule-name [] (lk/rule app-rule-name []
(fn [] (fn []
(-> (lk/pod app-pod-name (-> (lk/pod app-pod-name
{:app :hackspace app-labels
:env :stage
:role :master
:tier :queue}
{:imagePullSecrets [{:name "docker-registry"}]}) {:imagePullSecrets [{:name "docker-registry"}]})
(lk/add-container (lk/add-container
app-container-name app-container-name
@ -367,8 +370,9 @@
(-> {} (-> {}
(lkh/add-to-spec :resources resources-small) (lkh/add-to-spec :resources resources-small)
(lkh/add-to-spec :command ["/app/manage.py" "run_huey"]) (lkh/add-to-spec :command ["/app/manage.py" "run_huey"])
(lkh/add-to-spec :imagePullPolicy "Always")
(lkh/add-to-spec :envFrom [{:secretRef {:name "environment"}}]))) (lkh/add-to-spec :envFrom [{:secretRef {:name "environment"}}])))
(lk/deployment 2)))))))) (lk/deployment app-containers))))))))
;; (into [] (flatten ["c" [:b 2]] )) ;; (into [] (flatten ["c" [:b 2]] ))