Bump ES, Redis for k8s 1.16

CenterForOpenScience · Sep 28, 2020 · f8c48da · f8c48da
1 parent fd6f428
commit f8c48da
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 7 deletions.
diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml
@@ -1,6 +1,6 @@
 name: elasticsearch
 home: https://www.elastic.co/products/elasticsearch
-version: 0.5.1
+version: 0.5.2
 description: Flexible and powerful open source, distributed real-time search and analytics
   engine.
 icon: https://static-www.elastic.co/assets/blteb1c97719574938d/logo-elastic-elasticsearch-lt.svg

diff --git a/elasticsearch/templates/client-deployment.yaml b/elasticsearch/templates/client-deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
@@ -9,6 +9,11 @@ metadata:
     release: {{ .Release.Name }}
   name: {{ template "elasticsearch.client.fullname" . }}
 spec:
+  selector:
+    matchLabels:
+      app: {{ template "elasticsearch.name" . }}
+      component: "{{ .Values.client.name }}"
+      release: {{ .Release.Name }}
   replicas: {{ .Values.client.replicas }}
   {{- if .Values.client.strategy }}
   strategy:

diff --git a/elasticsearch/templates/configmap.yaml b/elasticsearch/templates/configmap.yaml
@@ -110,7 +110,7 @@ data:
       curl -s \
         --cacert ${SERVICE_ACCOUNT_PATH}/ca.crt \
         -H "Authorization: Bearer $KUBE_TOKEN" \
-        "https://${KUBERNETES_SERVICE_HOST}:${KUBERNETES_PORT_443_TCP_PORT}/apis/apps/v1beta1/namespaces/${KUBE_NAMESPACE}/statefulsets/${STATEFULSET_NAME}/status"
+        "https://${KUBERNETES_SERVICE_HOST}:${KUBERNETES_PORT_443_TCP_PORT}/apis/apps/v1/namespaces/${KUBE_NAMESPACE}/statefulsets/${STATEFULSET_NAME}/status"
     )
     INSTANCES_DESIRED=$(
     	python - <<-EOF

diff --git a/elasticsearch/templates/data-statefulset.yaml b/elasticsearch/templates/data-statefulset.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   labels:
@@ -9,6 +9,11 @@ metadata:
     release: {{ .Release.Name }}
   name: {{ template "elasticsearch.data.fullname" . }}
 spec:
+  selector:
+    matchLabels:
+      app: {{ template "elasticsearch.name" . }}
+      component: "{{ .Values.data.name }}"
+      release: {{ .Release.Name }}
   serviceName: {{ template "elasticsearch.data.fullname" . }}
   replicas: {{ .Values.data.replicas }}
   {{- if .Values.data.updateStrategy }}

diff --git a/elasticsearch/templates/master-statefulset.yaml b/elasticsearch/templates/master-statefulset.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   labels:
@@ -9,6 +9,11 @@ metadata:
     release: {{ .Release.Name }}
   name: {{ template "elasticsearch.master.fullname" . }}
 spec:
+  selector:
+    matchLabels:
+      app: {{ template "elasticsearch.name" . }}
+      component: "{{ .Values.master.name }}"
+      release: {{ .Release.Name }}
   serviceName: {{ template "elasticsearch.master.fullname" . }}
   replicas: {{ .Values.master.replicas }}
   {{- if .Values.master.updateStrategy }}

diff --git a/redis/Chart.yaml b/redis/Chart.yaml
@@ -1,5 +1,5 @@
 name: redis
-version: 1.1.2
+version: 1.1.3
 appVersion: 4.0.6
 description: Open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets.
 keywords:

diff --git a/redis/templates/statefulset.yaml b/redis/templates/statefulset.yaml
@@ -1,10 +1,14 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ template "redis.fullname" . }}
   labels:
     {{- include "redis.labels.standard" . | nindent 4 }}
 spec:
+  selector:
+    matchLabels:
+      app: {{ template "redis.name" . }}
+      release: {{ .Release.Name }}
   serviceName: {{ template "redis.fullname" . }}
   replicas: 1
   updateStrategy: