From 980a69caa537e70b1af717df493fdd984d16266d Mon Sep 17 00:00:00 2001 From: ace Date: Fri, 12 Feb 2021 17:06:25 +0300 Subject: [PATCH] cleanup ingress in roles --- roles/adguard-home/defaults/main.yaml | 2 -- roles/bitwarden/defaults/main.yaml | 2 -- roles/chartmuseum/defaults/main.yaml | 4 ---- roles/drone/defaults/main.yaml | 2 -- roles/gitea/defaults/main.yaml | 2 -- roles/nextcloud/defaults/main.yaml | 2 -- roles/peertube/defaults/main.yaml | 2 -- roles/playmaker/defaults/main.yaml | 2 -- roles/postgres/defaults/main.yaml | 2 -- roles/pypiserver/defaults/main.yaml | 2 -- roles/registry/defaults/main.yaml | 4 ---- roles/roundcube/defaults/main.yaml | 2 -- roles/wikijs/defaults/main.yaml | 4 ---- 13 files changed, 32 deletions(-) diff --git a/roles/adguard-home/defaults/main.yaml b/roles/adguard-home/defaults/main.yaml index 18a78dc..f9986dd 100644 --- a/roles/adguard-home/defaults/main.yaml +++ b/roles/adguard-home/defaults/main.yaml @@ -173,8 +173,6 @@ adguard_default_values: ingress: enabled: true annotations: - cert-manager.io/acme-challenge-type: dns01 - cert-manager.io/acme-dns01-provider: rfc2136 cert-manager.io/cluster-issuer: letsencrypt-prod kubernetes.io/ingress.class: "{{ external_ingress_class if adguard_publish else internal_ingress_class }}" kubernetes.io/tls-acme: "true" diff --git a/roles/bitwarden/defaults/main.yaml b/roles/bitwarden/defaults/main.yaml index bf61774..2fd0872 100644 --- a/roles/bitwarden/defaults/main.yaml +++ b/roles/bitwarden/defaults/main.yaml @@ -82,8 +82,6 @@ bitwarden_default_values: annotations: kubernetes.io/ingress.class: "{{ external_ingress_class if bitwarden_publish else internal_ingress_class }}" cert-manager.io/cluster-issuer: "letsencrypt-prod" - cert-manager.io/acme-dns01-provider: "rfc2136" - cert-manager.io/acme-challenge-type: "dns01" kubernetes.io/tls-acme: "true" hosts: - host: "{{ bitwarden_short_name }}.{{ domain }}" diff --git a/roles/chartmuseum/defaults/main.yaml b/roles/chartmuseum/defaults/main.yaml index 6e1e8c7..32ce6ae 100644 --- a/roles/chartmuseum/defaults/main.yaml +++ b/roles/chartmuseum/defaults/main.yaml @@ -43,8 +43,6 @@ chartmuseum_default_values: enabled: true annotations: cert-manager.io/cluster-issuer: "letsencrypt-prod" - cert-manager.io/acme-dns01-provider: "rfc2136" - cert-manager.io/acme-challenge-type: "dns01" kubernetes.io/ingress.class: "{{ external_ingress_class if chartmuseum_publish else internal_ingress_class }}" kubernetes.io/tls-acme: "true" hosts: @@ -58,8 +56,6 @@ chartmuseum_readonly_ingress_definition: | kind: Ingress metadata: annotations: - cert-manager.io/acme-challenge-type: dns01 - cert-manager.io/acme-dns01-provider: rfc2136 cert-manager.io/cluster-issuer: letsencrypt-prod kubernetes.io/ingress.class: "{{ external_ingress_class }}" nginx.ingress.kubernetes.io/proxy-body-size: "0" diff --git a/roles/drone/defaults/main.yaml b/roles/drone/defaults/main.yaml index 7f5c65f..9e27f40 100644 --- a/roles/drone/defaults/main.yaml +++ b/roles/drone/defaults/main.yaml @@ -11,8 +11,6 @@ drone_default_values: annotations: kubernetes.io/ingress.class: "{{ external_ingress_class if drone_publish else internal_ingress_class }}" cert-manager.io/cluster-issuer: "letsencrypt-prod" - cert-manager.io/acme-dns01-provider: "rfc2136" - cert-manager.io/acme-challenge-type: "dns01" hosts: - host: "{{ drone_short_name }}.{{ domain }}" paths: diff --git a/roles/gitea/defaults/main.yaml b/roles/gitea/defaults/main.yaml index 7948693..2302c50 100644 --- a/roles/gitea/defaults/main.yaml +++ b/roles/gitea/defaults/main.yaml @@ -14,8 +14,6 @@ gitea_default_values: enabled: true annotations: cert-manager.io/cluster-issuer: "letsencrypt-prod" - cert-manager.io/acme-dns01-provider: "rfc2136" - cert-manager.io/acme-challenge-type: "dns01" nginx.ingress.kubernetes.io/proxy-body-size: "0" nginx.ingress.kubernetes.io/proxy-read-timeout: "600" nginx.ingress.kubernetes.io/proxy-send-timeout: "600" diff --git a/roles/nextcloud/defaults/main.yaml b/roles/nextcloud/defaults/main.yaml index 763bbcc..9a97087 100644 --- a/roles/nextcloud/defaults/main.yaml +++ b/roles/nextcloud/defaults/main.yaml @@ -7,8 +7,6 @@ nextcloud_default_values: enabled: true annotations: cert-manager.io/cluster-issuer: "letsencrypt-prod" - cert-manager.io/acme-dns01-provider: "rfc2136" - cert-manager.io/acme-challenge-type: "dns01" kubernetes.io/ingress.class: "{{ external_ingress_class if nextcloud_publish else internal_ingress_class }}" nginx.ingress.kubernetes.io/proxy-body-size: "0" nginx.ingress.kubernetes.io/proxy-read-timeout: "600" diff --git a/roles/peertube/defaults/main.yaml b/roles/peertube/defaults/main.yaml index 1a31201..5c447e2 100644 --- a/roles/peertube/defaults/main.yaml +++ b/roles/peertube/defaults/main.yaml @@ -421,8 +421,6 @@ peertube_default_values: ingress: enabled: true annotations: - cert-manager.io/acme-challenge-type: dns01 - cert-manager.io/acme-dns01-provider: rfc2136 cert-manager.io/cluster-issuer: letsencrypt-prod kubernetes.io/ingress.class: "{{ external_ingress_class if peertube_publish else internal_ingress_class }}" kubernetes.io/tls-acme: "true" diff --git a/roles/playmaker/defaults/main.yaml b/roles/playmaker/defaults/main.yaml index a267e5b..3c3cd9d 100644 --- a/roles/playmaker/defaults/main.yaml +++ b/roles/playmaker/defaults/main.yaml @@ -59,8 +59,6 @@ playmaker_default_values: annotations: kubernetes.io/ingress.class: "{{ external_ingress_class if playmaker_publish else internal_ingress_class }}" cert-manager.io/cluster-issuer: "letsencrypt-prod" - cert-manager.io/acme-dns01-provider: "rfc2136" - cert-manager.io/acme-challenge-type: "dns01" kubernetes.io/tls-acme: "true" hosts: - host: "{{ playmaker_short_name }}.{{ domain }}" diff --git a/roles/postgres/defaults/main.yaml b/roles/postgres/defaults/main.yaml index db413fc..79d6ca5 100644 --- a/roles/postgres/defaults/main.yaml +++ b/roles/postgres/defaults/main.yaml @@ -31,8 +31,6 @@ postgres_operator_ui_default_values: enabled: true annotations: cert-manager.io/cluster-issuer: "letsencrypt-prod" - cert-manager.io/acme-dns01-provider: "rfc2136" - cert-manager.io/acme-challenge-type: "dns01" kubernetes.io/ingress.class: "{{ postgres_operator_ui_ingress_class | default(internal_ingress_class) }}" hosts: - host: "{{ postgres_operator_ui_short_name }}.{{ domain }}" diff --git a/roles/pypiserver/defaults/main.yaml b/roles/pypiserver/defaults/main.yaml index a164160..f35af5c 100644 --- a/roles/pypiserver/defaults/main.yaml +++ b/roles/pypiserver/defaults/main.yaml @@ -29,8 +29,6 @@ pypiserver_default_values: annotations: kubernetes.io/ingress.class: "{{ external_ingress_class if registry_publish else internal_ingress_class }}" cert-manager.io/cluster-issuer: "letsencrypt-prod" - cert-manager.io/acme-dns01-provider: "rfc2136" - cert-manager.io/acme-challenge-type: "dns01" nginx.ingress.kubernetes.io/proxy-body-size: "0" nginx.ingress.kubernetes.io/proxy-read-timeout: "600" nginx.ingress.kubernetes.io/proxy-send-timeout: "600" diff --git a/roles/registry/defaults/main.yaml b/roles/registry/defaults/main.yaml index 1897c38..a064c29 100644 --- a/roles/registry/defaults/main.yaml +++ b/roles/registry/defaults/main.yaml @@ -9,8 +9,6 @@ registry_default_values: annotations: kubernetes.io/ingress.class: "{{ external_ingress_class if registry_publish else internal_ingress_class }}" cert-manager.io/cluster-issuer: "letsencrypt-prod" - cert-manager.io/acme-dns01-provider: "rfc2136" - cert-manager.io/acme-challenge-type: "dns01" nginx.ingress.kubernetes.io/proxy-body-size: "0" nginx.ingress.kubernetes.io/proxy-read-timeout: "600" nginx.ingress.kubernetes.io/proxy-send-timeout: "600" @@ -31,8 +29,6 @@ registry_readonly_ingress_definition: | kind: Ingress metadata: annotations: - cert-manager.io/acme-challenge-type: dns01 - cert-manager.io/acme-dns01-provider: rfc2136 cert-manager.io/cluster-issuer: letsencrypt-prod kubernetes.io/ingress.class: "{{ external_ingress_class }}" nginx.ingress.kubernetes.io/proxy-body-size: "0" diff --git a/roles/roundcube/defaults/main.yaml b/roles/roundcube/defaults/main.yaml index 7f7927d..1143a9b 100644 --- a/roles/roundcube/defaults/main.yaml +++ b/roles/roundcube/defaults/main.yaml @@ -32,8 +32,6 @@ roundcube_default_values: enabled: true annotations: cert-manager.io/cluster-issuer: "letsencrypt-prod" - cert-manager.io/acme-dns01-provider: "rfc2136" - cert-manager.io/acme-challenge-type: "dns01" kubernetes.io/ingress.class: "{{ external_ingress_class if roundcube_publish else internal_ingress_class }}" kubernetes.io/tls-acme: "true" nginx.ingress.kubernetes.io/proxy-body-size: "0" diff --git a/roles/wikijs/defaults/main.yaml b/roles/wikijs/defaults/main.yaml index ad9e60a..361bd44 100644 --- a/roles/wikijs/defaults/main.yaml +++ b/roles/wikijs/defaults/main.yaml @@ -8,8 +8,6 @@ wikijs_default_values: enabled: true annotations: cert-manager.io/cluster-issuer: "letsencrypt-prod" - cert-manager.io/acme-dns01-provider: "rfc2136" - cert-manager.io/acme-challenge-type: "dns01" kubernetes.io/ingress.class: "{{ external_ingress_class if wikijs_publish else internal_ingress_class }}" hosts: - host: "{{ wikijs_short_name }}.{{ domain }}" @@ -31,8 +29,6 @@ wikijs_readonly_ingress_definition: | kind: Ingress metadata: annotations: - cert-manager.io/acme-challenge-type: dns01 - cert-manager.io/acme-dns01-provider: rfc2136 cert-manager.io/cluster-issuer: letsencrypt-prod kubernetes.io/ingress.class: "{{ external_ingress_class }}" nginx.ingress.kubernetes.io/proxy-body-size: "0"