Commit 4474beb5 authored by Nikhil Doifode's avatar Nikhil Doifode
Browse files

Removed the conditional checks in helper file and added hardcoded values in... 

Removed the conditional checks in helper file and added hardcoded values in deployment and statefulset
parent ec51a586

charts/couchdb/templates/_helpers.tpl

+0 −11
Original line number Diff line number Diff line
@@ -42,14 +42,3 @@ 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: {{ template "couchdb.statefulset.apiVersion" . }}

apiVersion: apps/v1

kind: StatefulSet

metadata:

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

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

+0 −11
Original line number Diff line number Diff line
@@ -23,14 +23,3 @@ 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

+1 −1
Original line number Diff line number Diff line 
apiVersion: {{ template "kube-state-metrics.deployment.apiVersion" . }}

apiVersion: apps/v1

kind: Deployment

metadata:

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

charts/redis/templates/_helpers.tpl

+0 −22
Original line number Diff line number Diff line
@@ -130,25 +130,3 @@ 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 -}}