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 2020/01/06 10:34:21 UTC
[couchdb-helm] 16/26: Update to support kube 1.16 changes
This is an automated email from the ASF dual-hosted git repository.
willholley pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-helm.git
commit 5b205f5f6304365c1628b39019972493b25349bf
Author: Will Holley <wi...@gmail.com>
AuthorDate: Tue Oct 22 18:17:32 2019 +0100
Update to support kube 1.16 changes
Port from https://github.com/helm/charts/pull/17683
Co-authored-by: Kevin Lau <ke...@gmail.com>
---
couchdb/README.md | 3 ++-
couchdb/templates/ingress.yaml | 2 +-
couchdb/templates/statefulset.yaml | 2 +-
test/e2e-kind.sh | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/couchdb/README.md b/couchdb/README.md
index 0d786e3..fe70ebf 100644
--- a/couchdb/README.md
+++ b/couchdb/README.md
@@ -20,7 +20,8 @@ $ helm install couchdb/couchdb --set allowAdminParty=true
## Prerequisites
-- Kubernetes 1.8+ with Beta APIs enabled
+- Kubernetes 1.9+ with Beta APIs enabled
+- Ingress requires Kubernetes 1.14+
## Installing the Chart
diff --git a/couchdb/templates/ingress.yaml b/couchdb/templates/ingress.yaml
index 3eefddd..5131a6a 100644
--- a/couchdb/templates/ingress.yaml
+++ b/couchdb/templates/ingress.yaml
@@ -1,7 +1,7 @@
{{- if .Values.ingress.enabled -}}
{{- $serviceName := include "couchdb.fullname" . -}}
{{- $servicePort := .Values.service.externalPort -}}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
kind: Ingress
metadata:
name: {{ template "couchdb.fullname" . }}
diff --git a/couchdb/templates/statefulset.yaml b/couchdb/templates/statefulset.yaml
index 1e0985b..7c7b744 100644
--- a/couchdb/templates/statefulset.yaml
+++ b/couchdb/templates/statefulset.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
kind: StatefulSet
metadata:
name: {{ template "couchdb.fullname" . }}
diff --git a/test/e2e-kind.sh b/test/e2e-kind.sh
index 4301343..4cb57b4 100755
--- a/test/e2e-kind.sh
+++ b/test/e2e-kind.sh
@@ -80,7 +80,7 @@ install_local-path-provisioner() {
}
install_charts() {
- docker_exec ct lint-and-install --chart-repos couchdb=https://apache.github.io/couchdb-helm --chart-dirs .
+ docker_exec ct lint-and-install --charts couchdb --upgrade --chart-dirs .
echo
}