You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by wi...@apache.org on 2023/04/04 11:49:44 UTC
[couchdb-helm] branch main updated: feat: ingress.className added (#75)
This is an automated email from the ASF dual-hosted git repository.
willholley pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb-helm.git
The following commit(s) were added to refs/heads/main by this push:
new 9afabd4 feat: ingress.className added (#75)
9afabd4 is described below
commit 9afabd4eab675e3986c718b4f670743858e3fdc8
Author: sebastien-helbert <se...@gmail.com>
AuthorDate: Tue Apr 4 13:49:37 2023 +0200
feat: ingress.className added (#75)
add ingress.ingressClassName which replaces kubernetes.io/ingress.class annotation deprecated in Kubernetes 1.18
---------
Co-authored-by: shelbert <sh...@timwi.com>
Co-authored-by: Will Holley <wi...@apache.org>
---
couchdb/Chart.yaml | 2 +-
couchdb/NEWS.md | 4 ++++
couchdb/README.md | 2 ++
couchdb/templates/ingress.yaml | 3 +++
couchdb/values.yaml | 6 ++----
5 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/couchdb/Chart.yaml b/couchdb/Chart.yaml
index 0cdd6ed..dfe7fbf 100644
--- 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
index 9aef513..0e36fcb 100644
--- 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
index 3e6f468..4212684 100644
--- 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
index 2403216..1ceb45d 100644
--- 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
index 6c0667e..61966b2 100644
--- 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