diff --git a/k8s/tt-rss/tt-rss-mariadb.secret.yaml b/k8s/tt-rss/tt-rss-mariadb.secret.yaml index 31f7948..83e142d 100644 Binary files a/k8s/tt-rss/tt-rss-mariadb.secret.yaml and b/k8s/tt-rss/tt-rss-mariadb.secret.yaml differ diff --git a/k8s/tt-rss/tt-rss-phpmyadmin.yaml b/k8s/tt-rss/tt-rss-phpmyadmin.yaml new file mode 100644 index 0000000..0607edc --- /dev/null +++ b/k8s/tt-rss/tt-rss-phpmyadmin.yaml @@ -0,0 +1,26 @@ +--- +apiVersion: helm.fluxcd.io/v1 +kind: HelmRelease +metadata: + name: helm-tt-rss-phpmyadmin + namespace: flux +spec: + releaseName: tt-rss-phpmyadmin + targetNamespace: tt-rss + chart: + repository: https://charts.bitnami.com/bitnami + version: 5.0.0 + name: phpmyadmin + values: + db: + host: tt-rss-mariadb + ingress: + enabled: true + hosts: + - path: "/" + tls: true + name: "tt-rss.phpmyadmin.haumdaucher.de" + tlsSecret: "tt-rss-phpmyadmin-haumdaucher-de" + annotations: + cert-manager.io/cluster-issuer: "letsencrypt-prod" + nginx.ingress.kubernetes.io/proxy-body-size: "0" \ No newline at end of file diff --git a/terraform/ovh.tf b/terraform/ovh.tf index da0cbaf..96646ed 100644 --- a/terraform/ovh.tf +++ b/terraform/ovh.tf @@ -9,10 +9,12 @@ locals { ttl = "60" } +## old moritzgrafde + variable "subdomains_moritzgraf" { default = ["git","auth","prometheus","alertmanager","chat","mqtt", "cloud", "monitoring","smtp","pop3","imap","jaeger","ldap","code","hub", - "grafana","tt-rss","phpmyadmin","phppgadmin","www","rstudio","code" ] + "grafana","phpmyadmin","webapp","kc","phppgadmin","www","rstudio","code" ] } resource "ovh_domain_zone_record" "moritzgraf_subdomains" { @@ -24,8 +26,11 @@ resource "ovh_domain_zone_record" "moritzgraf_subdomains" { target = "moritzgraf.de." } + +## new haumdaucher k8s + variable "subdomains_moritzgraf_k8s" { - default = ["corona","corona-api" ] + default = ["corona","corona-api","tt-rss" ] } resource "ovh_domain_zone_record" "moritzgraf_subdomains_k8s" { @@ -37,6 +42,18 @@ resource "ovh_domain_zone_record" "moritzgraf_subdomains_k8s" { target = "haumdaucher.de." } +## krassescheisse + +resource "ovh_domain_zone_record" "krassescheisse_subdomains" { + for_each = toset( var.subdomains_moritzgraf ) + zone = "krassescheisse.de" + subdomain = each.key + fieldtype = "CNAME" + ttl = local.ttl + target = "krassescheisse.de." +} + + variable "subdomains_haumdaucher" { default = ["corona"] } diff --git a/terraform/terraform.tfstate b/terraform/terraform.tfstate index 33c9e1c..1df105d 100644 --- a/terraform/terraform.tfstate +++ b/terraform/terraform.tfstate @@ -1,7 +1,7 @@ { "version": 4, "terraform_version": "0.12.24", - "serial": 78, + "serial": 109, "lineage": "8aff5d23-05f6-10eb-0ae6-1084c787677e", "outputs": {}, "resources": [ @@ -245,6 +245,301 @@ } ] }, + { + "mode": "managed", + "type": "ovh_domain_zone_record", + "name": "krassescheisse_subdomains", + "each": "map", + "provider": "provider.ovh", + "instances": [ + { + "index_key": "alertmanager", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532212", + "subdomain": "alertmanager", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "auth", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532224", + "subdomain": "auth", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "chat", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532214", + "subdomain": "chat", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "cloud", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532215", + "subdomain": "cloud", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "code", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532228", + "subdomain": "code", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "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, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532218", + "subdomain": "grafana", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "hub", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532223", + "subdomain": "hub", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "imap", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532227", + "subdomain": "imap", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "jaeger", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532222", + "subdomain": "jaeger", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "kc", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113533002", + "subdomain": "kc", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "ldap", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532229", + "subdomain": "ldap", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "monitoring", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532226", + "subdomain": "monitoring", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "mqtt", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532213", + "subdomain": "mqtt", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "phpmyadmin", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532217", + "subdomain": "phpmyadmin", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "phppgadmin", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532231", + "subdomain": "phppgadmin", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "pop3", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532225", + "subdomain": "pop3", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "prometheus", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532230", + "subdomain": "prometheus", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "rstudio", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532221", + "subdomain": "rstudio", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "smtp", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532216", + "subdomain": "smtp", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "webapp", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113533005", + "subdomain": "webapp", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "www", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532219", + "subdomain": "www", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + } + ] + }, { "mode": "managed", "type": "ovh_domain_zone_record", @@ -402,6 +697,19 @@ }, "private": "bnVsbA==" }, + { + "index_key": "kc", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113533004", + "subdomain": "kc", + "target": "moritzgraf.de.", + "ttl": 60, + "zone": "moritzgraf.de" + }, + "private": "bnVsbA==" + }, { "index_key": "ldap", "schema_version": 0, @@ -520,12 +828,12 @@ "private": "bnVsbA==" }, { - "index_key": "tt-rss", + "index_key": "webapp", "schema_version": 0, "attributes": { "fieldtype": "CNAME", - "id": "5106870441", - "subdomain": "tt-rss", + "id": "5113533003", + "subdomain": "webapp", "target": "moritzgraf.de.", "ttl": 60, "zone": "moritzgraf.de" @@ -579,6 +887,19 @@ "zone": "moritzgraf.de" }, "private": "bnVsbA==" + }, + { + "index_key": "tt-rss", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113719565", + "subdomain": "tt-rss", + "target": "haumdaucher.de.", + "ttl": 60, + "zone": "moritzgraf.de" + }, + "private": "bnVsbA==" } ] }, diff --git a/terraform/terraform.tfstate.backup b/terraform/terraform.tfstate.backup index df70ab5..880ca0e 100644 --- a/terraform/terraform.tfstate.backup +++ b/terraform/terraform.tfstate.backup @@ -1,7 +1,7 @@ { "version": 4, "terraform_version": "0.12.24", - "serial": 73, + "serial": 105, "lineage": "8aff5d23-05f6-10eb-0ae6-1084c787677e", "outputs": {}, "resources": [ @@ -245,6 +245,314 @@ } ] }, + { + "mode": "managed", + "type": "ovh_domain_zone_record", + "name": "krassescheisse_subdomains", + "each": "map", + "provider": "provider.ovh", + "instances": [ + { + "index_key": "alertmanager", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532212", + "subdomain": "alertmanager", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "auth", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532224", + "subdomain": "auth", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "chat", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532214", + "subdomain": "chat", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "cloud", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532215", + "subdomain": "cloud", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "code", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532228", + "subdomain": "code", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "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, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532218", + "subdomain": "grafana", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "hub", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532223", + "subdomain": "hub", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "imap", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532227", + "subdomain": "imap", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "jaeger", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532222", + "subdomain": "jaeger", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "kc", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113533002", + "subdomain": "kc", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "ldap", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532229", + "subdomain": "ldap", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "monitoring", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532226", + "subdomain": "monitoring", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "mqtt", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532213", + "subdomain": "mqtt", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "phpmyadmin", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532217", + "subdomain": "phpmyadmin", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "phppgadmin", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532231", + "subdomain": "phppgadmin", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "pop3", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532225", + "subdomain": "pop3", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "prometheus", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532230", + "subdomain": "prometheus", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "rstudio", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532221", + "subdomain": "rstudio", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "smtp", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532216", + "subdomain": "smtp", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "tt-rss", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532232", + "subdomain": "tt-rss", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "webapp", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113533005", + "subdomain": "webapp", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "www", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113532219", + "subdomain": "www", + "target": "krassescheisse.de.", + "ttl": 60, + "zone": "krassescheisse.de" + }, + "private": "bnVsbA==" + } + ] + }, { "mode": "managed", "type": "ovh_domain_zone_record", @@ -337,32 +645,6 @@ }, "private": "bnVsbA==" }, - { - "index_key": "corona", - "schema_version": 0, - "attributes": { - "fieldtype": "CNAME", - "id": "5110384646", - "subdomain": "corona", - "target": "moritzgraf.de.", - "ttl": 60, - "zone": "moritzgraf.de" - }, - "private": "bnVsbA==" - }, - { - "index_key": "corona-api", - "schema_version": 0, - "attributes": { - "fieldtype": "CNAME", - "id": "5110478866", - "subdomain": "corona-api", - "target": "moritzgraf.de.", - "ttl": 60, - "zone": "moritzgraf.de" - }, - "private": "bnVsbA==" - }, { "index_key": "git", "schema_version": 0, @@ -428,6 +710,19 @@ }, "private": "bnVsbA==" }, + { + "index_key": "kc", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113533004", + "subdomain": "kc", + "target": "moritzgraf.de.", + "ttl": 60, + "zone": "moritzgraf.de" + }, + "private": "bnVsbA==" + }, { "index_key": "ldap", "schema_version": 0, @@ -558,6 +853,19 @@ }, "private": "bnVsbA==" }, + { + "index_key": "webapp", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113533003", + "subdomain": "webapp", + "target": "moritzgraf.de.", + "ttl": 60, + "zone": "moritzgraf.de" + }, + "private": "bnVsbA==" + }, { "index_key": "www", "schema_version": 0, @@ -573,6 +881,41 @@ } ] }, + { + "mode": "managed", + "type": "ovh_domain_zone_record", + "name": "moritzgraf_subdomains_k8s", + "each": "map", + "provider": "provider.ovh", + "instances": [ + { + "index_key": "corona", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113233478", + "subdomain": "corona", + "target": "haumdaucher.de.", + "ttl": 60, + "zone": "moritzgraf.de" + }, + "private": "bnVsbA==" + }, + { + "index_key": "corona-api", + "schema_version": 0, + "attributes": { + "fieldtype": "CNAME", + "id": "5113233479", + "subdomain": "corona-api", + "target": "haumdaucher.de.", + "ttl": 60, + "zone": "moritzgraf.de" + }, + "private": "bnVsbA==" + } + ] + }, { "mode": "managed", "type": "ovh_domain_zone_record",