From 8b187c6dc9442db5c87fcd84366ac701be64cf87 Mon Sep 17 00:00:00 2001
From: Keyvan <keyvan42@pm.me>
Date: Tue, 24 Sep 2024 11:42:13 +0200
Subject: [PATCH] [cc-schema-registry-proxy] Use ingressClassName instead of
 annotation

---
 charts/cc-schema-registry-proxy/Chart.yaml             | 2 +-
 charts/cc-schema-registry-proxy/README.md              | 5 +++--
 charts/cc-schema-registry-proxy/templates/ingress.yaml | 2 ++
 charts/cc-schema-registry-proxy/values.yaml            | 4 +++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/charts/cc-schema-registry-proxy/Chart.yaml b/charts/cc-schema-registry-proxy/Chart.yaml
index faed7369..59c409b5 100644
--- a/charts/cc-schema-registry-proxy/Chart.yaml
+++ b/charts/cc-schema-registry-proxy/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for Confluent Cloud schema registry proxy. This proxy service is used when RADAR-base platform is used with Confluent Cloud based schema registry. It forwards requests to schema registry with an additonal basic authentication header with Confluent Cloud schema registry credentials. This service will be enabled if `cc.enabled = true`.
 name: cc-schema-registry-proxy
-version: 0.3.0
+version: 0.3.1
 type: application
 home: "https://radar-base.org"
 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png"
diff --git a/charts/cc-schema-registry-proxy/README.md b/charts/cc-schema-registry-proxy/README.md
index 34f50047..bc6e31a4 100644
--- a/charts/cc-schema-registry-proxy/README.md
+++ b/charts/cc-schema-registry-proxy/README.md
@@ -3,7 +3,7 @@
 # cc-schema-registry-proxy
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/cc-schema-registry-proxy)](https://artifacthub.io/packages/helm/radar-base/cc-schema-registry-proxy)
 
-![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0](https://img.shields.io/badge/AppVersion-1.0-informational?style=flat-square)
+![Version: 0.3.1](https://img.shields.io/badge/Version-0.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0](https://img.shields.io/badge/AppVersion-1.0-informational?style=flat-square)
 
 A Helm chart for Confluent Cloud schema registry proxy. This proxy service is used when RADAR-base platform is used with Confluent Cloud based schema registry. It forwards requests to schema registry with an additonal basic authentication header with Confluent Cloud schema registry credentials. This service will be enabled if `cc.enabled = true`.
 
@@ -38,7 +38,8 @@ A Helm chart for Confluent Cloud schema registry proxy. This proxy service is us
 | ingress.enabled | bool | `true` | Enable ingress controller resource |
 | ingress.annotations | object | check values.yaml | Annotations that define default ingress class, certificate issuer |
 | ingress.path | string | `"/schema/?(.*)"` | Path within the url structure |
-| ingress.pathType | string | `"ImplementationSpecific"` |  |
+| ingress.pathType | string | `"ImplementationSpecific"` | Ingress Path type |
+| ingress.ingressClassName | string | `"nginx"` | IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+) |
 | ingress.hosts | list | `["localhost"]` | Hosts to accept requests from |
 | ingress.tls.secretName | string | `"radar-base-tls"` | TLS Secret Name |
 | cc.schemaRegistryApiKey | string | `"srApiKey"` | Confluent cloud schema registry API key |
diff --git a/charts/cc-schema-registry-proxy/templates/ingress.yaml b/charts/cc-schema-registry-proxy/templates/ingress.yaml
index a79065cd..06b84aff 100644
--- a/charts/cc-schema-registry-proxy/templates/ingress.yaml
+++ b/charts/cc-schema-registry-proxy/templates/ingress.yaml
@@ -27,6 +27,7 @@ metadata:
     nginx.ingress.kubernetes.io/upstream-vhost: {{ $externalName }}
   {{- end }}
 spec:
+  ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
 {{- if and .Values.ingress.tls (not .Values.disable_tls) }}
   tls:
     - hosts:
@@ -56,3 +57,4 @@ spec:
               {{- end }}
   {{- end }}
 {{- end }}
+
diff --git a/charts/cc-schema-registry-proxy/values.yaml b/charts/cc-schema-registry-proxy/values.yaml
index a8d93202..108029cf 100644
--- a/charts/cc-schema-registry-proxy/values.yaml
+++ b/charts/cc-schema-registry-proxy/values.yaml
@@ -18,14 +18,16 @@ ingress:
   # -- Annotations that define default ingress class, certificate issuer
   # @default -- check values.yaml
   annotations:
-    kubernetes.io/ingress.class: nginx
     cert-manager.io/cluster-issuer: letsencrypt-prod
     ingress.kubernetes.io/preserve-host: "false"
     nginx.ingress.kubernetes.io/rewrite-target: /$1
     nginx.ingress.kubernetes.io/backend-protocol: https
   # -- Path within the url structure
   path: "/schema/?(.*)"
+  # -- Ingress Path type
   pathType: ImplementationSpecific
+  # -- IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+)
+  ingressClassName: nginx
   # -- Hosts to accept requests from
   hosts:
     - localhost