Skip to content

Commit

Permalink
Fix for version comparison from strings to semver (helm#4600)
Browse files Browse the repository at this point in the history
* Fix for version comparison from strings to semver

See helm#3002 for more detail

* Updating maintainers to github ids

* Fixing " error due to wrong " character

* Include pre-releases in the semver ranges

This is important when testing against alpha and beta builds of
Kubernetes along with environments that use pre-releases to denote
things other than pre-releases (e.g., gke denotes the environment
with a pre-releases)
  • Loading branch information
mattfarina authored and Jean-Noël Vouilloz committed May 15, 2018
1 parent ce86947 commit 01ea37f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions stable/kube2iam/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: kube2iam
version: 0.8.4
version: 0.8.5
appVersion: 0.10.0
description: Provide IAM credentials to pods based on annotations.
keywords:
Expand All @@ -11,10 +11,10 @@ home: https://github.com/jtblin/kube2iam
sources:
- https://github.com/jtblin/kube2iam
maintainers:
- name: Josh Carp
- name: jmcarp
email: [email protected]
- name: Michael Haselton
- name: icereval
email: [email protected]
- name: Michael Goodness
- name: mgoodness
email: [email protected]
engine: gotpl
2 changes: 1 addition & 1 deletion stable/kube2iam/templates/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ spec:
serviceAccountName: {{ if .Values.rbac.create }}{{ template "kube2iam.fullname" . }}{{ else }}"{{ .Values.rbac.serviceAccountName }}"{{ end }}
tolerations:
{{ toYaml .Values.tolerations | indent 8 }}
{{- if and (eq .Capabilities.KubeVersion.Major "1") (gt .Capabilities.KubeVersion.Minor "5") }}
{{- if semverCompare "^1.6-0" .Capabilities.KubeVersion.GitVersion }}
updateStrategy:
type: {{ .Values.updateStrategy }}
{{- end }}

0 comments on commit 01ea37f

Please sign in to comment.