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

updated blocks

This commit is contained in:
Oly 2019-10-31 16:42:49 +00:00
parent bfd71627d2
commit 4cbf3d91f6
2 changed files with 185 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

162
src/kube_deploy/blocks.clj
View File

@ -1,7 +1,6 @@
(ns kube-deploy.blocks (ns kube-deploy.blocks
(:require [clojure.java.io :as io] (:require [clojure.java.io :as io]
[kube-deploy.helpers :as lkh] [kube-deploy.helpers :as lkh]
[lambdakube.core :as lk])) [lambdakube.core :as lk]))
(def resources-mini (def resources-mini
@ -22,6 +21,22 @@
:limits :limits
{:cpu "200m" :memory "1Gi"}}) {:cpu "200m" :memory "1Gi"}})
(defn mosquitto-mqtt [kube-injector]
(-> kube-injector
(lk/rule :mosquitto-master-rule []
(fn []
(-> (lk/pod
:mosquitto-master
{:app :footprint :role :master :env :production :tier :database})
(lk/add-container :mosquitto "eclipse-mosquitto"
(-> {}
(lkh/add-to-spec :resources resources-mini)
(lkh/add-readiness-probe-cmd ["pg_isready"])
(lkh/add-liveness-probe-cmd ["pg_isready"])
(lkh/add-to-spec :envFrom [{:secretRef {:name "environment"}}])))
(lk/deployment 1)
(lk/expose-cluster-ip :mosquitto-master
(lk/port :mosquitto :mosquitto 1883 1883)))))))
(defn postgres (defn postgres
([kube-injector] ([kube-injector]
@ -30,19 +45,19 @@
(let [app-name (get settings :app-name "postgres") (let [app-name (get settings :app-name "postgres")
app-pod-name (str app-name "-pod") app-pod-name (str app-name "-pod")
app-rule-name (str app-name "-rule") app-rule-name (str app-name "-rule")
app-container-name (str app-name "-container") app-container-name (keyword (str app-name "-container"))
app-service-name (keyword (str app-name "-service"))
app-dependencies (get settings :dependencies []) app-dependencies (get settings :dependencies [])
app-containers 1 app-containers 1
app-labels (get settings :labels {:app "postgres"}) app-labels (get settings :labels {:app "postgres"})
app-image (get settings :image "postgres") app-image (get settings :image "postgres")
app-resources (get settings :resources resources-small)] app-resources (get settings :resources resources-small)]
(-> kube-injector (-> kube-injector
(lk/rule :postgres-master-rule [] (lk/rule :postgres-rule []
(fn [] (fn []
(-> (lk/pod (-> (lk/pod
app-pod-name app-pod-name
app-labels app-labels)
)
(lk/add-container app-container-name app-image (lk/add-container app-container-name app-image
(-> {} (-> {}
(lkh/add-to-spec :resources app-resources) (lkh/add-to-spec :resources app-resources)
@ -55,34 +70,41 @@
{:accessModes ["ReadWriteOnce"] {:accessModes ["ReadWriteOnce"]
:resources {:requests {:storage "1Gi"}}} :resources {:requests {:storage "1Gi"}}}
{:bar "/var/lib/postgresql/data"}) {:bar "/var/lib/postgresql/data"})
(lk/expose-cluster-ip app-pod-name (lk/expose-cluster-ip app-service-name ;app-name
(lk/port :postgres :postgres 5432 5432))))))))) (lk/port app-container-name :postgres 5432 5432)))))))))
(defn gunicorn
(defn django-gunicorn
([kube-injector] ([kube-injector]
(django-gunicorn kube-injector {})) (gunicorn kube-injector {}))
([kube-injector settings] ([kube-injector settings]
(let [app-name (get settings :app-name "django-gunicorn") (let [app-name (get settings :app-name "gunicorn")
app-pod-name (str app-name "-pod") app-pod-name (keyword (str app-name "-pod"))
app-rule-name (str app-name "-rule") app-rule-name (str app-name "-rule")
app-gunicorn-container-name (str app-name "-container") app-gunicorn-container-name (keyword (str app-name "-container"))
app-nginx-container-name (str app-name "-nginx-container") app-nginx-container-name (keyword (str app-name "-nginx-container"))
app-nginx-pod-name (str app-name "-pod")
app-annotations (get settings :annotations {})
app-dependencies (get settings :dependencies []) app-dependencies (get settings :dependencies [])
app-containers 1 app-containers 1
app-labels (get settings :labels {:app "django-gunicorn"}) app-labels (get settings :labels {:app app-name})
app-image (get settings :image "python:3") app-image (get settings :image "python:3")
app-resources (get settings :resources resources-small)] app-resources (get settings :resources resources-small)
app-service-name "gunicorn-service"
app-nginx-service-name "nginx-service"
app-serve-static (get settings :serve-static true)]
(-> kube-injector (-> kube-injector
(lk/rule (keyword (str app-name "-rule")) app-dependencies (lk/rule (keyword (str app-name "-rule")) app-dependencies
(fn [] (fn []
(-> (lk/pod (as-> (lk/pod
app-pod-name app-pod-name
app-labels app-labels
{:imagePullSecrets [{:name "docker-registry"}]}) {:imagePullSecrets [{:name "docker-registry"}]})
pod
; Add containers to the pod, one for frontend assets and one for backend ; Add containers to the pod, one for frontend assets and one for backend
(lk/add-annotation pod :linkerd.io/inject "enabled")
(lk/add-container (lk/add-container
pod
app-gunicorn-container-name app-gunicorn-container-name
app-image app-image
{:resources app-resources {:resources app-resources
@ -96,41 +118,119 @@
"--keep-alive" "1000" "--keep-alive" "1000"
"-b" "0.0.0.0:5000" "-b" "0.0.0.0:5000"
"--chdir=/app"]) "--chdir=/app"])
:ports [{:containerPort 5000 :name "gunicorn-port"}] ;:ports [{:containerPort 5000 :name "gunicorn-port"}]
:envFrom [{:secretRef {:name "environment"}}] :envFrom [{:secretRef {:name "environment"}}]
#_(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-volume "static-files" {:emptyDir {}} (lk/add-init-container
{app-pod-name "/app/staticfiles"}) pod
(keyword (str app-name "-init-migrations"))
app-image
(-> {}
(lkh/add-to-spec :envFrom [{:secretRef {:name "environment"}}])
(lkh/add-to-spec :command ["./manage.py" "migrate"])))
(lk/add-init-container
pod
(keyword (str app-name "-init-static-files"))
app-image
(-> {}
(lkh/add-to-spec :envFrom [{:secretRef {:name "environment"}}])
(lkh/add-to-spec :command ["./manage.py" "collectstatic"])))
(if (nil? app-serve-static)
pod
(-> pod
(lk/add-container
app-nginx-container-name
"nginx:alpine"
(-> {}
(lkh/add-to-spec :resources resources-mini)
(lkh/add-to-spec :imagePullPolicy "Always")
;(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-volume :static-files
{:emptyDir {}}
{app-nginx-container-name "/usr/share/nginx/html/static/"
app-gunicorn-container-name "/app/staticfiles"})
;{:mountPath "/usr/share/nginx/html/static/"
; :readOnly true}
#_(lk/expose-cluster-ip app-nginx-service-name
(lk/port app-nginx-container-name :nginx-port 80 80))))
; order does matter here, deployment after initcontainers ; order does matter here, deployment after initcontainers
;(lku/wait-for-service-port postgres :postgres) ;(lku/wait-for-service-port postgres :postgres)
;(lku/wait-for-service-port redis :redis) ;(lku/wait-for-service-port redis :redis)
#_(lk/add-volume :static-files {:configMap {:name :static-files-config-map}}
{app-nginx-container-name "/app/staticfiles"}
app-gunicorn-container-name "/app/staticfiles")
; wrap in a deployment ; wrap in a deployment
(lk/deployment app-containers) (lk/deployment pod 1)
(lk/expose-cluster-ip app-gunicorn-container-name (if (nil? app-serve-static)
(lk/port app-pod-name :gunicorn-port 5000 5000)) pod
(lk/expose-cluster-ip app-nginx-container-name (lk/expose-cluster-ip
(lk/port app-pod-name :nginx-port 80 80))))) pod
app-nginx-service-name
(lk/port app-nginx-container-name :nginx-port 80 80)))
(lk/expose-cluster-ip
pod
app-service-name
(lk/port app-gunicorn-container-name :gunicorn-port 5000 5000))
#_(lk/expose-cluster-ip app-name
(lk/port app-nginx-container-name :nginx-port 80 80)))))
; inject the ingress required to serve to gunicorn app ; inject the ingress required to serve to gunicorn app
(lk/rule (keyword (str app-name "-ingress-rule")) [] (lk/rule (keyword (str app-name "-ingress-rule")) []
(fn [] (fn []
(let [ingress-name (str app-name "-ingress")] (let [ingress-name (str app-name "-ingress")
paths []]
(-> (lkh/ingress ingress-name {:app :nginx-ingress :env :production :tier :ingress}) (-> (lkh/ingress ingress-name {:app :nginx-ingress :env :production :tier :ingress})
(lkh/add-spec :tls [{:hosts [(:ingress-host settings)] (lkh/add-spec :tls [{:hosts [(:ingress-host settings)]
:secretName "letsencrypt-production"}]) :secretName (str app-name "-tls")}])
(lkh/add-spec :rules [{:host (:ingress-host settings) (lkh/add-spec :rules [{:host (:ingress-host settings)
:http {:paths :http {:paths
(remove nil?
[{:path "/" [{:path "/"
:backend :backend
{:serviceName "gunicorn-port" {:serviceName app-service-name
:servicePort 5000}} :servicePort 5000}}
(when app-serve-static
{:path "/static/" {:path "/static/"
:backend :backend
{:serviceName "nginx-port" {:serviceName app-nginx-service-name
:servicePort 80}}]}}]) :servicePort 80}})])}}])
(lk/add-annotation :certmanager.k8s.io/cluster-issuer "letsencrypt-production") (lk/add-annotation :kubernetes.io/tls-acme "true")
; (lk/add-annotation :certmanager.k8s.io/cluster-issuer "letsencrypt-production")
(lk/add-annotation :kubernetes.io/ingress.class "nginx"))))))))) (lk/add-annotation :kubernetes.io/ingress.class "nginx")))))))))
;; (into [] (flatten ["c" [:b 2]] ))
;; ;; (bulk-add )
;; ;; (apply lk/add-annotation (list ["a"] (first {:a 1 :b 2})))
;; ;; (defn bulk-add [func obj values]
;; ;; (println (first func))
;; ;; (if (= 0 (count values))
;; ;; (recur
;; ;; func
;; ;; (apply func (into [] (flatten [obj (first values)])))
;; ;; (rest values))
;; ;; obj))
;; ;; (as-> (lk/pod :foo {})
;; ;; pod
;; ;; (bulk-add lk/add-annotation pod {:a 1 :b 2}))
;; ;(apply lk/add-annotation pod (first {:a 1 :b 2}))

16
src/kube_deploy/core.clj
View File

@ -425,7 +425,7 @@
(-> (lk/injector) (-> (lk/injector)
(make-namespace namespace) (make-namespace namespace)
lk/standard-descs lk/standard-descs
(lk/get-deployable config) (lk/get-deployable deployment-config)
(lkh/to-yaml-store (str namespace "-store.yaml")) (lkh/to-yaml-store (str namespace "-store.yaml"))
(kube-apply (io/file (str namespace "-deploy.yaml")) nil kube-config)) (kube-apply (io/file (str namespace "-deploy.yaml")) nil kube-config))
@ -481,17 +481,19 @@
(defn apply-blocks [kube-injector func settings] (defn apply-blocks [kube-injector func settings]
(println (first func))
(println kube-injector)
(if (= 0 (count func)) (if (= 0 (count func))
kube-injector kube-injector
(recur (recur
(case (first func) (case (first func)
"database" (database kube-injector) :database (database kube-injector)
"postgres" (block/postgres kube-injector) :postgres (block/postgres kube-injector)
"django-gunicorn" (block/django-gunicorn kube-injector (get-in settings [(keyword (first func))])) :mosquitto (block/mosquitto-mqtt kube-injector)
:django-gunicorn (block/gunicorn kube-injector (get-in settings [(keyword (first func))]))
kube-injector) kube-injector)
(rest func) (rest func)
settings settings)))
)))
(defn build [{:keys [config namespace blocks] :as service}] (defn build [{:keys [config namespace blocks] :as service}]
@ -501,7 +503,7 @@
(create-namespace-if-not-exists service) (create-namespace-if-not-exists service)
(let [injector (lk/injector)] (let [injector (lk/injector)]
(-> injector (-> injector
;(make-environment-secrets :environment (:vars @conf)) (make-environment-secrets :environment (:vars @conf))
;(make-registry-secrets :docker-registry {:.dockerconfigjson (:registry @conf)}) ;(make-registry-secrets :docker-registry {:.dockerconfigjson (:registry @conf)})
;; make-ingress-hackspace ;; make-ingress-hackspace
;; database ;; database