Update to support kube 1.16 changes

Port from helm/charts#17683 Co-authored-by: Kevin Lau <kevin.lau31@gmail.com>
apache · Oct 31, 2019 · 278d1e2 · 278d1e2
1 parent 1960abf
commit 278d1e2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -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
     }
@@ Expand Down @@