cleanup ingress in roles

2021-02-12 17:06:25 +03:00 · 2021-02-12 17:06:25 +03:00 · 980a69caa5
commit 980a69caa5
parent a1210f7406
13 changed files with 0 additions and 32 deletions
--- 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"
--- 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 }}"
--- 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"
--- 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:
--- 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"
--- 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"
--- 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"
--- 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 }}"
--- 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 }}"
--- 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"
--- 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"
--- 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"
--- 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"