diff --git a/stable/weave-scope/Chart.yaml b/stable/weave-scope/Chart.yaml index 7b965fba17..713f6416b5 100644 --- a/stable/weave-scope/Chart.yaml +++ b/stable/weave-scope/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: weave-scope -version: 1.1.7 -appVersion: 1.11.6 +version: 1.1.8 +appVersion: 1.12.0 description: A Helm chart for the Weave Scope cluster visualizer. keywords: - containers diff --git a/stable/weave-scope/charts/weave-scope-agent/Chart.yaml b/stable/weave-scope/charts/weave-scope-agent/Chart.yaml index 659bacb143..77d69f36c1 100644 --- a/stable/weave-scope/charts/weave-scope-agent/Chart.yaml +++ b/stable/weave-scope/charts/weave-scope-agent/Chart.yaml @@ -1,7 +1,7 @@ description: A Helm chart for the Weave Scope cluster visualizer node agent. name: weave-scope-agent -version: 1.1.7 -appVersion: 1.11.6 +version: 1.1.8 +appVersion: 1.12.0 keywords: - containers - dashboard diff --git a/stable/weave-scope/charts/weave-scope-cluster-agent/Chart.yaml b/stable/weave-scope/charts/weave-scope-cluster-agent/Chart.yaml index e88852a819..ca7ce02b9c 100644 --- a/stable/weave-scope/charts/weave-scope-cluster-agent/Chart.yaml +++ b/stable/weave-scope/charts/weave-scope-cluster-agent/Chart.yaml @@ -1,7 +1,7 @@ description: A Helm chart for the Weave Scope cluster visualizer node agent. name: weave-scope-cluster-agent -version: 1.1.7 -appVersion: 1.11.6 +version: 1.1.8 +appVersion: 1.12.0 keywords: - containers - dashboard diff --git a/stable/weave-scope/charts/weave-scope-frontend/Chart.yaml b/stable/weave-scope/charts/weave-scope-frontend/Chart.yaml index 90566bd834..715296a715 100644 --- a/stable/weave-scope/charts/weave-scope-frontend/Chart.yaml +++ b/stable/weave-scope/charts/weave-scope-frontend/Chart.yaml @@ -1,7 +1,7 @@ description: A Helm chart for the Weave Scope cluster visualizer frontend. name: weave-scope-frontend -version: 1.1.7 -appVersion: 1.11.6 +version: 1.1.8 +appVersion: 1.12.0 keywords: - containers - dashboard diff --git a/stable/weave-scope/charts/weave-scope-frontend/templates/_helpers.tpl b/stable/weave-scope/charts/weave-scope-frontend/templates/_helpers.tpl index f6796574b8..c086f87813 100644 --- a/stable/weave-scope/charts/weave-scope-frontend/templates/_helpers.tpl +++ b/stable/weave-scope/charts/weave-scope-frontend/templates/_helpers.tpl @@ -48,3 +48,14 @@ Create a fully qualified name that always uses the name of the top-level chart. {{- $name := default (.Template.BasePath | split "/" )._0 .Values.nameOverride -}} {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} {{- end -}} + +{{/* +Return the apiVerion 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/weave-scope/values.yaml b/stable/weave-scope/values.yaml index cbbcfae74b..9b7b8d7b4d 100644 --- a/stable/weave-scope/values.yaml +++ b/stable/weave-scope/values.yaml @@ -4,7 +4,7 @@ global: # global.image: the image that will be used for this release image: repository: weaveworks/scope - tag: 1.11.5 + tag: 1.12.0 # global.image.pullPolicy: must be Always, IfNotPresent, or Never pullPolicy: "IfNotPresent" # global.service.*: the configuration of the service used to access the frontend