Added RKE-1.3.24 flavor

Author: jeffinkottaram

provision/acc_provision/acc_provision.py

@@ -1835,6 +1835,7 @@ def generate_rancher_1_3_21_yaml(args, config, operator_output, operator_tar, op
         else:
             template.stream(config=config).dump(operator_output)
 
+
 def generate_rancher_1_4_9_yaml(args, config, operator_output, operator_tar, operator_cr_output):
     if operator_output and operator_output != "/dev/null":
         template = get_jinja_template(config["aci_cni_versions_path"] + 'aci-network-provider-cluster-1-4-9.yaml')
@@ -1858,6 +1859,29 @@ def generate_rancher_1_4_9_yaml(args, config, operator_output, operator_tar, ope
             template.stream(config=config).dump(operator_output)
 
 
+def generate_rancher_1_3_24_yaml(args, config, operator_output, operator_tar, operator_cr_output):
+    if operator_output and operator_output != "/dev/null":
+        template = get_jinja_template(config["aci_cni_versions_path"] + 'aci-network-provider-cluster-1-3-24.yaml')
+        outname = operator_output
+        # At this time, we do not use the aci-containers-operator with Rancher.
+        # The template to generate ACI CNI components is upstream in RKE code
+        # Here we generate the input file to feed into RKE, which looks almost
+        # the same as the acc-provision_input file
+
+        # If no output containers(-o) deployment file is provided, print to stdout.
+        # Else, save to file.
+        if operator_output == "-":
+            outname = "<stdout>"
+            operator_output = sys.stdout
+        info("Writing Rancher network provider portion of cluster.yml to %s" % outname)
+        info("Use this network provider section in the cluster.yml you use with RKE")
+        if operator_output != sys.stdout:
+            with open(operator_output, "w") as fh:
+                fh.write(template.render(config=config))
+        else:
+            template.stream(config=config).dump(operator_output)
+
+
 def get_cko_mode(args, netopConfig):
     cko_mode = "unamanged"
     if args.cko_mode is not None:

provision/acc_provision/flavors.yaml

@@ -4314,6 +4314,62 @@ flavors:
     hidden: False
     status: null
     order: 54
+  RKE-1.3.24:
+    desc: Rancher Kubernetes Engine min version 1.3.24
+    default_version: 6.0.3.1
+    options:
+      template_generator: generate_rancher_1_3_24_yaml
+    config:
+      rke_config:
+        contracts:
+          - name: prometheus-monitoring
+            provided: ["aci-containers-system"]
+            consumed: ["aci-containers-istio"]
+            filter: "access-prometheus"
+        filters:
+          - name: access-prometheus
+            items:
+              - name: http
+                range: [8080, 8080]
+                etherT: ip
+                prot: tcp
+                stateful: "no"
+      kube_config:
+        allow_kube_api_default_epg: True
+        allow_pods_external_access: True
+      aci_config:
+        items:
+          - name: metrics-kubelet
+            range: [10250, 10250]
+            etherT: ip
+            prot: tcp
+            stateful: "no"
+          - name: monitoring-node
+            range: [9796, 9796]
+            etherT: ip
+            prot: tcp
+            stateful: "no"
+          - name: monitoring-ingress
+            range: [10254, 10254]
+            etherT: ip
+            prot: tcp
+            stateful: "no"
+          - name: rancher-ui
+            range: [443, 443]
+            etherT: ip
+            prot: tcp
+            stateful: "no"
+        vmm_domain:
+          type: Kubernetes
+          injected_cluster_type: RKE
+          injected_cluster_provider: Rancher
+      istio_config:
+        install_istio: False
+      multus:
+        disable: False
+    hidden: False
+    status: null
+    order: 55
   RKE-1.3.21:
     desc: Rancher Kubernetes Engine min version 1.3.21
     default_version: 6.0.3.1
@@ -4369,7 +4425,7 @@ flavors:
         disable: False
     hidden: False
     status: null
-    order: 55
+    order: 56
   RKE-1.3.20:
     desc: Rancher Kubernetes Engine min version 1.3.20
     default_version: 6.0.3.1
@@ -4425,7 +4481,7 @@ flavors:
         disable: False
     hidden: False
     status: null
-    order: 56
+    order: 57
   RKE-1.3.18:
     desc: Rancher Kubernetes Engine min version 1.3.18
     default_version: 6.0.3.1
@@ -4481,7 +4537,7 @@ flavors:
         disable: False
     hidden: False
     status: null
-    order: 57
+    order: 58
   RKE-1.3.17:
     desc: Rancher Kubernetes Engine min version 1.3.17
     default_version: 6.0.3.1
@@ -4537,7 +4593,7 @@ flavors:
         disable: False
     hidden: False
     status: null
-    order: 58
+    order: 59
   RKE-1.3.13:
     desc: Rancher Kubernetes Engine min version 1.3.13
     default_version: 6.0.3.1
@@ -4593,7 +4649,7 @@ flavors:
         disable: False
     hidden: False
     status: null
-    order: 59
+    order: 60
   RKE-1.2.3:
     desc: Rancher Kubernetes Engine min version 1.2.3
     default_version: 6.0.3.1
@@ -4649,7 +4705,7 @@ flavors:
         disable: False
     hidden: False
     status: null
-    order: 60
+    order: 61
   k8s-overlay:
     desc: Kubernetes basic overlay
     default_version: 6.0.3.1
@@ -4695,7 +4751,7 @@ flavors:
         enable: true
     status: Experimental
     hidden: true
-    order: 61
+    order: 62
   aks:
     desc: Azure Kubernetes Service
     default_version: 6.0.3.1
@@ -4754,7 +4810,7 @@ flavors:
                   prot: tcp
     status: Experimental
     hidden: true
-    order: 62
+    order: 63
   cloud:
     desc: Openshift IPI/AWS
     default_version: 6.0.3.1
@@ -4882,7 +4938,7 @@ flavors:
 
     status: Experimental
     hidden: true
-    order: 63
+    order: 64
   eks:
     desc: Elastic Kubernetes Service (aws)
     default_version: 6.0.3.1
@@ -5008,7 +5064,7 @@ flavors:
 
     status: Experimental
     hidden: true
-    order: 64
+    order: 65
   calico-3.23.2:
     desc: calico-3.23.2
     default_version: 3.23
@@ -5017,7 +5073,7 @@ flavors:
       template_generator: generate_calico_deployment_files
     status: Experimental
     hidden: False
-    order: 65
+    order: 66
   openshift-sdn-ovn-baremetal:
     desc: Chained CNI for Red Hat OpenShift Container Platform 4.12 on Baremetal
     default_version: 6.0.3.1
@@ -5046,4 +5102,4 @@ flavors:
         kube_default_provide_kube_api: True
     status: null
     hidden: false
-    order: 66
+    order: 67