Skip to content

[cko] Added RKE-1.4.9 and RKE-1.3.24 flavors #1024

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: cko-mvp-1
Choose a base branch
from
Open

[cko] Added RKE-1.4.9 and RKE-1.3.24 flavors #1024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
391260f
Added RKE-1.4.9 flavor
jeffinkottaram Sep 12, 2023
0cb1ddd
Added RKE-1.3.24 flavor
jeffinkottaram Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions provision/acc_provision/acc_provision.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1836,6 +1836,52 @@ def generate_rancher_1_3_21_yaml(args, config, operator_output, operator_tar, op
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')
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 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:
Expand Down
138 changes: 125 additions & 13 deletions provision/acc_provision/flavors.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4202,6 +4202,62 @@ flavors:
status: null
hidden: false
order: 52
RKE-1.4.9:
desc: Rancher Kubernetes Engine min version 1.4.9
default_version: 6.0.3.1
options:
template_generator: generate_rancher_1_4_9_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: 53
RKE-1.4.6:
desc: Rancher Kubernetes Engine min version 1.4.6
default_version: 6.0.3.1
Expand Down Expand Up @@ -4257,7 +4313,63 @@ flavors:
disable: False
hidden: False
status: null
order: 53
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
Expand Down Expand Up @@ -4313,7 +4425,7 @@ flavors:
disable: False
hidden: False
status: null
order: 54
order: 56
RKE-1.3.20:
desc: Rancher Kubernetes Engine min version 1.3.20
default_version: 6.0.3.1
Expand Down Expand Up @@ -4369,7 +4481,7 @@ flavors:
disable: False
hidden: False
status: null
order: 55
order: 57
RKE-1.3.18:
desc: Rancher Kubernetes Engine min version 1.3.18
default_version: 6.0.3.1
Expand Down Expand Up @@ -4425,7 +4537,7 @@ flavors:
disable: False
hidden: False
status: null
order: 56
order: 58
RKE-1.3.17:
desc: Rancher Kubernetes Engine min version 1.3.17
default_version: 6.0.3.1
Expand Down Expand Up @@ -4481,7 +4593,7 @@ flavors:
disable: False
hidden: False
status: null
order: 57
order: 59
RKE-1.3.13:
desc: Rancher Kubernetes Engine min version 1.3.13
default_version: 6.0.3.1
Expand Down Expand Up @@ -4537,7 +4649,7 @@ flavors:
disable: False
hidden: False
status: null
order: 58
order: 60
RKE-1.2.3:
desc: Rancher Kubernetes Engine min version 1.2.3
default_version: 6.0.3.1
Expand Down Expand Up @@ -4593,7 +4705,7 @@ flavors:
disable: False
hidden: False
status: null
order: 59
order: 61
k8s-overlay:
desc: Kubernetes basic overlay
default_version: 6.0.3.1
Expand Down Expand Up @@ -4639,7 +4751,7 @@ flavors:
enable: true
status: Experimental
hidden: true
order: 60
order: 62
aks:
desc: Azure Kubernetes Service
default_version: 6.0.3.1
Expand Down Expand Up @@ -4698,7 +4810,7 @@ flavors:
prot: tcp
status: Experimental
hidden: true
order: 61
order: 63
cloud:
desc: Openshift IPI/AWS
default_version: 6.0.3.1
Expand Down Expand Up @@ -4826,7 +4938,7 @@ flavors:

status: Experimental
hidden: true
order: 62
order: 64
eks:
desc: Elastic Kubernetes Service (aws)
default_version: 6.0.3.1
Expand Down Expand Up @@ -4952,7 +5064,7 @@ flavors:

status: Experimental
hidden: true
order: 63
order: 65
calico-3.23.2:
desc: calico-3.23.2
default_version: 3.23
Expand All @@ -4961,7 +5073,7 @@ flavors:
template_generator: generate_calico_deployment_files
status: Experimental
hidden: False
order: 64
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
Expand Down Expand Up @@ -4990,4 +5102,4 @@ flavors:
kube_default_provide_kube_api: True
status: null
hidden: false
order: 65
order: 67
Loading