From 2bdbe2b66e757c6c272570a03dbe9fb941264695 Mon Sep 17 00:00:00 2001 From: mmastrorilli Date: Tue, 6 Oct 2020 16:20:09 +0200 Subject: [PATCH 01/12] kube deploy Signed-off-by: mmastrorilli --- .../openhabcloud_ephemeral_k8_template.yml | 42 ++++++++++++++++--- 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml b/deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml index 2db2275..47f27cf 100644 --- a/deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml +++ b/deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml @@ -9,6 +9,7 @@ items: org.openhab.cloud.service: app-1 name: app-1 spec: + type: NodePort ports: - name: "3000" port: 3000 @@ -43,6 +44,7 @@ items: org.openhab.cloud.service: nginx name: nginx spec: + type: NodePort ports: - name: "80" port: 80 @@ -71,7 +73,7 @@ items: org.openhab.cloud.service: redis status: loadBalancer: {} -- apiVersion: extensions/v1beta1 +- apiVersion: apps/v1 kind: Deployment metadata: annotations: @@ -89,15 +91,35 @@ items: org.openhab.cloud.service: app-1 spec: containers: - - image: docker.io/openhab/openhabcloud-app + - image: docker.io/mariomastrorilli/openhabcloud-app:latest name: app-1 ports: - containerPort: 3000 resources: {} + env: + - name: COMPOSE_PROJECT_NAME + value: "openhab-cloud" + - name: DOMAIN_NAME + value: "localhost" + - name: EMAIL + value: "noreply@localost.com" + - name: EXPRESS_KEY + value: "123456" workingDir: /opt/openhabcloud + command: ["./run-app.sh"] + volumeMounts: + - mountPath: /opt/openhabcloud/config.json.template + name: config-storage restartPolicy: Always + volumes: + - name: config-storage + hostPath: + path: "/data/openhabcloud-config/config.json.template" + selector: + matchLabels: + org.openhab.cloud.service: app-1 status: {} -- apiVersion: extensions/v1beta1 +- apiVersion: apps/v1 kind: Deployment metadata: annotations: @@ -118,7 +140,6 @@ items: containers: - args: - mongod - - --smallfiles - --bind_ip_all image: bitnami/mongodb:latest name: mongodb @@ -136,8 +157,11 @@ items: name: mongodb-empty0 - emptyDir: {} name: mongodb-empty1 + selector: + matchLabels: + org.openhab.cloud.service: mongodb status: {} -- apiVersion: extensions/v1beta1 +- apiVersion: apps/v1 kind: Deployment metadata: annotations: @@ -169,8 +193,11 @@ items: volumes: - emptyDir: {} name: app-1 + selector: + matchLabels: + org.openhab.cloud.service: nginx status: {} -- apiVersion: extensions/v1beta1 +- apiVersion: apps/v1 kind: Deployment metadata: annotations: @@ -197,6 +224,9 @@ items: - containerPort: 6379 resources: {} restartPolicy: Always + selector: + matchLabels: + org.openhab.cloud.service: redis status: {} kind: List metadata: {} From 6b3a37faa076f42242ff6242e4c01c0052bd16ce Mon Sep 17 00:00:00 2001 From: mmastrorilli Date: Tue, 6 Oct 2020 22:53:06 +0200 Subject: [PATCH 02/12] ConfigMap Signed-off-by: mmastrorilli --- deployment/kubernetes/config.json | 57 +++++++++++++++++++ deployment/kubernetes/kubernetes-deploy.sh | 3 + .../openhabcloud_ephemeral_k8_template.yml | 18 +++--- 3 files changed, 69 insertions(+), 9 deletions(-) create mode 100644 deployment/kubernetes/config.json diff --git a/deployment/kubernetes/config.json b/deployment/kubernetes/config.json new file mode 100644 index 0000000..46dd6ac --- /dev/null +++ b/deployment/kubernetes/config.json @@ -0,0 +1,57 @@ +{ + "system": { + "host": "${DOMAIN_NAME}", + "port": "443", + "protocol": "https", + "logger" : { + "type": "console" + }, + "subDomainCookies": false, + "muteNotifications": false + }, + "express":{ + "key" : "${EXPRESS_KEY}" + }, + "apn" : { + "gateway": "gateway.push.apple.com", + "cert": "certs/aps/aps_production_cert.pem", + "key": "certs/aps/aps_production_key.pem", + "passphrase": "passphrase" + }, + "gcm" : { + "jid": "something@gcm.googleapis.com", + "password": "password" + }, + "ifttt" : { + "iftttChannelKey" : "key", + "iftttTestToken" : "token" + }, + "mail": { + "host" : "smtp", + "port" : 465, + "user" : "foo@bar.com", + "pass" : "${SMTP_PASSWORD}" + }, + "mongodb": { + "hosts": ["mongodb"], + "db": "openhab" + }, + "redis": { + "host": "redis", + "port": "6379", + "password": "123_openHAB" + }, + "mailer": { + "host" : "smtp", + "port": 465, + "secureConnection": true, + "user": "foo@bar.com", + "password": "${SMTP_PASSWORD}", + "from": "openHAB Cloud " + }, + "legal": { + "terms" : "", + "policy": "" + }, + "registration_enabled": false +} diff --git a/deployment/kubernetes/kubernetes-deploy.sh b/deployment/kubernetes/kubernetes-deploy.sh index 3307a57..e3ea056 100755 --- a/deployment/kubernetes/kubernetes-deploy.sh +++ b/deployment/kubernetes/kubernetes-deploy.sh @@ -32,6 +32,9 @@ kubectl create namespace $KUBERNETES_NAMESPACE kubectl create serviceaccount $KUBERNETES_ACCOUNT --namespace $KUBERNETES_NAMESPACE +# Creating configMap volume + +kubectl create configMap openhab-config --from-file=./config.json --namespace $KUBERNETES_NAMESPACE ### Create openHAB-cloud from template diff --git a/deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml b/deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml index 47f27cf..1e5da1d 100644 --- a/deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml +++ b/deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml @@ -9,7 +9,6 @@ items: org.openhab.cloud.service: app-1 name: app-1 spec: - type: NodePort ports: - name: "3000" port: 3000 @@ -44,7 +43,6 @@ items: org.openhab.cloud.service: nginx name: nginx spec: - type: NodePort ports: - name: "80" port: 80 @@ -91,7 +89,7 @@ items: org.openhab.cloud.service: app-1 spec: containers: - - image: docker.io/mariomastrorilli/openhabcloud-app:latest + - image: docker.io/openhab/openhabcloud-app:latest name: app-1 ports: - containerPort: 3000 @@ -102,19 +100,21 @@ items: - name: DOMAIN_NAME value: "localhost" - name: EMAIL - value: "noreply@localost.com" + value: "noreply@localhost.com" - name: EXPRESS_KEY value: "123456" workingDir: /opt/openhabcloud - command: ["./run-app.sh"] + command: ["node"] + args: ["app.js"] volumeMounts: - - mountPath: /opt/openhabcloud/config.json.template - name: config-storage + - name: config-storage + mountPath: /opt/openhabcloud/config.json + subPath: config.json restartPolicy: Always volumes: - name: config-storage - hostPath: - path: "/data/openhabcloud-config/config.json.template" + configMap: + name: openhab-config selector: matchLabels: org.openhab.cloud.service: app-1 From 642d3f0e0298fa5ead8e5522c7c4e432d631fe50 Mon Sep 17 00:00:00 2001 From: mmastrorilli Date: Tue, 6 Oct 2020 23:01:01 +0200 Subject: [PATCH 03/12] confgimap Signed-off-by: mmastrorilli --- deployment/kubernetes/kubernetes-deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/kubernetes/kubernetes-deploy.sh b/deployment/kubernetes/kubernetes-deploy.sh index e3ea056..ae412ee 100755 --- a/deployment/kubernetes/kubernetes-deploy.sh +++ b/deployment/kubernetes/kubernetes-deploy.sh @@ -34,7 +34,7 @@ kubectl create serviceaccount $KUBERNETES_ACCOUNT --namespace $KUBERNETES_NAMESP # Creating configMap volume -kubectl create configMap openhab-config --from-file=./config.json --namespace $KUBERNETES_NAMESPACE +kubectl create configmap openhab-config --from-file=./config.json --namespace $KUBERNETES_NAMESPACE ### Create openHAB-cloud from template From f6ffff4fa745d8316cbb8efa796b6a2de5578c5a Mon Sep 17 00:00:00 2001 From: mmastrorilli Date: Tue, 6 Oct 2020 23:23:54 +0200 Subject: [PATCH 04/12] env variables Signed-off-by: mmastrorilli --- .../{config.json => config.json.template} | 0 deployment/kubernetes/kubernetes-deploy.sh | 5 +++-- deployment/kubernetes/openhabcloud_env_k8.yml | 11 +++++++++++ .../openhabcloud_ephemeral_k8_template.yml | 19 ++++++------------- 4 files changed, 20 insertions(+), 15 deletions(-) rename deployment/kubernetes/{config.json => config.json.template} (100%) create mode 100644 deployment/kubernetes/openhabcloud_env_k8.yml diff --git a/deployment/kubernetes/config.json b/deployment/kubernetes/config.json.template similarity index 100% rename from deployment/kubernetes/config.json rename to deployment/kubernetes/config.json.template diff --git a/deployment/kubernetes/kubernetes-deploy.sh b/deployment/kubernetes/kubernetes-deploy.sh index ae412ee..3da23d4 100755 --- a/deployment/kubernetes/kubernetes-deploy.sh +++ b/deployment/kubernetes/kubernetes-deploy.sh @@ -32,9 +32,10 @@ kubectl create namespace $KUBERNETES_NAMESPACE kubectl create serviceaccount $KUBERNETES_ACCOUNT --namespace $KUBERNETES_NAMESPACE -# Creating configMap volume +# Creating configMap volumes -kubectl create configmap openhab-config --from-file=./config.json --namespace $KUBERNETES_NAMESPACE +kubectl create configmap openhab-config --from-file=./config.json.template --namespace $KUBERNETES_NAMESPACE +kubectl create -f openhabcloud_env_k8.yml --namespace $KUBERNETES_NAMESPACE ### Create openHAB-cloud from template diff --git a/deployment/kubernetes/openhabcloud_env_k8.yml b/deployment/kubernetes/openhabcloud_env_k8.yml new file mode 100644 index 0000000..40ff0e3 --- /dev/null +++ b/deployment/kubernetes/openhabcloud_env_k8.yml @@ -0,0 +1,11 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: openhab-env +data: + COMPOSE_PROJECT_NAME: openhab-cloud +# Used to obtain TLS certificate from letsencrypt + DOMAIN_NAME: + EMAIL: +# IMPORTANT - Choose a random secret string + EXPRESS_KEY: \ No newline at end of file diff --git a/deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml b/deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml index 1e5da1d..629e35f 100644 --- a/deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml +++ b/deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml @@ -94,22 +94,15 @@ items: ports: - containerPort: 3000 resources: {} - env: - - name: COMPOSE_PROJECT_NAME - value: "openhab-cloud" - - name: DOMAIN_NAME - value: "localhost" - - name: EMAIL - value: "noreply@localhost.com" - - name: EXPRESS_KEY - value: "123456" + envFrom: + - configMapRef: + name: openhab-env workingDir: /opt/openhabcloud - command: ["node"] - args: ["app.js"] + command: ["./run-app.sh"] volumeMounts: - name: config-storage - mountPath: /opt/openhabcloud/config.json - subPath: config.json + mountPath: /opt/openhabcloud/config.json.template + subPath: config.json.temlate restartPolicy: Always volumes: - name: config-storage From 9e379ab917590f226f59f085c281242f2f17be54 Mon Sep 17 00:00:00 2001 From: mmastrorilli Date: Tue, 6 Oct 2020 23:51:37 +0200 Subject: [PATCH 05/12] command Signed-off-by: mmastrorilli --- deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml b/deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml index 629e35f..40b49da 100644 --- a/deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml +++ b/deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml @@ -98,7 +98,6 @@ items: - configMapRef: name: openhab-env workingDir: /opt/openhabcloud - command: ["./run-app.sh"] volumeMounts: - name: config-storage mountPath: /opt/openhabcloud/config.json.template From d632f42b70ab15cb9063863cf18991617fde5904 Mon Sep 17 00:00:00 2001 From: mmastrorilli Date: Wed, 7 Oct 2020 01:05:54 +0200 Subject: [PATCH 06/12] mio repository Signed-off-by: mmastrorilli --- deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml b/deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml index 40b49da..9193907 100644 --- a/deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml +++ b/deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml @@ -89,7 +89,7 @@ items: org.openhab.cloud.service: app-1 spec: containers: - - image: docker.io/openhab/openhabcloud-app:latest + - image: docker.io/mariomastrorilli/openhabcloud-app:latest name: app-1 ports: - containerPort: 3000 @@ -98,10 +98,11 @@ items: - configMapRef: name: openhab-env workingDir: /opt/openhabcloud + command: ["./run-app.sh"] volumeMounts: - name: config-storage mountPath: /opt/openhabcloud/config.json.template - subPath: config.json.temlate + subPath: config.json.template restartPolicy: Always volumes: - name: config-storage From 5dd070dbd733b60883c025f9497c0465c313d099 Mon Sep 17 00:00:00 2001 From: mmastrorilli Date: Wed, 7 Oct 2020 01:08:01 +0200 Subject: [PATCH 07/12] virgolett Signed-off-by: mmastrorilli --- deployment/kubernetes/openhabcloud_env_k8.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deployment/kubernetes/openhabcloud_env_k8.yml b/deployment/kubernetes/openhabcloud_env_k8.yml index 40ff0e3..0e40dab 100644 --- a/deployment/kubernetes/openhabcloud_env_k8.yml +++ b/deployment/kubernetes/openhabcloud_env_k8.yml @@ -3,9 +3,9 @@ kind: ConfigMap metadata: name: openhab-env data: - COMPOSE_PROJECT_NAME: openhab-cloud + COMPOSE_PROJECT_NAME: "openhab-cloud" # Used to obtain TLS certificate from letsencrypt - DOMAIN_NAME: - EMAIL: + DOMAIN_NAME: """ + EMAIL: """ # IMPORTANT - Choose a random secret string - EXPRESS_KEY: \ No newline at end of file + EXPRESS_KEY: """ \ No newline at end of file From 6f3eeb13d0c7c0dda50f76504fa94f000512f1c6 Mon Sep 17 00:00:00 2001 From: mmastrorilli Date: Wed, 7 Oct 2020 01:11:43 +0200 Subject: [PATCH 08/12] virgolette Signed-off-by: mmastrorilli --- deployment/kubernetes/openhabcloud_env_k8.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deployment/kubernetes/openhabcloud_env_k8.yml b/deployment/kubernetes/openhabcloud_env_k8.yml index 0e40dab..b1d6b3e 100644 --- a/deployment/kubernetes/openhabcloud_env_k8.yml +++ b/deployment/kubernetes/openhabcloud_env_k8.yml @@ -5,7 +5,7 @@ metadata: data: COMPOSE_PROJECT_NAME: "openhab-cloud" # Used to obtain TLS certificate from letsencrypt - DOMAIN_NAME: """ - EMAIL: """ + DOMAIN_NAME: "" + EMAIL: "" # IMPORTANT - Choose a random secret string - EXPRESS_KEY: """ \ No newline at end of file + EXPRESS_KEY: "" \ No newline at end of file From b9eb0f6947ef68118983cfee6c108a61cf0b0e45 Mon Sep 17 00:00:00 2001 From: mmastrorilli Date: Wed, 7 Oct 2020 01:37:09 +0200 Subject: [PATCH 09/12] secrets Signed-off-by: mmastrorilli --- deployment/kubernetes/kubernetes-deploy.sh | 1 + deployment/kubernetes/openhabcloud_env_k8.yml | 5 +---- .../kubernetes/openhabcloud_ephemeral_k8_template.yml | 2 ++ deployment/kubernetes/openhabcloud_secrets_k8.yml | 11 +++++++++++ 4 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 deployment/kubernetes/openhabcloud_secrets_k8.yml diff --git a/deployment/kubernetes/kubernetes-deploy.sh b/deployment/kubernetes/kubernetes-deploy.sh index 3da23d4..0b2aee3 100755 --- a/deployment/kubernetes/kubernetes-deploy.sh +++ b/deployment/kubernetes/kubernetes-deploy.sh @@ -36,6 +36,7 @@ kubectl create serviceaccount $KUBERNETES_ACCOUNT --namespace $KUBERNETES_NAMESP kubectl create configmap openhab-config --from-file=./config.json.template --namespace $KUBERNETES_NAMESPACE kubectl create -f openhabcloud_env_k8.yml --namespace $KUBERNETES_NAMESPACE +kubectl create -f openhabcloud_secrets_k8.yml --namespace $KUBERNETES_NAMESPACE ### Create openHAB-cloud from template diff --git a/deployment/kubernetes/openhabcloud_env_k8.yml b/deployment/kubernetes/openhabcloud_env_k8.yml index b1d6b3e..da06278 100644 --- a/deployment/kubernetes/openhabcloud_env_k8.yml +++ b/deployment/kubernetes/openhabcloud_env_k8.yml @@ -4,8 +4,5 @@ metadata: name: openhab-env data: COMPOSE_PROJECT_NAME: "openhab-cloud" -# Used to obtain TLS certificate from letsencrypt DOMAIN_NAME: "" - EMAIL: "" -# IMPORTANT - Choose a random secret string - EXPRESS_KEY: "" \ No newline at end of file + EMAIL: "" \ No newline at end of file diff --git a/deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml b/deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml index 9193907..abf13bb 100644 --- a/deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml +++ b/deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml @@ -97,6 +97,8 @@ items: envFrom: - configMapRef: name: openhab-env + - secretRef: + name: openhab-secrets workingDir: /opt/openhabcloud command: ["./run-app.sh"] volumeMounts: diff --git a/deployment/kubernetes/openhabcloud_secrets_k8.yml b/deployment/kubernetes/openhabcloud_secrets_k8.yml new file mode 100644 index 0000000..f146584 --- /dev/null +++ b/deployment/kubernetes/openhabcloud_secrets_k8.yml @@ -0,0 +1,11 @@ +apiVersion: v1 +kind: Secret +metadata: + name: openhab-secrets +type: Opaque +stringData: + EXPRESS_KEY: "" + SMTP_USER: "" + SMTP_PASSWORD: "" + MONGO_USER: "" + MONGO_PASSWORD: "" From 036772f4527888d2204ec52d1f825ea575bfe054 Mon Sep 17 00:00:00 2001 From: mmastrorilli Date: Wed, 7 Oct 2020 01:52:55 +0200 Subject: [PATCH 10/12] secrets Signed-off-by: mmastrorilli --- deployment/kubernetes/config.json.template | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/deployment/kubernetes/config.json.template b/deployment/kubernetes/config.json.template index 46dd6ac..a09d854 100644 --- a/deployment/kubernetes/config.json.template +++ b/deployment/kubernetes/config.json.template @@ -4,7 +4,10 @@ "port": "443", "protocol": "https", "logger" : { - "type": "console" + "dir": "./logs", + "maxFiles" : "7d", + "level" : "debug", + "morganOption" : null }, "subDomainCookies": false, "muteNotifications": false @@ -29,12 +32,14 @@ "mail": { "host" : "smtp", "port" : 465, - "user" : "foo@bar.com", + "user" : "${SMTP_USER}, "pass" : "${SMTP_PASSWORD}" }, "mongodb": { "hosts": ["mongodb"], "db": "openhab" + "user": "${MONGO_USER}", + "password": "${MONGO_PASSWORD}" }, "redis": { "host": "redis", @@ -45,7 +50,7 @@ "host" : "smtp", "port": 465, "secureConnection": true, - "user": "foo@bar.com", + "user": "${SMTP_USER}, "password": "${SMTP_PASSWORD}", "from": "openHAB Cloud " }, From a287ec4c6454937119c9c05c424c2f8858560309 Mon Sep 17 00:00:00 2001 From: mmastrorilli Date: Thu, 8 Oct 2020 23:22:32 +0200 Subject: [PATCH 11/12] storageclass Signed-off-by: mmastrorilli --- .../openhabcloud_ephemeral_k8_template.yml | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml b/deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml index abf13bb..323563b 100644 --- a/deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml +++ b/deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml @@ -71,6 +71,16 @@ items: org.openhab.cloud.service: redis status: loadBalancer: {} +- apiVersion: storage.k8s.io/v1 + kind: StorageClass + metadata: + name: MongoXFS + provisioner: kubernetes.io/gce-pd + parameters: + type: pd-standard + fstype: xfs + replication-type: none + reclaimPolicy: Retain - apiVersion: apps/v1 kind: Deployment metadata: @@ -115,7 +125,7 @@ items: org.openhab.cloud.service: app-1 status: {} - apiVersion: apps/v1 - kind: Deployment + kind: StatefulSet metadata: annotations: creationTimestamp: null @@ -143,15 +153,23 @@ items: resources: {} volumeMounts: - mountPath: /data/db - name: mongodb-empty0 + name: mongodb-xfs - mountPath: /data/configdb name: mongodb-empty1 restartPolicy: Always volumes: - - emptyDir: {} - name: mongodb-empty0 - emptyDir: {} name: mongodb-empty1 + volumeClaimTemplates: + - metadata: + name: mongodb-xfs + spec: + storageClassName: MongoXFS + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 10Gi selector: matchLabels: org.openhab.cloud.service: mongodb From e8490238995b41e55d04fef36d2fdf1f87eca2b9 Mon Sep 17 00:00:00 2001 From: mmastrorilli Date: Fri, 9 Oct 2020 02:04:42 +0200 Subject: [PATCH 12/12] persistent storage mongodb Signed-off-by: mmastrorilli --- deployment/kubernetes/config.json.template | 6 ++-- .../openhabcloud_ephemeral_k8_template.yml | 34 ++++++++++--------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/deployment/kubernetes/config.json.template b/deployment/kubernetes/config.json.template index a09d854..3ccf48f 100644 --- a/deployment/kubernetes/config.json.template +++ b/deployment/kubernetes/config.json.template @@ -32,12 +32,12 @@ "mail": { "host" : "smtp", "port" : 465, - "user" : "${SMTP_USER}, + "user" : "${SMTP_USER}", "pass" : "${SMTP_PASSWORD}" }, "mongodb": { "hosts": ["mongodb"], - "db": "openhab" + "db": "openhab", "user": "${MONGO_USER}", "password": "${MONGO_PASSWORD}" }, @@ -50,7 +50,7 @@ "host" : "smtp", "port": 465, "secureConnection": true, - "user": "${SMTP_USER}, + "user": "${SMTP_USER}", "password": "${SMTP_PASSWORD}", "from": "openHAB Cloud " }, diff --git a/deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml b/deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml index 323563b..8981ab4 100644 --- a/deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml +++ b/deployment/kubernetes/openhabcloud_ephemeral_k8_template.yml @@ -74,11 +74,11 @@ items: - apiVersion: storage.k8s.io/v1 kind: StorageClass metadata: - name: MongoXFS + name: storageclass-mongo provisioner: kubernetes.io/gce-pd parameters: type: pd-standard - fstype: xfs + fstype: ext4 replication-type: none reclaimPolicy: Retain - apiVersion: apps/v1 @@ -133,9 +133,8 @@ items: org.openhab.cloud.service: mongodb name: mongodb spec: + serviceName: "mongodb" replicas: 1 - strategy: - type: Recreate template: metadata: creationTimestamp: null @@ -153,27 +152,30 @@ items: resources: {} volumeMounts: - mountPath: /data/db - name: mongodb-xfs + name: mongodb-vc - mountPath: /data/configdb name: mongodb-empty1 restartPolicy: Always volumes: - emptyDir: {} name: mongodb-empty1 - volumeClaimTemplates: - - metadata: - name: mongodb-xfs - spec: - storageClassName: MongoXFS - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 10Gi + securityContext: + fsGroup: 2000 + volumeClaimTemplates: + - metadata: + name: mongodb-vc + spec: + storageClassName: storageclass-mongo + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 10Gi selector: matchLabels: org.openhab.cloud.service: mongodb - status: {} + status: + replicas: 1 - apiVersion: apps/v1 kind: Deployment metadata: