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 2019/10/22 17:27:37 UTC
[couchdb-helm] branch port-helm-prs created (now 4028156)
This is an automated email from the ASF dual-hosted git repository.
willholley pushed a change to branch port-helm-prs
in repository https://gitbox.apache.org/repos/asf/couchdb-helm.git.
at 4028156 Publish new chart
This branch includes the following new commits:
new 1a84cb2 Add support for pod annotations
new ee805b7 Include pod tolerations in statefulset
new d79b0af Add ServiceAccount support
new dfd8f3c Add optional network policy
new e5aa7be Update to support kube 1.16 changes
new 222baeb Add credits
new 4028156 Publish new chart
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[couchdb-helm] 07/07: Publish new chart
Posted by wi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
willholley pushed a commit to branch port-helm-prs
in repository https://gitbox.apache.org/repos/asf/couchdb-helm.git
commit 40281563ba17f30967c728110d67921e8e61e419
Author: Will Holley <wi...@gmail.com>
AuthorDate: Tue Oct 22 18:26:42 2019 +0100
Publish new chart
---
docs/couchdb-2.3.0.tgz | Bin 7857 -> 7858 bytes
docs/index.yaml | 8 ++++----
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/couchdb-2.3.0.tgz b/docs/couchdb-2.3.0.tgz
index 589b85a..ce2b463 100644
Binary files a/docs/couchdb-2.3.0.tgz and b/docs/couchdb-2.3.0.tgz differ
diff --git a/docs/index.yaml b/docs/index.yaml
index b6d491a..a12a55c 100644
--- a/docs/index.yaml
+++ b/docs/index.yaml
@@ -3,10 +3,10 @@ entries:
couchdb:
- apiVersion: v1
appVersion: 2.3.1
- created: 2019-10-22T18:20:15.406289+01:00
+ created: 2019-10-22T18:26:29.233651+01:00
description: A database featuring seamless multi-master sync, that scales from
big data to mobile, with an intuitive HTTP/JSON API and designed for reliability.
- digest: bd9d52e1f60520d9f9ea074b80280c32081531d3283254ebbe4da00b2cbfb5e0
+ digest: 21f9026046507aaf4018b4319ccb3d9d547970f10bd36da856ce99f35d5f79b6
home: https://couchdb.apache.org/
icon: http://couchdb.apache.org/CouchDB-visual-identity/logo/CouchDB-couch-symbol.svg
keywords:
@@ -24,7 +24,7 @@ entries:
version: 2.3.0
- apiVersion: v1
appVersion: 2.3.1
- created: 2019-10-22T18:20:15.405444+01:00
+ created: 2019-10-22T18:26:29.22752+01:00
description: A database featuring seamless multi-master sync, that scales from
big data to mobile, with an intuitive HTTP/JSON API and designed for reliability.
digest: d4ec1447c437f26418db46de4b7fe7be928f7341b62915ef263350578c95cf12
@@ -43,4 +43,4 @@ entries:
urls:
- https://apache.github.io/couchdb-helm/couchdb-2.2.0.tgz
version: 2.2.0
-generated: 2019-10-22T18:20:15.403012+01:00
+generated: 2019-10-22T18:26:29.224148+01:00
[couchdb-helm] 03/07: Add ServiceAccount support
Posted by wi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
willholley pushed a commit to branch port-helm-prs
in repository https://gitbox.apache.org/repos/asf/couchdb-helm.git
commit d79b0af370e6f5ba461845b439bcdb7b7c0d77d5
Author: Will Holley <wi...@gmail.com>
AuthorDate: Tue Oct 22 14:28:54 2019 +0100
Add ServiceAccount support
Ported from https://github.com/helm/charts/pull/17254.
---
couchdb/README.md | 64 ++++++++++++++++++-----------------
couchdb/templates/_helpers.tpl | 11 ++++++
couchdb/templates/serviceaccount.yaml | 15 ++++++++
couchdb/templates/statefulset.yaml | 3 ++
couchdb/values.yaml | 8 +++++
5 files changed, 70 insertions(+), 31 deletions(-)
diff --git a/couchdb/README.md b/couchdb/README.md
index 10e9946..1342d03 100644
--- a/couchdb/README.md
+++ b/couchdb/README.md
@@ -109,37 +109,39 @@ CouchDB chart and their default values:
A variety of other parameters are also configurable. See the comments in the
`values.yaml` file for further details:
-| Parameter | Default |
-|---------------------------------|----------------------------------------|
-| `adminUsername` | admin |
-| `adminPassword` | auto-generated |
-| `cookieAuthSecret` | auto-generated |
-| `image.repository` | couchdb |
-| `image.tag` | 2.3.1 |
-| `image.pullPolicy` | IfNotPresent |
-| `searchImage.repository` | kocolosk/couchdb-search |
-| `searchImage.tag` | 0.1.0 |
-| `searchImage.pullPolicy` | IfNotPresent |
-| `initImage.repository` | busybox |
-| `initImage.tag` | latest |
-| `initImage.pullPolicy` | Always |
-| `ingress.enabled` | false |
-| `ingress.hosts` | chart-example.local |
-| `ingress.annotations` | |
-| `ingress.tls` | |
-| `persistentVolume.accessModes` | ReadWriteOnce |
-| `persistentVolume.storageClass` | Default for the Kube cluster |
-| `podManagementPolicy` | Parallel |
-| `affinity` | |
-| `annotations` | |
-| `tolerations` | |
-| `resources` | |
-| `service.annotations` | |
-| `service.enabled` | true |
-| `service.type` | ClusterIP |
-| `service.externalPort` | 5984 |
-| `dns.clusterDomainSuffix` | cluster.local |
-
+| Parameter | Default |
+|-----------------------------------|----------------------------------------|
+| `adminUsername` | admin |
+| `adminPassword` | auto-generated |
+| `cookieAuthSecret` | auto-generated |
+| `image.repository` | couchdb |
+| `image.tag` | 2.3.1 |
+| `image.pullPolicy` | IfNotPresent |
+| `searchImage.repository` | kocolosk/couchdb-search |
+| `searchImage.tag` | 0.1.0 |
+| `searchImage.pullPolicy` | IfNotPresent |
+| `initImage.repository` | busybox |
+| `initImage.tag` | latest |
+| `initImage.pullPolicy` | Always |
+| `ingress.enabled` | false |
+| `ingress.hosts` | chart-example.local |
+| `ingress.annotations` | |
+| `ingress.tls` | |
+| `persistentVolume.accessModes` | ReadWriteOnce |
+| `persistentVolume.storageClass` | Default for the Kube cluster |
+| `podManagementPolicy` | Parallel |
+| `affinity` | |
+| `annotations` | |
+| `tolerations` | |
+| `resources` | |
+| `service.annotations` | |
+| `service.enabled` | true |
+| `service.type` | ClusterIP |
+| `service.externalPort` | 5984 |
+| `dns.clusterDomainSuffix` | cluster.local |
+| `serviceAccount.enabled` | true |
+| `serviceAccount.create` | true |
+| `serviceAccount.imagePullSecrets` | |
## Feedback, Issues, Contributing
diff --git a/couchdb/templates/_helpers.tpl b/couchdb/templates/_helpers.tpl
index 0450a66..3a9288f 100644
--- a/couchdb/templates/_helpers.tpl
+++ b/couchdb/templates/_helpers.tpl
@@ -61,3 +61,14 @@ Generates a comma delimited list of nodes in the cluster
{{ $.Values.erlangFlags.name }}@{{ template "couchdb.fullname" $ }}-{{ $index0 }}.{{ template "couchdb.fullname" $ }}.{{ $.Release.Namespace }}.svc.{{ $.Values.dns.clusterDomainSuffix }}{{ if ne $index1 $nodeCount }},{{ end }}
{{- end -}}
{{- end -}}
+
+{{/*
+If serviceAccount.name is specified, use that, else use the couchdb instance name
+*/}}
+{{- define "couchdb.serviceAccount" -}}
+{{- if .Values.serviceAccount.name -}}
+{{- .Values.serviceAccount.name }}
+{{- else -}}
+{{- template "couchdb.fullname" . -}}
+{{- end -}}
+{{- end -}}
diff --git a/couchdb/templates/serviceaccount.yaml b/couchdb/templates/serviceaccount.yaml
new file mode 100644
index 0000000..bb82799
--- /dev/null
+++ b/couchdb/templates/serviceaccount.yaml
@@ -0,0 +1,15 @@
+{{- if .Values.serviceAccount.create }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+ name: {{ template "couchdb.serviceAccount" . }}
+ labels:
+ app: {{ template "couchdb.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+{{- if .Values.serviceAccount.imagePullSecrets }}
+imagePullSecrets:
+{{ toYaml .Values.serviceAccount.imagePullSecrets }}
+{{- end }}
+{{- end }}
diff --git a/couchdb/templates/statefulset.yaml b/couchdb/templates/statefulset.yaml
index 3e70bdc..1e0985b 100644
--- a/couchdb/templates/statefulset.yaml
+++ b/couchdb/templates/statefulset.yaml
@@ -26,6 +26,9 @@ spec:
{{- if .Values.schedulerName }}
schedulerName: "{{ .Values.schedulerName }}"
{{- end }}
+ {{- if .Values.serviceAccount.enabled }}
+ serviceAccountName: {{ template "couchdb.serviceAccount" . }}
+ {{- end }}
initContainers:
- name: init-copy
image: "{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}"
diff --git a/couchdb/values.yaml b/couchdb/values.yaml
index df4d663..de6b4c1 100644
--- a/couchdb/values.yaml
+++ b/couchdb/values.yaml
@@ -30,6 +30,14 @@ adminUsername: admin
##
# schedulerName:
+# Use a service account
+serviceAccount:
+ enabled: true
+ create: true
+# name:
+# imagePullSecrets:
+# - name: myimagepullsecret
+
## The storage volume used by each Pod in the StatefulSet. If a
## persistentVolume is not enabled, the Pods will use `emptyDir` ephemeral
## local storage. Setting the storageClass attribute to "-" disables dynamic
[couchdb-helm] 06/07: Add credits
Posted by wi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
willholley pushed a commit to branch port-helm-prs
in repository https://gitbox.apache.org/repos/asf/couchdb-helm.git
commit 222baeb4d7ca7291ec90d13a9179f2cfda835aa7
Author: Will Holley <wi...@gmail.com>
AuthorDate: Tue Oct 22 18:20:41 2019 +0100
Add credits
---
couchdb/README.md | 3 +++
docs/couchdb-2.3.0.tgz | Bin 0 -> 7857 bytes
docs/index.yaml | 25 +++++++++++++++++++++++--
3 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/couchdb/README.md b/couchdb/README.md
index 8aa63e0..69abcaa 100644
--- a/couchdb/README.md
+++ b/couchdb/README.md
@@ -167,6 +167,9 @@ use GitHub Issues, do not report anything on Docker's website.
- [@mainephd](https://github.com/mainephd)
- [@AdamDang](https://github.com/AdamDang)
- [@mrtyler](https://github.com/mrtyler)
+- [@kevinwlau](https://github.com/kevinwlau)
+- [@jeyenzo](https://github.com/jeyenzo)
+- [@Pinpin31.](https://github.com/Pinpin31)
[1]: http://mail-archives.apache.org/mod_mbox/couchdb-user/
[2]: http://mail-archives.apache.org/mod_mbox/couchdb-dev/
diff --git a/docs/couchdb-2.3.0.tgz b/docs/couchdb-2.3.0.tgz
new file mode 100644
index 0000000..589b85a
Binary files /dev/null and b/docs/couchdb-2.3.0.tgz differ
diff --git a/docs/index.yaml b/docs/index.yaml
index 6be4b54..b6d491a 100644
--- a/docs/index.yaml
+++ b/docs/index.yaml
@@ -3,7 +3,28 @@ entries:
couchdb:
- apiVersion: v1
appVersion: 2.3.1
- created: 2019-10-22T14:09:08.422421+01:00
+ created: 2019-10-22T18:20:15.406289+01:00
+ description: A database featuring seamless multi-master sync, that scales from
+ big data to mobile, with an intuitive HTTP/JSON API and designed for reliability.
+ digest: bd9d52e1f60520d9f9ea074b80280c32081531d3283254ebbe4da00b2cbfb5e0
+ home: https://couchdb.apache.org/
+ icon: http://couchdb.apache.org/CouchDB-visual-identity/logo/CouchDB-couch-symbol.svg
+ keywords:
+ - couchdb
+ - database
+ - nosql
+ maintainers:
+ - email: kocolosk@apache.org
+ name: kocolosk
+ name: couchdb
+ sources:
+ - https://github.com/apache/couchdb-docker
+ urls:
+ - https://apache.github.io/couchdb-helm/couchdb-2.3.0.tgz
+ version: 2.3.0
+ - apiVersion: v1
+ appVersion: 2.3.1
+ created: 2019-10-22T18:20:15.405444+01:00
description: A database featuring seamless multi-master sync, that scales from
big data to mobile, with an intuitive HTTP/JSON API and designed for reliability.
digest: d4ec1447c437f26418db46de4b7fe7be928f7341b62915ef263350578c95cf12
@@ -22,4 +43,4 @@ entries:
urls:
- https://apache.github.io/couchdb-helm/couchdb-2.2.0.tgz
version: 2.2.0
-generated: 2019-10-22T14:09:08.421343+01:00
+generated: 2019-10-22T18:20:15.403012+01:00
[couchdb-helm] 04/07: Add optional network policy
Posted by wi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
willholley pushed a commit to branch port-helm-prs
in repository https://gitbox.apache.org/repos/asf/couchdb-helm.git
commit dfd8f3c9801ddba97c135cef21061d8601aa2e5f
Author: Will Holley <wi...@gmail.com>
AuthorDate: Tue Oct 22 16:16:51 2019 +0100
Add optional network policy
Adds a NetworkPolicy to enable communication between CouchDB pods
and external ingress on port 5984.
This is required in environments (e.g. Red Hat OpenShift) which apply
DenyAll network policies by default.
ported from https://github.com/helm/charts/pull/17262
---
couchdb/README.md | 1 +
couchdb/templates/networkpolicy.yaml | 31 +++++++++++++++++++++++++++++++
couchdb/values.yaml | 5 +++++
3 files changed, 37 insertions(+)
diff --git a/couchdb/README.md b/couchdb/README.md
index 1342d03..38df621 100644
--- a/couchdb/README.md
+++ b/couchdb/README.md
@@ -139,6 +139,7 @@ A variety of other parameters are also configurable. See the comments in the
| `service.type` | ClusterIP |
| `service.externalPort` | 5984 |
| `dns.clusterDomainSuffix` | cluster.local |
+| `networkPolicy.enabled` | true |
| `serviceAccount.enabled` | true |
| `serviceAccount.create` | true |
| `serviceAccount.imagePullSecrets` | |
diff --git a/couchdb/templates/networkpolicy.yaml b/couchdb/templates/networkpolicy.yaml
new file mode 100644
index 0000000..2830708
--- /dev/null
+++ b/couchdb/templates/networkpolicy.yaml
@@ -0,0 +1,31 @@
+
+{{- if .Values.networkPolicy.enabled }}
+kind: NetworkPolicy
+apiVersion: networking.k8s.io/v1
+metadata:
+ name: {{ template "couchdb.fullname" . }}
+ labels:
+ app: {{ template "couchdb.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+spec:
+ podSelector:
+ matchLabels:
+{{ include "couchdb.ss.selector" . | indent 6 }}
+ ingress:
+ - ports:
+ - protocol: TCP
+ port: 5984
+ - ports:
+ - protocol: TCP
+ port: 9100
+ - protocol: TCP
+ port: 4369
+ from:
+ - podSelector:
+ matchLabels:
+{{ include "couchdb.ss.selector" . | indent 14 }}
+ policyTypes:
+ - Ingress
+{{- end }}
diff --git a/couchdb/values.yaml b/couchdb/values.yaml
index de6b4c1..b791827 100644
--- a/couchdb/values.yaml
+++ b/couchdb/values.yaml
@@ -25,6 +25,11 @@ adminUsername: admin
# adminPassword: this_is_not_secure
# cookieAuthSecret: neither_is_this
+## When enabled, will deploy a networkpolicy that allows CouchDB pods to
+## communicate with each other for clustering and ingress on port 5984
+networkPolicy:
+ enabled: true
+
## Use an alternate scheduler, e.g. "stork".
## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
##
[couchdb-helm] 02/07: Include pod tolerations in statefulset
Posted by wi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
willholley pushed a commit to branch port-helm-prs
in repository https://gitbox.apache.org/repos/asf/couchdb-helm.git
commit ee805b76d3b4165bdbf7e7561476f8f2c860586d
Author: Will Holley <wi...@gmail.com>
AuthorDate: Tue Oct 22 14:24:25 2019 +0100
Include pod tolerations in statefulset
Ported from https://github.com/helm/charts/pull/17079/files.
Thanks @jeyenzo for the original PR.
---
couchdb/README.md | 1 +
couchdb/templates/statefulset.yaml | 4 ++++
couchdb/values.yaml | 3 +++
3 files changed, 8 insertions(+)
diff --git a/couchdb/README.md b/couchdb/README.md
index a055b12..10e9946 100644
--- a/couchdb/README.md
+++ b/couchdb/README.md
@@ -132,6 +132,7 @@ A variety of other parameters are also configurable. See the comments in the
| `podManagementPolicy` | Parallel |
| `affinity` | |
| `annotations` | |
+| `tolerations` | |
| `resources` | |
| `service.annotations` | |
| `service.enabled` | true |
diff --git a/couchdb/templates/statefulset.yaml b/couchdb/templates/statefulset.yaml
index 416b594..3e70bdc 100644
--- a/couchdb/templates/statefulset.yaml
+++ b/couchdb/templates/statefulset.yaml
@@ -109,6 +109,10 @@ spec:
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 8 }}
{{- end }}
+{{- with .Values.tolerations }}
+ tolerations:
+{{ toYaml . | indent 8 }}
+{{- end }}
{{- with .Values.affinity }}
affinity:
{{ toYaml . | indent 8 }}
diff --git a/couchdb/values.yaml b/couchdb/values.yaml
index ab75a1d..df4d663 100644
--- a/couchdb/values.yaml
+++ b/couchdb/values.yaml
@@ -83,6 +83,9 @@ affinity:
## Optional pod annotations
annotations:
+## Optional tolerations
+tolerations:
+
## A StatefulSet requires a headless Service to establish the stable network
## identities of the Pods, and that Service is created automatically by this
## chart without any additional configuration. The Service block below refers
[couchdb-helm] 01/07: Add support for pod annotations
Posted by wi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
willholley pushed a commit to branch port-helm-prs
in repository https://gitbox.apache.org/repos/asf/couchdb-helm.git
commit 1a84cb26b04966f66843de510d0ed23cbf2b525c
Author: Will Holley <wi...@gmail.com>
AuthorDate: Tue Oct 22 13:51:50 2019 +0100
Add support for pod annotations
Ported from https://github.com/helm/charts/pull/17262.
Thanks to @Pinpin31.
---
couchdb/Chart.yaml | 2 +-
couchdb/README.md | 1 +
couchdb/templates/statefulset.yaml | 4 ++++
couchdb/values.yaml | 3 +++
4 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/couchdb/Chart.yaml b/couchdb/Chart.yaml
index 1d33948..5c617f8 100644
--- a/couchdb/Chart.yaml
+++ b/couchdb/Chart.yaml
@@ -1,6 +1,6 @@
apiVersion: v1
name: couchdb
-version: 2.2.0
+version: 2.2.1
appVersion: 2.3.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/README.md b/couchdb/README.md
index a0bfc15..a055b12 100644
--- a/couchdb/README.md
+++ b/couchdb/README.md
@@ -131,6 +131,7 @@ A variety of other parameters are also configurable. See the comments in the
| `persistentVolume.storageClass` | Default for the Kube cluster |
| `podManagementPolicy` | Parallel |
| `affinity` | |
+| `annotations` | |
| `resources` | |
| `service.annotations` | |
| `service.enabled` | true |
diff --git a/couchdb/templates/statefulset.yaml b/couchdb/templates/statefulset.yaml
index fab2c36..416b594 100644
--- a/couchdb/templates/statefulset.yaml
+++ b/couchdb/templates/statefulset.yaml
@@ -18,6 +18,10 @@ spec:
metadata:
labels:
{{ include "couchdb.ss.selector" . | indent 8 }}
+{{- with .Values.annotations }}
+ annotations:
+{{ toYaml . | indent 8 }}
+{{- end }}
spec:
{{- if .Values.schedulerName }}
schedulerName: "{{ .Values.schedulerName }}"
diff --git a/couchdb/values.yaml b/couchdb/values.yaml
index e3461dd..ab75a1d 100644
--- a/couchdb/values.yaml
+++ b/couchdb/values.yaml
@@ -80,6 +80,9 @@ affinity:
# - couchdb
# topologyKey: "kubernetes.io/hostname"
+## Optional pod annotations
+annotations:
+
## A StatefulSet requires a headless Service to establish the stable network
## identities of the Pods, and that Service is created automatically by this
## chart without any additional configuration. The Service block below refers
[couchdb-helm] 05/07: Update to support kube 1.16 changes
Posted by wi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
willholley pushed a commit to branch port-helm-prs
in repository https://gitbox.apache.org/repos/asf/couchdb-helm.git
commit e5aa7bec977f61f97411591e97c7ecffab82738e
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
Thanks to @kevinqlau for the original PR!
---
couchdb/Chart.yaml | 2 +-
couchdb/README.md | 3 ++-
couchdb/templates/ingress.yaml | 2 +-
couchdb/templates/statefulset.yaml | 2 +-
test/e2e-kind.sh | 2 +-
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/couchdb/Chart.yaml b/couchdb/Chart.yaml
index 5c617f8..c684a55 100644
--- a/couchdb/Chart.yaml
+++ b/couchdb/Chart.yaml
@@ -1,6 +1,6 @@
apiVersion: v1
name: couchdb
-version: 2.2.1
+version: 2.3.0
appVersion: 2.3.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/README.md b/couchdb/README.md
index 38df621..8aa63e0 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 e73d7a5..64b67a6 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 59c1dbe..27ee14e 100755
--- a/test/e2e-kind.sh
+++ b/test/e2e-kind.sh
@@ -83,7 +83,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
}