Skip to content

DNM: Make worker-Nodes take preference in nncp ci_kustomize #3056

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 1 commit into
base: main
Choose a base branch
from
+62 −15
Open

DNM: Make worker-Nodes take preference in nncp ci_kustomize #3056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion roles/ci_dcn_site/templates/network-values/values.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
{% set ns = namespace(interfaces={},
ocp_index=0,
lb_tools={}) %}
{% set host_sorted_array=cifmw_networking_env_definition.instances.keys() | list | reverse %}

data:
{% for host in cifmw_networking_env_definition.instances.keys() -%}
{% for host in host_sorted_array -%}
{% for network in cifmw_networking_env_definition.instances[host]['networks'].values() -%}
{% set ns.interfaces = ns.interfaces |
combine({network.network_name: (network.parent_interface |
Expand Down
6 changes: 5 additions & 1 deletion roles/ci_gen_kustomize_values/templates/bgp-l3-xl/network-values/values.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@
{% set ns = namespace(interfaces={},
ocp_index=0,
lb_tools={}) %}

{% set host_sorted_array=cifmw_networking_env_definition.instances.keys() | list | reverse %}


data:
{% for host in cifmw_networking_env_definition.instances.keys() -%}
{% for host in host_sorted_array -%}
{% set hostname = cifmw_networking_env_definition.instances[host]['hostname'] %}
{% if host is match('^(ocp|crc).*') %}
node_{{ ns.ocp_index }}:
Expand Down
5 changes: 4 additions & 1 deletion roles/ci_gen_kustomize_values/templates/bgp_dt01/network-values/values.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@
{% set ns = namespace(interfaces={},
ocp_index=0,
lb_tools={}) %}
{% set host_sorted_array=cifmw_networking_env_definition.instances.keys() | list | reverse %}


data:
{% for host in cifmw_networking_env_definition.instances.keys() -%}
{% for host in host_sorted_array -%}
{% set hostname = cifmw_networking_env_definition.instances[host]['hostname'] %}
{% if host is match('^(ocp|crc).*') %}
node_{{ ns.ocp_index }}:
Expand Down
5 changes: 4 additions & 1 deletion roles/ci_gen_kustomize_values/templates/bmo01/network-values/values.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
# source: bmo01/network-values/values.yaml.j2
{% set _ipv = cifmw_ci_gen_kustomize_values_ip_version_var_mapping %}
{% set ns = namespace(ocp_index=0) %}
{% set host_sorted_array=cifmw_networking_env_definition.instances.keys() | list | reverse %}


data:
{% for host in cifmw_networking_env_definition.instances.keys() -%}
{% for host in host_sorted_array -%}
{% if host is match('^(ocp|crc).*') %}
node_{{ ns.ocp_index }}:
{% set ns.ocp_index = ns.ocp_index+1 %}
Expand Down
5 changes: 4 additions & 1 deletion roles/ci_gen_kustomize_values/templates/common/network-values/values.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@
{% set ns = namespace(interfaces={},
ocp_index=0,
lb_tools={}) %}
{% set host_sorted_array=cifmw_networking_env_definition.instances.keys() | list | reverse %}


data:
{% for host in cifmw_networking_env_definition.instances.keys() -%}
{% for host in host_sorted_array -%}
{% if host is match('^(ocp|crc).*') %}
node_{{ ns.ocp_index }}:
{% set ns.ocp_index = ns.ocp_index+1 %}
Expand Down
5 changes: 4 additions & 1 deletion roles/ci_gen_kustomize_values/templates/dcn/network-values/values.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@
{% set ns = namespace(interfaces={},
ocp_index=0,
lb_tools={}) %}
{% set host_sorted_array=cifmw_networking_env_definition.instances.keys() | list | reverse %}


data:
{% for host in cifmw_networking_env_definition.instances.keys() -%}
{% for host in host_sorted_array -%}
{% for network in cifmw_networking_env_definition.instances[host]['networks'].values() -%}
{% set ns.interfaces = ns.interfaces |
combine({network.network_name: (network.parent_interface |
Expand Down
5 changes: 4 additions & 1 deletion roles/ci_gen_kustomize_values/templates/multi-namespace/network-values2/values.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@
{% set ns = namespace(interfaces={},
ocp_index=0,
lb_tools={}) %}
{% set host_sorted_array=cifmw_networking_env_definition.instances.keys() | list | reverse %}


data:
{% for host in cifmw_networking_env_definition.instances.keys() -%}
{% for host in host_sorted_array -%}
{% if host is match('^(ocp|crc).*') %}
node_{{ ns.ocp_index }}:
{% set ns.ocp_index = ns.ocp_index+1 %}
Expand Down
5 changes: 4 additions & 1 deletion roles/ci_gen_kustomize_values/templates/osasinfra-ipv6/network-values/values.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@
{% set ns = namespace(interfaces={},
ocp_index=0,
lb_tools={}) %}
{% set host_sorted_array=cifmw_networking_env_definition.instances.keys() | list | reverse %}


data:
{% for host in cifmw_networking_env_definition.instances.keys() -%}
{% for host in host_sorted_array -%}
{% if host is match('^(ocp|crc).*') %}
node_{{ ns.ocp_index }}:
{% set ns.ocp_index = ns.ocp_index+1 %}
Expand Down
2 changes: 2 additions & 0 deletions roles/ci_gen_kustomize_values/templates/shiftstack/network-values/values.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
---
# source: shiftstack/network-values/values.yaml.j2
{% set ns = namespace(interfaces={}, ocp_index=0, lb_tools={}) %}
{% set host_sorted_array=cifmw_networking_env_definition.instances.keys() | list | reverse %}


data:
{% for host in cifmw_networking_env_definition.instances.keys() -%}
Expand Down
5 changes: 4 additions & 1 deletion roles/ci_gen_kustomize_values/templates/uni01alpha-adoption/network-values/values.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@
{% set ns = namespace(interfaces={},
ocp_index=0,
lb_tools={}) %}
{% set host_sorted_array=cifmw_networking_env_definition.instances.keys() | list | reverse %}


data:
{% for host in cifmw_networking_env_definition.instances.keys() -%}
{% for host in chost_sorted_array -%}
{% if host is match('^(ocp|crc).*') %}
node_{{ ns.ocp_index }}:
{% set ns.ocp_index = ns.ocp_index+1 %}
Expand Down
5 changes: 4 additions & 1 deletion roles/ci_gen_kustomize_values/templates/uni01alpha/network-values/values.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@
{% set ns = namespace(interfaces={},
ocp_index=0,
lb_tools={}) %}
{% set host_sorted_array=cifmw_networking_env_definition.instances.keys() | list | reverse %}


data:
{% for host in cifmw_networking_env_definition.instances.keys() -%}
{% for host in host_sorted_array -%}
{% if host is match('^(ocp|crc).*') %}
node_{{ ns.ocp_index }}:
{% set ns.ocp_index = ns.ocp_index+1 %}
Expand Down
5 changes: 4 additions & 1 deletion .../ci_gen_kustomize_values/templates/uni04delta-ipv6-adoption/network-values/values.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@
{% set ns = namespace(interfaces={},
ocp_index=0,
lb_tools={}) %}
{% set host_sorted_array=cifmw_networking_env_definition.instances.keys() | list | reverse %}


data:
{% for host in cifmw_networking_env_definition.instances.keys() -%}
{% for host in host_sorted_array -%}
{% if host is match('^(ocp|crc).*') %}
node_{{ ns.ocp_index }}:
{% set ns.ocp_index = ns.ocp_index+1 %}
Expand Down
5 changes: 4 additions & 1 deletion roles/ci_gen_kustomize_values/templates/uni04delta-ipv6/network-values/values.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@
{% set ns = namespace(interfaces={},
ocp_index=0,
lb_tools={}) %}
{% set host_sorted_array=cifmw_networking_env_definition.instances.keys() | list | reverse %}


data:
{% for host in cifmw_networking_env_definition.instances.keys() -%}
{% for host in host_sorted_array -%}
{% if host is match('^(ocp|crc).*') %}
node_{{ ns.ocp_index }}:
{% set ns.ocp_index = ns.ocp_index+1 %}
Expand Down
5 changes: 4 additions & 1 deletion roles/ci_gen_kustomize_values/templates/uni05epsilon/network-values/values.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@
{% set ns = namespace(interfaces={},
ocp_index=0,
lb_tools={}) %}
{% set host_sorted_array=cifmw_networking_env_definition.instances.keys() | list | reverse %}


data:
{% for host in cifmw_networking_env_definition.instances.keys() -%}
{% for host in host_sorted_array -%}
{% if host is match('^(ocp|crc).*') %}
node_{{ ns.ocp_index }}:
{% set ns.ocp_index = ns.ocp_index+1 %}
Expand Down
5 changes: 4 additions & 1 deletion roles/ci_gen_kustomize_values/templates/uni06zeta/network-values/values.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@
{% set ns = namespace(interfaces={},
ocp_index=0,
lb_tools={}) %}
{% set host_sorted_array=cifmw_networking_env_definition.instances.keys() | list | reverse %}


data:
{% for host in cifmw_networking_env_definition.instances.keys() -%}
{% for host in host_sorted_array -%}
{% if host is match('^(ocp|crc).*') %}
node_{{ ns.ocp_index }}:
{% set ns.ocp_index = ns.ocp_index+1 %}
Expand Down
5 changes: 4 additions & 1 deletion roles/ci_gen_kustomize_values/templates/uni07eta/network-values/values.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@
{% set ns = namespace(interfaces={},
ocp_index=0,
lb_tools={}) %}
{% set host_sorted_array=cifmw_networking_env_definition.instances.keys() | list | reverse %}


data:
{% for host in cifmw_networking_env_definition.instances.keys() -%}
{% for host in host_sorted_array -%}
{% if host is match('^(ocp|crc).*') %}
node_{{ ns.ocp_index }}:
{% set ns.ocp_index = ns.ocp_index+1 %}
Expand Down