From 80f74ae8d8f6fdc57ec06802803bb8aa857e20bd Mon Sep 17 00:00:00 2001 From: Xiang Dai <764524258@qq.com> Date: Thu, 3 Oct 2019 04:08:08 +0800 Subject: [PATCH] [stable/selenium] Fixes compatibility with 1.16 (#17536) * Fixes compatibility with 1.16 Signed-off-by: Xiang Dai <764524258@qq.com> * fix white noise Signed-off-by: Xiang Dai <764524258@qq.com> * fix a typo Signed-off-by: Xiang Dai <764524258@qq.com> --- stable/selenium/Chart.yaml | 2 +- stable/selenium/templates/_helpers.tpl | 10 ++++++++++ stable/selenium/templates/chrome-deployment.yaml | 4 ++-- stable/selenium/templates/chromeDebug-deployment.yaml | 4 ++-- stable/selenium/templates/firefox-deployment.yaml | 4 ++-- stable/selenium/templates/firefoxDebug-deployment.yaml | 4 ++-- stable/selenium/templates/hub-deployment.yaml | 4 ++-- 7 files changed, 21 insertions(+), 11 deletions(-) diff --git a/stable/selenium/Chart.yaml b/stable/selenium/Chart.yaml index 11cd9a5b9c..ca4ac1654c 100644 --- a/stable/selenium/Chart.yaml +++ b/stable/selenium/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: selenium -version: 1.0.8 +version: 1.0.9 appVersion: 3.141.59 description: Chart for selenium grid keywords: diff --git a/stable/selenium/templates/_helpers.tpl b/stable/selenium/templates/_helpers.tpl index 540510f22a..3496ce08c7 100644 --- a/stable/selenium/templates/_helpers.tpl +++ b/stable/selenium/templates/_helpers.tpl @@ -55,3 +55,13 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this {{- printf "%s-selenium-firefox-debug" .Release.Name | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{/* +Return the apiVersion of deployment. +*/}} +{{- define "deployment.apiVersion" -}} +{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- print "extensions/v1beta1" -}} +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- print "apps/v1" -}} +{{- end -}} +{{- end -}} diff --git a/stable/selenium/templates/chrome-deployment.yaml b/stable/selenium/templates/chrome-deployment.yaml index af0ee53afd..81a8ef229f 100644 --- a/stable/selenium/templates/chrome-deployment.yaml +++ b/stable/selenium/templates/chrome-deployment.yaml @@ -1,5 +1,5 @@ {{- if eq true .Values.chrome.enabled -}} -apiVersion: extensions/v1beta1 +apiVersion: {{ template "deployment.apiVersion" . }} kind: Deployment metadata: name: {{ template "selenium.chrome.fullname" . }} @@ -88,7 +88,7 @@ spec: resources: {{ toYaml .Values.chrome.resources | trim | indent 12 }} {{- if or .Values.global.imagePullSecrets .Values.chrome.imagePullSecrets }} - imagePullSecrets: + imagePullSecrets: - name: {{ .Values.chrome.imagePullSecrets | default .Values.global.imagePullSecrets | quote }} {{- end }} volumes: diff --git a/stable/selenium/templates/chromeDebug-deployment.yaml b/stable/selenium/templates/chromeDebug-deployment.yaml index c2309b2df0..2f7682b7d8 100644 --- a/stable/selenium/templates/chromeDebug-deployment.yaml +++ b/stable/selenium/templates/chromeDebug-deployment.yaml @@ -1,5 +1,5 @@ {{- if eq true .Values.chromeDebug.enabled -}} -apiVersion: extensions/v1beta1 +apiVersion: {{ template "deployment.apiVersion" . }} kind: Deployment metadata: name: {{ template "selenium.chromeDebug.fullname" . }} @@ -90,7 +90,7 @@ spec: resources: {{ toYaml .Values.chromeDebug.resources | indent 12 }} {{- if or .Values.global.imagePullSecrets .Values.chromeDebug.imagePullSecrets }} - imagePullSecrets: + imagePullSecrets: - name: {{ .Values.chromeDebug.imagePullSecrets | default .Values.global.imagePullSecrets | quote }} {{- end }} volumes: diff --git a/stable/selenium/templates/firefox-deployment.yaml b/stable/selenium/templates/firefox-deployment.yaml index c3af5f86df..7a6144590f 100644 --- a/stable/selenium/templates/firefox-deployment.yaml +++ b/stable/selenium/templates/firefox-deployment.yaml @@ -1,5 +1,5 @@ {{- if eq true .Values.firefox.enabled -}} -apiVersion: extensions/v1beta1 +apiVersion: {{ template "deployment.apiVersion" . }} kind: Deployment metadata: name: {{ template "selenium.firefox.fullname" . }} @@ -84,7 +84,7 @@ spec: resources: {{ toYaml .Values.firefox.resources | indent 12 }} {{- if or .Values.global.imagePullSecrets .Values.firefox.imagePullSecrets }} - imagePullSecrets: + imagePullSecrets: - name: {{ .Values.firefox.imagePullSecrets | default .Values.global.imagePullSecrets | quote }} {{- end }} hostAliases: diff --git a/stable/selenium/templates/firefoxDebug-deployment.yaml b/stable/selenium/templates/firefoxDebug-deployment.yaml index ec88b602f5..6366cc2b75 100644 --- a/stable/selenium/templates/firefoxDebug-deployment.yaml +++ b/stable/selenium/templates/firefoxDebug-deployment.yaml @@ -1,5 +1,5 @@ {{- if eq true .Values.firefoxDebug.enabled -}} -apiVersion: extensions/v1beta1 +apiVersion: {{ template "deployment.apiVersion" . }} kind: Deployment metadata: name: {{ template "selenium.firefoxDebug.fullname" . }} @@ -86,7 +86,7 @@ spec: resources: {{ toYaml .Values.firefoxDebug.resources | indent 12 }} {{- if or .Values.global.imagePullSecrets .Values.firefoxDebug.imagePullSecrets }} - imagePullSecrets: + imagePullSecrets: - name: {{ .Values.firefoxDebug.imagePullSecrets | default .Values.global.imagePullSecrets | quote }} {{- end }} hostAliases: diff --git a/stable/selenium/templates/hub-deployment.yaml b/stable/selenium/templates/hub-deployment.yaml index f049d7934c..1278f41793 100644 --- a/stable/selenium/templates/hub-deployment.yaml +++ b/stable/selenium/templates/hub-deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: {{ template "deployment.apiVersion" . }} kind: Deployment metadata: name: {{ template "selenium.hub.fullname" . }} @@ -94,7 +94,7 @@ spec: resources: {{ toYaml .Values.hub.resources | trim | indent 12 -}} {{- if or .Values.global.imagePullSecrets .Values.hub.imagePullSecrets }} - imagePullSecrets: + imagePullSecrets: - name: {{ .Values.hub.imagePullSecrets | default .Values.global.imagePullSecrets | quote }} {{- end }} nodeSelector: