Merge pull request #9 from asengqi/master

update version comparison for openshift 310
neuvector · Sep 25, 2018 · b8c59e9 · b8c59e9
2 parents 0ed3a51 + d5879ba
commit b8c59e9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/templates/clusterrole.yaml b/templates/clusterrole.yaml
@@ -1,4 +1,4 @@
-{{- if not .Capabilities.KubeVersion.Major }}
+{{- if and .Values.openshift (semverCompare ">=1.9-0" (substr 1 -1 .Capabilities.KubeVersion.GitVersion)) }}
 apiVersion: authorization.openshift.io/v1
 {{- else if (semverCompare ">=1.8-0" (substr 1 -1 .Capabilities.KubeVersion.GitVersion)) }}
 apiVersion: rbac.authorization.k8s.io/v1

diff --git a/templates/clusterrolebinding.yaml b/templates/clusterrolebinding.yaml
@@ -1,4 +1,4 @@
-{{- if not .Capabilities.KubeVersion.Major }}
+{{- if and .Values.openshift (semverCompare ">=1.9-0" (substr 1 -1 .Capabilities.KubeVersion.GitVersion)) }}
 apiVersion: authorization.openshift.io/v1
 {{- else if (semverCompare ">=1.8-0" (substr 1 -1 .Capabilities.KubeVersion.GitVersion)) }}
 apiVersion: rbac.authorization.k8s.io/v1

diff --git a/templates/route.yaml b/templates/route.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.openshift -}}
-{{- if not .Capabilities.KubeVersion.Major }}
+{{- if (semverCompare ">=1.9-0" (substr 1 -1 .Capabilities.KubeVersion.GitVersion)) }}
 apiVersion: route.openshift.io/v1
 {{- else }}
 apiVersion: v1