feat: ingress.className added (#75)

add ingress.ingressClassName which replaces kubernetes.io/ingress.class annotation deprecated in Kubernetes 1.18 --------- Co-authored-by: shelbert <[email protected]> Co-authored-by: Will Holley <[email protected]>
apache · Apr 4, 2023 · 9afabd4 · 9afabd4
1 parent 4f31b20
commit 9afabd4
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/couchdb/Chart.yaml b/couchdb/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: couchdb
-version: 4.2.0
+version: 4.3.0
 appVersion: 3.2.1
 description: A database featuring seamless multi-master sync, that scales from
   big data to mobile, with an intuitive HTTP/JSON API and designed for

diff --git a/couchdb/NEWS.md b/couchdb/NEWS.md
@@ -1,5 +1,9 @@
 # NEWS
 
+## 4.3.0
+
+- Use Ingress `className` instead of `kubernetes.io/ingress.class` annotation which has been deprecated since Kubernetes 1.18+ ([#69](https://github.com/apache/couchdb-helm/issues/69))
+
 ## 4.1.0
 
 - Added the `autoSetup` to automatically finalize the cluster after installation

diff --git a/couchdb/README.md b/couchdb/README.md
@@ -164,6 +164,7 @@ required options to set:
 A variety of other parameters are also configurable. See the comments in the
 `values.yaml` file for further details:
 
+
 | Parameter                              | Default                                          |
 | -------------------------------------- | ------------------------------------------------ |
 | `adminUsername`                        | admin                                            |
@@ -180,6 +181,7 @@ A variety of other parameters are also configurable. See the comments in the
 | `initImage.tag`                        | latest                                           |
 | `initImage.pullPolicy`                 | Always                                           |
 | `ingress.enabled`                      | false                                            |
+| `ingress.className`                    |                                                  |
 | `ingress.hosts`                        | chart-example.local                              |
 | `ingress.annotations`                  |                                                  |
 | `ingress.path`                         | /                                                |

diff --git a/couchdb/templates/ingress.yaml b/couchdb/templates/ingress.yaml
@@ -16,6 +16,9 @@ metadata:
       {{ $key }}: {{ $value | quote }}
     {{- end }}
 spec:
+  {{- if .Values.ingress.className }}
+  ingressClassName: {{ .Values.ingress.className }}
+  {{- end }}
   rules:
     {{- range $host := .Values.ingress.hosts }}
     - host: {{ $host }}

diff --git a/couchdb/values.yaml b/couchdb/values.yaml
@@ -147,6 +147,7 @@ service:
 ## ref: https://kubernetes.io/docs/concepts/services-networking/ingress/
 ingress:
   enabled: false
+  # className: nginx
   hosts:
     - chart-example.local
   path: /
@@ -161,8 +162,7 @@ ingress:
 
 ## Optional resource requests and limits for the CouchDB container
 ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
-resources:
-  {}
+resources: {}
   # requests:
   #  cpu: 100m
   #  memory: 128Mi
@@ -199,7 +199,6 @@ couchdbConfig:
   # httpd:
   #   WWW-Authenticate: "Basic realm=\"administrator\""
 
-
 # Kubernetes local cluster domain.
 # This is used to generate FQDNs for peers when joining the CouchDB cluster.
 dns:
@@ -244,7 +243,6 @@ sidecars: {}
   #     - name: database-storage
   #       mountPath: /opt/couchdb/data/
 
-
 # Placement manager to annotate each document in the nodes DB with "zone" attribute
 # recording the zone where node has been scheduled
 # Ref: https://docs.couchdb.org/en/stable/cluster/sharding.html#specifying-database-placement