From 38e2091c0066ab57ad461af09abe4f979d4646ee Mon Sep 17 00:00:00 2001 From: Moritz Graf Date: Mon, 18 May 2020 22:12:38 +0200 Subject: [PATCH] Add current state --- k8s/README.md | 19 ++++++++- k8s/datalab/mopbot.yaml | 2 +- k8s/datalab/rstudio.yaml | 2 +- terraform/ovh.tf | 10 ++++- terraform/terraform.tfstate | 22 ++++++++++- terraform/terraform.tfstate.backup | 63 +++++++++++++++++------------- 6 files changed, 85 insertions(+), 33 deletions(-) diff --git a/k8s/README.md b/k8s/README.md index b1bf69b..56a15f6 100644 --- a/k8s/README.md +++ b/k8s/README.md @@ -27,7 +27,7 @@ kubectl patch deployment $DEPLOYMENT -n $NAMESPACE -p "{\"spec\": {\"template\": ## namespaces ```sh -namespaces="flux cert-manager nginx-ingress infrapuzzle kuard auth nextcloud datalab web development tt-rss backup monitoring nextcloud" +namespaces="flux cert-manager nginx-ingress infrapuzzle kuard auth nextcloud datalab web development tt-rss backup monitoring nextcloud mailu" for i in $( echo $NAMESPACES ) ; do k create ns $i done @@ -40,6 +40,7 @@ helm repo add stable https://kubernetes-charts.storage.googleapis.com helm repo add jetstack https://charts.jetstack.io helm repo add bitnami https://charts.bitnami.com/bitnami helm repo add k8s-land https://charts.k8s.land +helm repo add mailu https://mailu.github.io/helm-charts/ helm repo update ``` @@ -194,7 +195,23 @@ helm upgrade --install nextcloud-phpmyadmin bitnami/phpmyadmin -n nextcloud -f n ### backup & restore +## mailu +Using the [mailu helm chart](https://github.com/Mailu/helm-charts/tree/master/mailu). + +```sh +helm repo add mailu https://mailu.github.io/helm-charts/ +helm repo update +helm upgrade --install mailu mailu/mailu -n mailu -f mailu/mailu.secret.yml +``` + +### troubleshooting + +Test imap from console: + +```sh +openssl s_client -crlf -connect moritzgraf.de:993 +``` ## minio diff --git a/k8s/datalab/mopbot.yaml b/k8s/datalab/mopbot.yaml index 756b31d..38439f2 100644 --- a/k8s/datalab/mopbot.yaml +++ b/k8s/datalab/mopbot.yaml @@ -25,7 +25,7 @@ spec: name: mopbot resources: limits: - cpu: "500m" + cpu: "50m" memory: "128Mi" env: - name: API_KEY_OWA diff --git a/k8s/datalab/rstudio.yaml b/k8s/datalab/rstudio.yaml index 98f9279..d82aedd 100644 --- a/k8s/datalab/rstudio.yaml +++ b/k8s/datalab/rstudio.yaml @@ -29,7 +29,7 @@ spec: cpu: "2" memory: "2Gi" requests: - cpu: "200m" + cpu: "50m" memory: "500Mi" volumeMounts: - name: work diff --git a/terraform/ovh.tf b/terraform/ovh.tf index 11df989..5e5e16a 100644 --- a/terraform/ovh.tf +++ b/terraform/ovh.tf @@ -120,7 +120,15 @@ resource "ovh_domain_zone_record" "mail_moritzgraf" { subdomain = "mail" fieldtype = "A" ttl = local.ttl - target = "91.121.64.43" + target = "91.121.64.43" # old + #target = "91.121.84.190" # new +} +resource "ovh_domain_zone_record" "moritzgraf" { + zone = "moritzgraf.de" + fieldtype = "A" + ttl = local.ttl + target = "91.121.64.43" # old + #target = "91.121.84.190" # new } diff --git a/terraform/terraform.tfstate b/terraform/terraform.tfstate index 5117fcb..f2c9e1b 100644 --- a/terraform/terraform.tfstate +++ b/terraform/terraform.tfstate @@ -1,7 +1,7 @@ { "version": 4, "terraform_version": "0.12.24", - "serial": 121, + "serial": 131, "lineage": "8aff5d23-05f6-10eb-0ae6-1084c787677e", "outputs": {}, "resources": [ @@ -547,6 +547,26 @@ } ] }, + { + "mode": "managed", + "type": "ovh_domain_zone_record", + "name": "moritzgraf", + "provider": "provider.ovh", + "instances": [ + { + "schema_version": 0, + "attributes": { + "fieldtype": "A", + "id": "5118726203", + "subdomain": "", + "target": "91.121.64.43", + "ttl": 60, + "zone": "moritzgraf.de" + }, + "private": "bnVsbA==" + } + ] + }, { "mode": "managed", "type": "ovh_domain_zone_record", diff --git a/terraform/terraform.tfstate.backup b/terraform/terraform.tfstate.backup index 9f17038..834bc73 100644 --- a/terraform/terraform.tfstate.backup +++ b/terraform/terraform.tfstate.backup @@ -1,7 +1,7 @@ { "version": 4, "terraform_version": "0.12.24", - "serial": 117, + "serial": 128, "lineage": "8aff5d23-05f6-10eb-0ae6-1084c787677e", "outputs": {}, "resources": [ @@ -317,19 +317,6 @@ }, "private": "bnVsbA==" }, - { - "index_key": "git", - "schema_version": 0, - "attributes": { - "fieldtype": "CNAME", - "id": "5113532220", - "subdomain": "git", - "target": "krassescheisse.de.", - "ttl": 60, - "zone": "krassescheisse.de" - }, - "private": "bnVsbA==" - }, { "index_key": "grafana", "schema_version": 0, @@ -552,7 +539,27 @@ "fieldtype": "A", "id": "5106870709", "subdomain": "mail", - "target": "91.121.64.43", + "target": "91.121.84.190", + "ttl": 60, + "zone": "moritzgraf.de" + }, + "private": "bnVsbA==" + } + ] + }, + { + "mode": "managed", + "type": "ovh_domain_zone_record", + "name": "moritzgraf", + "provider": "provider.ovh", + "instances": [ + { + "schema_version": 0, + "attributes": { + "fieldtype": "A", + "id": "5118726203", + "subdomain": "", + "target": "91.121.84.190", "ttl": 60, "zone": "moritzgraf.de" }, @@ -632,19 +639,6 @@ }, "private": "bnVsbA==" }, - { - "index_key": "git", - "schema_version": 0, - "attributes": { - "fieldtype": "CNAME", - "id": "5106870436", - "subdomain": "git", - "target": "moritzgraf.de.", - "ttl": 60, - "zone": "moritzgraf.de" - }, - "private": "bnVsbA==" - }, { "index_key": "grafana", "schema_version": 0, @@ -888,6 +882,19 @@ }, "private": "bnVsbA==" }, + { + "index_key": "git", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5116593521", + "subdomain": "git", + "target": "haumdaucher.de.", + "ttl": 60, + "zone": "moritzgraf.de" + }, + "private": "bnVsbA==" + }, { "index_key": "tt-rss", "schema_version": 0,