Merge pull request #618 from noironetworks/update_priorityclass_api

update apiversion of aci cni priorityclass for openshift 4.10 on esx …

Author: snaiksat

provision/acc_provision/templates/aci-containers.yaml

@@ -17,8 +17,11 @@ metadata:
 ---
 {% endif %}
 {% if config.kube_config.use_acicni_priority_class %}
-{% set list1 = config.flavor.split('-') %}
-{% if list1[1] >= "4.9"  and list1[2] == "openstack" %}
+{% set flavor_version = config.flavor.split('-') %}
+{% set major_version = flavor_version[1].split('.')[0] | int %}
+{% set minor_version = flavor_version[1].split('.')[1] | int %}
+{% if (major_version >= 4 and  minor_version >= 9
+       and flavor_version[2] in ["openstack", "esx", "baremetal"]) %}
 apiVersion: scheduling.k8s.io/v1
 {% else %}
 apiVersion: scheduling.k8s.io/v1beta1

provision/testdata/flavor_openshift_410_esx.kube.yaml

@@ -1,4 +1,4 @@
-apiVersion: scheduling.k8s.io/v1beta1
+apiVersion: scheduling.k8s.io/v1
 description: This priority class is used for ACI-CNI resources
 globalDefault: false
 kind: PriorityClass

provision/testdata/flavor_openshift_410_esx_tar/cluster-network-06-PriorityClass-acicni-priority.yaml

@@ -1,4 +1,4 @@
-apiVersion: scheduling.k8s.io/v1beta1
+apiVersion: scheduling.k8s.io/v1
 description: This priority class is used for ACI-CNI resources
 globalDefault: false
 kind: PriorityClass