Fixing version range handling from strings to semver (#4598)

* Fixing version range handling from strings to semver

See #3002 for more detail

* 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)
This commit is contained in:
Matt Farina
2018-04-03 09:32:06 -07:00
committed by k8s-ci-robot
parent fb96d3f6e3
commit 0959372446
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
name: datadog
version: 0.11.0
version: 0.11.1
appVersion: 6.0.0
description: DataDog Agent
keywords:
+1 -1
View File
@@ -43,7 +43,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
Return the appropriate apiVersion for RBAC APIs.
*/}}
{{- define "rbac.apiVersion" -}}
{{- if ge .Capabilities.KubeVersion.Minor "8" -}}
{{- if semverCompare "^1.8-0" .Capabilities.KubeVersion.GitVersion -}}
"rbac.authorization.k8s.io/v1"
{{- else -}}
"rbac.authorization.k8s.io/v1beta1"
+1 -1
View File
@@ -89,7 +89,7 @@ spec:
value: docker
- name: KUBERNETES
value: "yes"
{{- if (semverCompare ">=1" .Capabilities.KubeVersion.Major) and (semverCompare ">=7" .Capabilities.KubeVersion.Minor) }}
{{- if semverCompare "^1.7-0" .Capabilities.KubeVersion.GitVersion }}
- name: DD_KUBERNETES_KUBELET_HOST
valueFrom:
fieldRef: