From 6db00394ad4b2937c1e90b2428fbc42ff4016548 Mon Sep 17 00:00:00 2001
From: ace <ace@0xace.cc>
Date: Mon, 25 Jul 2022 22:10:41 +0300
Subject: [PATCH] ingress-nginx: bump to helm chart v4.2.0

external-dns: bump to helm chart v6.7.1
---
 .../ghp/sample/group_vars/all/versions.yaml    | 18 +++++++++---------
 .../external-ingress-nginx/defaults/main.yaml  |  2 ++
 roles/gitea/defaults/main.yaml                 |  3 +++
 .../internal-ingress-nginx/defaults/main.yaml  |  2 ++
 roles/local-ingress-nginx/defaults/main.yaml   |  4 ++--
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/inventory/ghp/sample/group_vars/all/versions.yaml b/inventory/ghp/sample/group_vars/all/versions.yaml
index 7db598e..1123c2b 100644
--- a/inventory/ghp/sample/group_vars/all/versions.yaml
+++ b/inventory/ghp/sample/group_vars/all/versions.yaml
@@ -9,15 +9,15 @@ nfs_client_provisioner_ssd_version: 4.0.14
 cert_manager_version: 1.8.2
 
 # External-DNS
-external_dns_version: 5.4.7
-local_dns_version: 5.4.7
-internal_dns_version: 5.4.7
-service_dns_version: 5.4.7
+external_dns_version: 6.7.1
+local_dns_version: 6.7.1
+internal_dns_version: 6.7.1
+service_dns_version: 6.7.1
 
 # Ingress Nginx
-external_ingress_nginx_version: 3.35.0
-internal_ingress_nginx_version: 3.35.0
-local_ingress_nginx_version: 3.35.0
+external_ingress_nginx_version: 4.2.0
+internal_ingress_nginx_version: 4.2.0
+local_ingress_nginx_version: 4.2.0
 
 # PostgreSQL operator
 postgres_operator_ui_version: 1.8.2
@@ -37,8 +37,8 @@ drone_version: 0.4.0
 drone_runner_kube_version: 0.1.9
 
 # Gitea
-gitea_ingress_nginx_version: 3.35.0
-gitea_dns_version: 5.4.7
+gitea_ingress_nginx_version: 4.2.0
+gitea_dns_version: 6.7.1
 gitea_version: 5.0.8
 
 # Docker and Helm chart registries
diff --git a/roles/external-ingress-nginx/defaults/main.yaml b/roles/external-ingress-nginx/defaults/main.yaml
index 32ac17a..c9e64c3 100644
--- a/roles/external-ingress-nginx/defaults/main.yaml
+++ b/roles/external-ingress-nginx/defaults/main.yaml
@@ -13,3 +13,5 @@ external_ingress_nginx_default_values:
       loadBalancerIP: "{{ external_loadbalancer_ip | default(omit) }}"
       externalTrafficPolicy: Local
     ingressClass: "{{ external_ingress_class }}"
+    ingressClassResource:
+      name: "{{ external_ingress_class }}"
diff --git a/roles/gitea/defaults/main.yaml b/roles/gitea/defaults/main.yaml
index 10b15d0..8312ba4 100644
--- a/roles/gitea/defaults/main.yaml
+++ b/roles/gitea/defaults/main.yaml
@@ -122,9 +122,12 @@ gitea_ingress_nginx_default_values:
         http: http
         https: https
     ingressClass: "{{ gitea_ingress_class }}"
+    ingressClassResource:
+      name: "{{ gitea_ingress_class }}"
   tcp: 
     22: "{{ gitea_namespace | default(namespace) }}/{{ namespace }}-gitea-ssh:22"
 
+
 gitea_dns_default_values:
   fullnameOverride: "{{ gitea_dns_name | default(namespace + '-gitea-internal-dns') }}"
   annotationFilter: "kubernetes.io/ingress.class={{ gitea_ingress_class }}"
diff --git a/roles/internal-ingress-nginx/defaults/main.yaml b/roles/internal-ingress-nginx/defaults/main.yaml
index 01987b4..598c872 100644
--- a/roles/internal-ingress-nginx/defaults/main.yaml
+++ b/roles/internal-ingress-nginx/defaults/main.yaml
@@ -7,3 +7,5 @@ internal_ingress_nginx_default_values:
     service:
       loadBalancerIP: "{{ internal_loadbalancer_ip | default(omit) }}"
     ingressClass: "{{ internal_ingress_class }}"
+    ingressClassResource:
+      name: "{{ internal_ingress_class }}"
diff --git a/roles/local-ingress-nginx/defaults/main.yaml b/roles/local-ingress-nginx/defaults/main.yaml
index 9ab993a..2fb6d13 100644
--- a/roles/local-ingress-nginx/defaults/main.yaml
+++ b/roles/local-ingress-nginx/defaults/main.yaml
@@ -7,5 +7,5 @@ local_ingress_nginx_default_values:
     service:
       loadBalancerIP: "{{ local_loadbalancer_ip | default(omit) }}"
     ingressClass: "{{ local_ingress_class }}"
-
-
+    ingressClassResource:
+      name: "{{ local_ingress_class }}"