Commit ec51a586 authored by Nikhil Doifode's avatar Nikhil Doifode
Browse files

Supporting K8s 1.19 in current setup 

Changes:
- Added condition for checking apiversion support of statefulset and
deployment in couchdb, kube-state-metrics and redis (master and slave)
- Changed apiversion from harcoded values to read from helpers file in
statefulset and deployment in couchdb, kube-state-metrics and redis (master and slave)
- Changed wait time for Sandbox creation and scenario deployment in Cypress
tests from 10 sec to 15 sec

Tests:
- All UT's passed
- All Cypress test cases passed
- Manually checked deploying scenarios demo1 and demo2
parent 1acd5877

charts/couchdb/templates/_helpers.tpl

+11 −0
Original line number Diff line number Diff line
@@ -42,3 +42,14 @@ Create a random string if the supplied key does not exist 
{{- randAlphaNum 20 | b64enc | quote -}}

{{- end -}}

{{- end -}}



{{/*

Return the appropriate apiVersion for statefulset.

*/}}

{{- define "couchdb.statefulset.apiVersion" -}}

{{- if semverCompare ">=1.4-0, <1.8-0" .Capabilities.KubeVersion.GitVersion -}}

"apps/v1beta2"

{{- else if semverCompare "^1.8-0" .Capabilities.KubeVersion.GitVersion -}}

"apps/v1"

{{- end -}}

{{- end -}}
 
 No newline at end of file

charts/couchdb/templates/statefulset.yaml

+1 −1
Original line number Diff line number Diff line 
apiVersion: apps/v1beta2

apiVersion: {{ template "couchdb.statefulset.apiVersion" . }}

kind: StatefulSet

metadata:

  name: {{ template "couchdb.fullname" . }}

charts/kube-state-metrics/templates/_heplers.tpl

+11 −0
Original line number Diff line number Diff line
@@ -23,3 +23,14 @@ If release name contains chart name it will be used as a full name. 
{{- end -}}

{{- end -}}

{{- end -}}



{{/*

Return the appropriate apiVersion for deployment.

*/}}

{{- define "kube-state-metrics.deployment.apiVersion" -}}

{{- if semverCompare ">=1.4-0, <1.8-0" .Capabilities.KubeVersion.GitVersion -}}

"extensions/v1beta1"

{{- else if semverCompare "^1.8-0" .Capabilities.KubeVersion.GitVersion -}}

"apps/v1"

{{- end -}}

{{- end -}}

charts/kube-state-metrics/templates/deployment.yaml

+5 −1
Original line number Diff line number Diff line 
apiVersion: extensions/v1beta1

apiVersion: {{ template "kube-state-metrics.deployment.apiVersion" . }}

kind: Deployment

metadata:

  name: {{ template "kube-state-metrics.fullname" . }}
@@ -9,6 +9,10 @@ metadata: 
    heritage: "{{ .Release.Service }}"

spec:

  replicas: 1

  selector:

    matchLabels:

      app: {{ template "kube-state-metrics.name" . }}

      release: {{ .Release.Name }}

  template:

    metadata:

      labels:

charts/redis/templates/_helpers.tpl

+22 −0
Original line number Diff line number Diff line
@@ -130,3 +130,25 @@ Create the name of the service account to use 
    {{ default "default" .Values.serviceAccount.name }}

{{- end -}}

{{- end -}}



{{/*

Return the appropriate apiVersion for deployment.

*/}}

{{- define "redis.deployment.apiVersion" -}}

{{- if semverCompare ">=1.4-0, <1.8-0" .Capabilities.KubeVersion.GitVersion -}}

"extensions/v1beta1"

{{- else if semverCompare "^1.8-0" .Capabilities.KubeVersion.GitVersion -}}

"apps/v1"

{{- end -}}

{{- end -}}



{{/*

Return the appropriate apiVersion for statefulset.

*/}}

{{- define "redis.statefulset.apiVersion" -}}

{{- if semverCompare ">=1.4-0, <1.8-0" .Capabilities.KubeVersion.GitVersion -}}

"apps/v1beta2"

{{- else if semverCompare "^1.8-0" .Capabilities.KubeVersion.GitVersion -}}

"apps/v1"

{{- end -}}

{{- end -}}