From be836d8882d6d52a5af79000aadefd4dd1692572 Mon Sep 17 00:00:00 2001 From: Moritz Graf Date: Sun, 9 Oct 2022 14:07:40 +0200 Subject: [PATCH] Various smaller updates on k8s folder --- k8s/README.md | 23 ++++++-- k8s/datalab/influxdb.yml | 8 --- k8s/datalab/influxdb2.yml | 0 k8s/datalab/mosquitto.yml | 25 +++++++++ k8s/datalab/telegraf-operator.yml | 5 ++ k8s/datalab/telegraf.yml | 7 --- k8s/kuard/deployment.yaml | 42 +++++++------- k8s/kuard/ingress.yaml | 42 +++++++------- k8s/kuard/service.yaml | 24 ++++---- k8s/octobot-fabi/config.secret.yaml | Bin 0 -> 608 bytes k8s/octobot-fabi/deployment.yaml | 78 ++++++++++++++++++++++++++ k8s/octobot-fabi/oauth2.secret.values | Bin 0 -> 1545 bytes k8s/octobot-fabi/pvc.yaml | 30 ++++++++++ k8s/octobot-fabi/service.yaml | 15 +++++ 14 files changed, 225 insertions(+), 74 deletions(-) delete mode 100644 k8s/datalab/influxdb.yml create mode 100644 k8s/datalab/influxdb2.yml create mode 100644 k8s/datalab/mosquitto.yml create mode 100644 k8s/datalab/telegraf-operator.yml delete mode 100644 k8s/datalab/telegraf.yml create mode 100644 k8s/octobot-fabi/config.secret.yaml create mode 100644 k8s/octobot-fabi/deployment.yaml create mode 100644 k8s/octobot-fabi/oauth2.secret.values create mode 100644 k8s/octobot-fabi/pvc.yaml create mode 100644 k8s/octobot-fabi/service.yaml diff --git a/k8s/README.md b/k8s/README.md index 96a2aac..1856292 100644 --- a/k8s/README.md +++ b/k8s/README.md @@ -357,7 +357,7 @@ kubectl apply $(ls octobot-fabi/*.yaml | awk ' { print " -f " $1 } ') ```sh helm repo add nextcloud https://nextcloud.github.io/helm/ helm repo update -helm upgrade --install nextcloud nextcloud/nextcloud -n nextcloud --version 2.14.3 -f nextcloud/nextcloud.secret.yml +helm upgrade --install nextcloud nextcloud/nextcloud -n nextcloud --version 3.0.0 -f nextcloud/nextcloud.secret.yml helm upgrade --install nextcloud-phpmyadmin bitnami/phpmyadmin -n nextcloud -f nextcloud/nextcloud-phpmyadmin.yml ``` @@ -383,16 +383,29 @@ Unknown why normal url is not working. See https://help.nextcloud.com/t/davx5-co #TODO with Velero +## influxdb & mosquitto - -## fuel datalab +## datalab ```sh helm repo add influxdata https://helm.influxdata.com/ -helm upgrade --install influxdb influxdata/influxdb --namespace datalab --values datalab/influxdb.yml -helm upgrade --install telegraf influxdata/telegraf --namespace datalab --values datalab/telegraf.yml +# influx stuff +helm upgrade --install influxdb2 influxdata/influxdb2 --namespace datalab --values datalab/influxdb2.yml +helm upgrade --install telegraf-operator influxdata/telegraf-operator --namespace datalab --values datalab/telegraf-operator.yml +# helm repo add bitnami https://charts.bitnami.com/bitnami helm install postgres bitnami/postgresql --namespace datalab --values datalab/postgres.yml.secret +#mqtt +helm repo add TrueCharts https://charts.truecharts.org +helm repo update +helm upgrade --install mosquitto TrueCharts/mosquitto --namespace datalab --values datalab/mosquitto.yml +``` + +work with it + +```sh +# retrieve admin password +echo $(kubectl get secret influxdb2-auth -o "jsonpath={.data['admin-password']}" --namespace datalab | base64 --decode) ``` Tear down: diff --git a/k8s/datalab/influxdb.yml b/k8s/datalab/influxdb.yml deleted file mode 100644 index 60146ba..0000000 --- a/k8s/datalab/influxdb.yml +++ /dev/null @@ -1,8 +0,0 @@ -persistence: - size: 20Gi - -setDefaultUser: - enabled: true - user: - username: "admin" - password: "hdlmfg" \ No newline at end of file diff --git a/k8s/datalab/influxdb2.yml b/k8s/datalab/influxdb2.yml new file mode 100644 index 0000000..e69de29 diff --git a/k8s/datalab/mosquitto.yml b/k8s/datalab/mosquitto.yml new file mode 100644 index 0000000..14b886c --- /dev/null +++ b/k8s/datalab/mosquitto.yml @@ -0,0 +1,25 @@ + + +configmap: + config: + enabled: true + data: + mosquitto.conf: | + listener {{ .Values.service.main.ports.main.targetPort }} + {{- if .Values.websockets.enabled }} + listener {{ .Values.service.websockets.ports.websockets.targetPort }} + protocol websockets + {{- end }} + {{- if .Values.auth.enabled }} + allow_anonymous false + {{- else }} + allow_anonymous true + {{- end }} + {{- if .Values.persistence.data.enabled }} + persistence true + persistence_location {{ .Values.persistence.data.mountPath }} + autosave_interval 1800 + {{- end }} + {{- if .Values.persistence.configinc.enabled }} + include_dir {{ .Values.persistence.configinc.mountPath }} + {{- end }} \ No newline at end of file diff --git a/k8s/datalab/telegraf-operator.yml b/k8s/datalab/telegraf-operator.yml new file mode 100644 index 0000000..91af5ae --- /dev/null +++ b/k8s/datalab/telegraf-operator.yml @@ -0,0 +1,5 @@ +replicaCount: 1 +certManager: + enable: true + +hotReload: true \ No newline at end of file diff --git a/k8s/datalab/telegraf.yml b/k8s/datalab/telegraf.yml deleted file mode 100644 index 80b45fc..0000000 --- a/k8s/datalab/telegraf.yml +++ /dev/null @@ -1,7 +0,0 @@ -config: - outputs: - - influxdb: - urls: - - "http://influxdb.datalab:8086" - database: "telegraf" - \ No newline at end of file diff --git a/k8s/kuard/deployment.yaml b/k8s/kuard/deployment.yaml index c2839d1..46388cc 100644 --- a/k8s/kuard/deployment.yaml +++ b/k8s/kuard/deployment.yaml @@ -1,21 +1,21 @@ -# apiVersion: apps/v1 -# kind: Deployment -# metadata: -# name: kuard -# namespace: kuard -# spec: -# selector: -# matchLabels: -# app: kuard -# replicas: 1 -# template: -# metadata: -# labels: -# app: kuard -# spec: -# containers: -# - image: gcr.io/kuar-demo/kuard-amd64:1 -# imagePullPolicy: Always -# name: kuard -# ports: -# - containerPort: 8080 +apiVersion: apps/v1 +kind: Deployment +metadata: + name: kuard + namespace: kuard +spec: + selector: + matchLabels: + app: kuard + replicas: 1 + template: + metadata: + labels: + app: kuard + spec: + containers: + - image: gcr.io/kuar-demo/kuard-amd64:1 + imagePullPolicy: Always + name: kuard + ports: + - containerPort: 8080 diff --git a/k8s/kuard/ingress.yaml b/k8s/kuard/ingress.yaml index 804d917..a64d479 100644 --- a/k8s/kuard/ingress.yaml +++ b/k8s/kuard/ingress.yaml @@ -1,22 +1,22 @@ -# apiVersion: extensions/v1beta1 -# kind: Ingress -# metadata: -# name: kuard -# namespace: kuard -# annotations: -# kubernetes.io/ingress.class: "nginx" -# cert-manager.io/cluster-issuer: "letsencrypt-prod" +apiVersion: extensions/v1beta1 +kind: Ingress +metadata: + name: kuard + namespace: kuard + annotations: + kubernetes.io/ingress.class: "nginx" + cert-manager.io/cluster-issuer: "letsencrypt-prod" -# spec: -# tls: -# - hosts: -# - "kuard.haumdaucher.de" -# secretName: kuard-haumdaucher -# rules: -# - host: kuard.haumdaucher.de -# http: -# paths: -# - path: / -# backend: -# serviceName: kuard -# servicePort: 80 +spec: + tls: + - hosts: + - "kuard.haumdaucher.de" + secretName: kuard-haumdaucher + rules: + - host: kuard.haumdaucher.de + http: + paths: + - path: / + backend: + serviceName: kuard + servicePort: 80 diff --git a/k8s/kuard/service.yaml b/k8s/kuard/service.yaml index b7ca3e6..37f0991 100644 --- a/k8s/kuard/service.yaml +++ b/k8s/kuard/service.yaml @@ -1,12 +1,12 @@ -# apiVersion: v1 -# kind: Service -# metadata: -# name: kuard -# namespace: kuard -# spec: -# ports: -# - port: 80 -# targetPort: 8080 -# protocol: TCP -# selector: -# app: kuard +apiVersion: v1 +kind: Service +metadata: + name: kuard + namespace: kuard +spec: + ports: + - port: 80 + targetPort: 8080 + protocol: TCP + selector: + app: kuard diff --git a/k8s/octobot-fabi/config.secret.yaml b/k8s/octobot-fabi/config.secret.yaml new file mode 100644 index 0000000000000000000000000000000000000000..90e241148d5781581d0a95452a31e3eb8eb090d6 GIT binary patch literal 608 zcmV-m0-yZ=M@dveQdv+`0NQm)un$&6Y;{pAgIry{Y8NcPYk|%V)9c^H<5*QlY7`08AJd%*f?3 zZ71woGEkr22HyA2ta^Yj3Ro>GH7EbRM2z6qO>|h(mLkP=AjkZ`pBdlE z65=Ebd?CQx!$wAm*%!I-`?#i3ke(QT^RXVn&IfU~0ZQ(_tkWo@Y-4I+k$;?rbczH&~nZ0p1>~@9gwT zmEik8TFy1SHt1}bJ4c;-@ZDvw!Fb6Lmmo@FCI`sYc#K1z*aoR_yP7|Ip1Q`ydbtfeb>`~pmg930+Z3H>=S||A3 zqh)8^?mT9edYDBn*9$m>5Uzn9r5o`@+*#0~N?G!^miRb(1zaGN>^Kxd66!t&Hk^Yam;8LPrS~TJlUZ znGEqrIa$r>KVz`mC_}NPB1UCl!1GGECNeemN|L0}7vk{ltD&N?1JeC?`NH@YX7r^Y8IOdd_c0q-wtjLC7bWx#HcW}w!o-4E@f_o%`n^jJ0vQ3_;OBu-?1o{6aev|> zU&JPIIGT%RWwRf?TjENg4h`}0N~4Br_|5_J3_YX!L@(CT1GVF(fTFVA-r38DJY02d zlAcstVOWOxn;y#GSLI^6BbiBe1Q6Fy*l=GQ^50WaxUNB&>q27T(${6`k!M~DBmL>9!Pq`w=9MUw94&dBcBS26mve3G_a;@ z%&Ep0uYGKL!Id7G+8zD&S{L{EigsCVnuaNls@;2cclHzH`LB3)I0H8}`aL$pR;ukY ziMD*|y#ma92@u07*e{5g5I=Q_jBmvB?{0If<3_#!YcR*@*fsL*r5Cweg+IEM{h6c zRKR-Z15Fb5hzvmAt3WGGc#quWt*lQz)a$hJ)FSh6Q?fm7$hB;($*>If*mfkPjC{rC z4lk~ImrCoJOVu{B&an4FUIW&&wqd?h%6Y)vI!r^?VZ|0|Ux@uSk#OFow=b?BF)`2R24DxFb&v0@${5j70zHANbhC68Q5AfpfcSCp$5e#u zBD&fdpKo7T%W5D=Q{?QGKUh?ebO5LxwhCULxvq9yq^57cdNlW#mgFrng%)q+>w|O7 zEj}RiPEbxZ#p+_PAv0pr{4h|e+oG#Qml`gC!g6wTdjCBjh)7KR^U69TWZh864OWG% zX-N=AxxJ$Z%D%+dpFNPpg|mHmdr~DL%T8Jfi_s4JV7)KRnX8NbVfyPf_+*pxibOQ?nhb+4e)7R4=YCS|Rw_}E6pRpLeRgI~eS>U`U)^&;5W zL^v>@DKmf|PleFzbSi*JCu(kk4yy!@sS&-b%EhuRp7EOT-<*;nDs4#(A8ObRYJ=U= v9_@S0vZZl;l8)`Nzm8