From e6d78779fd6e6eafb91c823f99daa9083cf523a4 Mon Sep 17 00:00:00 2001 From: Moritz Graf Date: Tue, 15 Dec 2020 12:01:41 +0100 Subject: [PATCH] Adding current state --- bootstrap_hetzner/README.md | 2 +- k8s/README.md | 11 +++ k8s/monitoring/tankerkoenig.yml | 72 ++++++++++++++ terraform/ovh.tf | 61 +++++++++++- terraform/terraform.tfstate | 145 ++++++++++++++++++----------- terraform/terraform.tfstate.backup | 119 ++++++++++------------- 6 files changed, 281 insertions(+), 129 deletions(-) create mode 100644 k8s/monitoring/tankerkoenig.yml diff --git a/bootstrap_hetzner/README.md b/bootstrap_hetzner/README.md index 861320d..ecc9fe2 100644 --- a/bootstrap_hetzner/README.md +++ b/bootstrap_hetzner/README.md @@ -73,7 +73,7 @@ Check the current default value of `kube_version` in cloned repository. ```sh cd kubespray -ansible-playbook -i inventory/prod/inventory.ini -e kube_version=v1.18.8 -e upgrade_cluster_setup=true cluster.yml +ansible-playbook -i inventory/prod/inventory.ini -e kube_version=v1.19.4 -e upgrade_cluster_setup=true cluster.yml # or just the newest version ansible-playbook -i inventory/prod/inventory.ini -e upgrade_cluster_setup=true cluster.yml # upgrade to specific calico version (did not trigger/ failed) diff --git a/k8s/README.md b/k8s/README.md index d9a0d4a..b3d0483 100644 --- a/k8s/README.md +++ b/k8s/README.md @@ -200,6 +200,17 @@ Implement metrics-server: kubectl apply -n kube-system -f kube-system/metrics-server.yml ``` +## ameliegraf + +Note: Not yet finished. Switched back to portfolio adresses. + +The website redirection for [ameliegraf.de](ameliegraf.de). + +```sh +k create ns ameliegraf +k apply -f ameliegraf/ameliegraf.yml +``` + ## Tekton Implementation as described [in the docs](https://tekton.dev/docs/getting-started/). diff --git a/k8s/monitoring/tankerkoenig.yml b/k8s/monitoring/tankerkoenig.yml new file mode 100644 index 0000000..5bff495 --- /dev/null +++ b/k8s/monitoring/tankerkoenig.yml @@ -0,0 +1,72 @@ +--- +#docker run -p9386:9386/tcp --env-file=.env lukasmalkmus/tankerkoenig-exporter:v0.9.1 --api.stations="51d4b55e-a095-1aa0-e100-80009459e03a" +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + app: tankerkoenig-exporter + name: tankerkoenig-exporter + namespace: monitoring +spec: + replicas: 1 + selector: + matchLabels: + app: tankerkoenig-exporter + strategy: {} + template: + metadata: + creationTimestamp: null + labels: + app: tankerkoenig-exporter + spec: + containers: + - image: lukasmalkmus/tankerkoenig-exporter:v0.9.1 + name: tankerkoenig-exporter + ports: + - containerPort: 9386 + resources: {} + args: + #- "--api.stations=42abbff3-bd8d-4e5c-a28e-91bca493030e" + - "--api.stations=51d4b64b-a095-1aa0-e100-80009459e03a" + #- "--api.stations=f8cbb0bd-2b53-4d08-828f-c3d004260cbe" + #- "--api.stations=4fdef6f5-6733-4e40-9f3a-ebc1de9871fa" + #- "--api.stations=e21a599a-55ef-4c57-af01-f98fbdd53793" + #- "--web.telemetry-path='/metrics'" + - "--log.level=debug" + env: + - name: TANKERKOENIG_API_KEY + value: 0376b4b4-5829-15a3-c391-15d8b20d3d4e + +--- +apiVersion: v1 +kind: Service +metadata: + labels: + app: tankerkoenig-exporter + name: tankerkoenig-exporter + namespace: monitoring +spec: + ports: + - name: tankerkoenig-exporter + port: 9386 + targetPort: 9386 + protocol: TCP + selector: + app: tankerkoenig-exporter +--- + +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: tankerkoenig-exporter + namespace: monitoring + labels: + app: tankerkoenig-exporter +spec: + selector: + matchLabels: + app: tankerkoenig-exporter + endpoints: + - port: "9386" + interval: 15m + scrapeTimeout: 3m \ No newline at end of file diff --git a/terraform/ovh.tf b/terraform/ovh.tf index c498852..5624315 100644 --- a/terraform/ovh.tf +++ b/terraform/ovh.tf @@ -10,6 +10,9 @@ locals { } ## old moritzgrafde +## => 91.121.84.190 +## super old docker compose host +## => 91.121.64.43 variable "subdomains_moritzgraf" { default = ["auth","prometheus","alertmanager","chat","mqtt", "cloud", @@ -80,7 +83,7 @@ variable "subdomains_haumdaucher" { # ## graf.me -> problems with domain variable "domains" { - default = [ "moritzgraf.de","haumdaucher.de","ameliegraf.de" + default = [ "moritzgraf.de","haumdaucher.de" ,"graf-fam.de","ianaa.art" ,"krassescheisse.de"] } @@ -103,6 +106,62 @@ resource "ovh_domain_zone_record" "haumdaucher_wildcard_domain" { target = "136.243.23.215" } +resource "ovh_domain_zone_record" "moritzgraf_wildcard_domain" { + zone = "moritzgraf.de" + subdomain = "*" + fieldtype = "A" + ttl = local.ttl + #target = "91.121.84.190" + target = "136.243.23.215" +} + +###################################### +## ameliegraf.de + +locals { + + # adobe + first = "151.101.128.119" + second = "151.101.192.119" +} + +resource "ovh_domain_zone_record" "ameliegraf_de_first" { + zone = "ameliegraf.de" + subdomain = "" + fieldtype = "A" + ttl = local.ttl + #target = "91.121.84.190" + target = local.first +} +resource "ovh_domain_zone_record" "ameliegraf_de_second" { + zone = "ameliegraf.de" + subdomain = "" + fieldtype = "A" + ttl = local.ttl + #target = "91.121.84.190" + target = local.second +} + +resource "ovh_domain_zone_record" "wildcard_ameliegraf_de_first" { + zone = "ameliegraf.de" + subdomain = "*" + fieldtype = "A" + ttl = local.ttl + #target = "91.121.84.190" + target = local.first +} +resource "ovh_domain_zone_record" "wildcard_ameliegraf_de_second" { + zone = "ameliegraf.de" + subdomain = "*" + fieldtype = "A" + ttl = local.ttl + #target = "91.121.84.190" + target = local.second +} + + +###################################### + resource "ovh_domain_zone_record" "mail_moritzgraf" { zone = "moritzgraf.de" diff --git a/terraform/terraform.tfstate b/terraform/terraform.tfstate index 53660ae..c884f1d 100644 --- a/terraform/terraform.tfstate +++ b/terraform/terraform.tfstate @@ -1,29 +1,56 @@ { "version": 4, "terraform_version": "0.13.3", - "serial": 163, + "serial": 180, "lineage": "8aff5d23-05f6-10eb-0ae6-1084c787677e", "outputs": {}, "resources": [ { "mode": "managed", "type": "ovh_domain_zone_record", - "name": "dkim_record", + "name": "ameliegraf_de_first", "provider": "provider[\"registry.terraform.io/ovh/ovh\"]", "instances": [ { - "index_key": "ameliegraf.de", "schema_version": 0, "attributes": { - "fieldtype": "TXT", - "id": "5106871408", - "subdomain": "dkim._domainkey", - "target": "v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDhnjYV76s63M4zVRTjVf5Z/fTO6Rq3o4DXg62FCgAxQOYB9ANXeBvUPokT+p5SgjGC8HwBYIzzwCTCS6sqHsy8NfnHU1xFH5NcY4LqTopVX//eYpPF+bTwarDVu/lcCxiX4cN84U1yL8lqf0sOJ7ubGlSeZ/SfM/Ppj7Wkh/kBOQIDAQAB", + "fieldtype": "A", + "id": "5159023749", + "subdomain": "", + "target": "151.101.128.119", "ttl": 60, "zone": "ameliegraf.de" }, "private": "bnVsbA==" - }, + } + ] + }, + { + "mode": "managed", + "type": "ovh_domain_zone_record", + "name": "ameliegraf_de_second", + "provider": "provider[\"registry.terraform.io/ovh/ovh\"]", + "instances": [ + { + "schema_version": 0, + "attributes": { + "fieldtype": "A", + "id": "5159023747", + "subdomain": "", + "target": "151.101.192.119", + "ttl": 60, + "zone": "ameliegraf.de" + }, + "private": "bnVsbA==" + } + ] + }, + { + "mode": "managed", + "type": "ovh_domain_zone_record", + "name": "dkim_record", + "provider": "provider[\"registry.terraform.io/ovh/ovh\"]", + "instances": [ { "index_key": "graf-fam.de", "schema_version": 0, @@ -97,19 +124,6 @@ "name": "dmarc_record", "provider": "provider[\"registry.terraform.io/ovh/ovh\"]", "instances": [ - { - "index_key": "ameliegraf.de", - "schema_version": 0, - "attributes": { - "fieldtype": "TXT", - "id": "5106871405", - "subdomain": "_dmarc", - "target": "v=DMARC1; p=reject; rua=none; ruf=mailto:admin@moritzgraf.de; adkim=s; aspf=s", - "ttl": 60, - "zone": "ameliegraf.de" - }, - "private": "bnVsbA==" - }, { "index_key": "graf-fam.de", "schema_version": 0, @@ -882,22 +896,29 @@ { "mode": "managed", "type": "ovh_domain_zone_record", - "name": "mx_records", + "name": "moritzgraf_wildcard_domain", "provider": "provider[\"registry.terraform.io/ovh/ovh\"]", "instances": [ { - "index_key": "ameliegraf.de", "schema_version": 0, "attributes": { - "fieldtype": "MX", - "id": "5106871399", - "subdomain": "", - "target": "10 mail.moritzgraf.de.", + "fieldtype": "A", + "id": "5159040750", + "subdomain": "*", + "target": "136.243.23.215", "ttl": 60, - "zone": "ameliegraf.de" + "zone": "moritzgraf.de" }, "private": "bnVsbA==" - }, + } + ] + }, + { + "mode": "managed", + "type": "ovh_domain_zone_record", + "name": "mx_records", + "provider": "provider[\"registry.terraform.io/ovh/ovh\"]", + "instances": [ { "index_key": "graf-fam.de", "schema_version": 0, @@ -991,19 +1012,6 @@ "name": "spf_record_spf", "provider": "provider[\"registry.terraform.io/ovh/ovh\"]", "instances": [ - { - "index_key": "ameliegraf.de", - "schema_version": 0, - "attributes": { - "fieldtype": "SPF", - "id": "5106871423", - "subdomain": "", - "target": "\"v=spf1 mx a:mail.moritzgraf.de -all\"", - "ttl": 600, - "zone": "ameliegraf.de" - }, - "private": "bnVsbA==" - }, { "index_key": "graf-fam.de", "schema_version": 0, @@ -1077,19 +1085,6 @@ "name": "spf_record_txt", "provider": "provider[\"registry.terraform.io/ovh/ovh\"]", "instances": [ - { - "index_key": "ameliegraf.de", - "schema_version": 0, - "attributes": { - "fieldtype": "TXT", - "id": "5106871434", - "subdomain": "", - "target": "v=spf1 mx a:mail.moritzgraf.de -all", - "ttl": 60, - "zone": "ameliegraf.de" - }, - "private": "bnVsbA==" - }, { "index_key": "graf-fam.de", "schema_version": 0, @@ -1156,6 +1151,46 @@ "private": "bnVsbA==" } ] + }, + { + "mode": "managed", + "type": "ovh_domain_zone_record", + "name": "wildcard_ameliegraf_de_first", + "provider": "provider[\"registry.terraform.io/ovh/ovh\"]", + "instances": [ + { + "schema_version": 0, + "attributes": { + "fieldtype": "A", + "id": "5159023750", + "subdomain": "*", + "target": "151.101.128.119", + "ttl": 60, + "zone": "ameliegraf.de" + }, + "private": "bnVsbA==" + } + ] + }, + { + "mode": "managed", + "type": "ovh_domain_zone_record", + "name": "wildcard_ameliegraf_de_second", + "provider": "provider[\"registry.terraform.io/ovh/ovh\"]", + "instances": [ + { + "schema_version": 0, + "attributes": { + "fieldtype": "A", + "id": "5159023748", + "subdomain": "*", + "target": "151.101.192.119", + "ttl": 60, + "zone": "ameliegraf.de" + }, + "private": "bnVsbA==" + } + ] } ] } diff --git a/terraform/terraform.tfstate.backup b/terraform/terraform.tfstate.backup index 978cc4b..6687f6b 100644 --- a/terraform/terraform.tfstate.backup +++ b/terraform/terraform.tfstate.backup @@ -1,29 +1,56 @@ { "version": 4, "terraform_version": "0.13.3", - "serial": 158, + "serial": 178, "lineage": "8aff5d23-05f6-10eb-0ae6-1084c787677e", "outputs": {}, "resources": [ { "mode": "managed", "type": "ovh_domain_zone_record", - "name": "dkim_record", + "name": "ameliegraf_de_first", "provider": "provider[\"registry.terraform.io/ovh/ovh\"]", "instances": [ { - "index_key": "ameliegraf.de", "schema_version": 0, "attributes": { - "fieldtype": "TXT", - "id": "5106871408", - "subdomain": "dkim._domainkey", - "target": "v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDhnjYV76s63M4zVRTjVf5Z/fTO6Rq3o4DXg62FCgAxQOYB9ANXeBvUPokT+p5SgjGC8HwBYIzzwCTCS6sqHsy8NfnHU1xFH5NcY4LqTopVX//eYpPF+bTwarDVu/lcCxiX4cN84U1yL8lqf0sOJ7ubGlSeZ/SfM/Ppj7Wkh/kBOQIDAQAB", + "fieldtype": "A", + "id": "5159023749", + "subdomain": "", + "target": "151.101.128.119", "ttl": 60, "zone": "ameliegraf.de" }, "private": "bnVsbA==" - }, + } + ] + }, + { + "mode": "managed", + "type": "ovh_domain_zone_record", + "name": "ameliegraf_de_second", + "provider": "provider[\"registry.terraform.io/ovh/ovh\"]", + "instances": [ + { + "schema_version": 0, + "attributes": { + "fieldtype": "A", + "id": "5159023747", + "subdomain": "", + "target": "151.101.192.119", + "ttl": 60, + "zone": "ameliegraf.de" + }, + "private": "bnVsbA==" + } + ] + }, + { + "mode": "managed", + "type": "ovh_domain_zone_record", + "name": "dkim_record", + "provider": "provider[\"registry.terraform.io/ovh/ovh\"]", + "instances": [ { "index_key": "graf-fam.de", "schema_version": 0, @@ -97,19 +124,6 @@ "name": "dmarc_record", "provider": "provider[\"registry.terraform.io/ovh/ovh\"]", "instances": [ - { - "index_key": "ameliegraf.de", - "schema_version": 0, - "attributes": { - "fieldtype": "TXT", - "id": "5106871405", - "subdomain": "_dmarc", - "target": "v=DMARC1; p=reject; rua=none; ruf=mailto:admin@moritzgraf.de; adkim=s; aspf=s", - "ttl": 60, - "zone": "ameliegraf.de" - }, - "private": "bnVsbA==" - }, { "index_key": "graf-fam.de", "schema_version": 0, @@ -510,7 +524,7 @@ "fieldtype": "A", "id": "5106870709", "subdomain": "mail", - "target": "91.121.64.43", + "target": "136.243.23.215", "ttl": 60, "zone": "moritzgraf.de" }, @@ -530,7 +544,7 @@ "fieldtype": "A", "id": "5118726203", "subdomain": "", - "target": "91.121.64.43", + "target": "136.243.23.215", "ttl": 60, "zone": "moritzgraf.de" }, @@ -885,19 +899,6 @@ "name": "mx_records", "provider": "provider[\"registry.terraform.io/ovh/ovh\"]", "instances": [ - { - "index_key": "ameliegraf.de", - "schema_version": 0, - "attributes": { - "fieldtype": "MX", - "id": "5106871399", - "subdomain": "", - "target": "10 mail.moritzgraf.de.", - "ttl": 60, - "zone": "ameliegraf.de" - }, - "private": "bnVsbA==" - }, { "index_key": "graf-fam.de", "schema_version": 0, @@ -991,19 +992,6 @@ "name": "spf_record_spf", "provider": "provider[\"registry.terraform.io/ovh/ovh\"]", "instances": [ - { - "index_key": "ameliegraf.de", - "schema_version": 0, - "attributes": { - "fieldtype": "SPF", - "id": "5106871423", - "subdomain": "", - "target": "\"v=spf1 mx a:mail.moritzgraf.de -all\"", - "ttl": 600, - "zone": "ameliegraf.de" - }, - "private": "bnVsbA==" - }, { "index_key": "graf-fam.de", "schema_version": 0, @@ -1077,19 +1065,6 @@ "name": "spf_record_txt", "provider": "provider[\"registry.terraform.io/ovh/ovh\"]", "instances": [ - { - "index_key": "ameliegraf.de", - "schema_version": 0, - "attributes": { - "fieldtype": "TXT", - "id": "5106871434", - "subdomain": "", - "target": "v=spf1 mx a:mail.moritzgraf.de -all", - "ttl": 60, - "zone": "ameliegraf.de" - }, - "private": "bnVsbA==" - }, { "index_key": "graf-fam.de", "schema_version": 0, @@ -1160,18 +1135,18 @@ { "mode": "managed", "type": "ovh_domain_zone_record", - "name": "three", + "name": "wildcard_ameliegraf_de_first", "provider": "provider[\"registry.terraform.io/ovh/ovh\"]", "instances": [ { "schema_version": 0, "attributes": { "fieldtype": "A", - "id": "5114515102", - "subdomain": "three", - "target": "37.59.61.198", + "id": "5159023750", + "subdomain": "*", + "target": "151.101.128.119", "ttl": 60, - "zone": "haumdaucher.de" + "zone": "ameliegraf.de" }, "private": "bnVsbA==" } @@ -1180,18 +1155,18 @@ { "mode": "managed", "type": "ovh_domain_zone_record", - "name": "two", + "name": "wildcard_ameliegraf_de_second", "provider": "provider[\"registry.terraform.io/ovh/ovh\"]", "instances": [ { "schema_version": 0, "attributes": { "fieldtype": "A", - "id": "5114515101", - "subdomain": "two", - "target": "37.59.40.95", + "id": "5159023748", + "subdomain": "*", + "target": "151.101.192.119", "ttl": 60, - "zone": "haumdaucher.de" + "zone": "ameliegraf.de" }, "private": "bnVsbA==" }