Update kustomize examples

Renaming values to make easier to compose i.e. replace components with other scenarios Signed-off-by: Fabricio Aguiar <[email protected]>
openstack-k8s-operators · Mar 19, 2024 · 45f3444 · 45f3444
1 parent 60b12bf
commit 45f3444
Show file tree

Hide file tree

Showing 32 changed files with 170 additions and 106 deletions.
diff --git a/examples/baremetal/kustomization.yaml b/examples/baremetal/kustomization.yaml
@@ -14,7 +14,7 @@ replacements:
 # OpenStackDataPlaneNodeSet customizations
 - source:
     kind: DataPlaneConfig
-    name: edpm-values
+    name: edpm-baremetal-values
     fieldPath: data.nodeset.nodetemplate.ansible.vars.edpm_sshd_allowed_ranges
   targets:
   - select:
@@ -25,7 +25,7 @@ replacements:
       create: true
 - source:
     kind: DataPlaneConfig
-    name: edpm-values
+    name: edpm-baremetal-values
     fieldPath: data.nodeset.baremetalsettemplate
   targets:
   - select:
@@ -36,7 +36,7 @@ replacements:
       create: true
 - source:
     kind: DataPlaneConfig
-    name: edpm-values
+    name: edpm-baremetal-values
     fieldPath: data.preProvisioned
   targets:
   - select:
@@ -47,7 +47,7 @@ replacements:
       create: true
 - source:
     kind: DataPlaneConfig
-    name: edpm-values
+    name: edpm-baremetal-values
     fieldPath: data.nodeset.nodetemplate.networks
   targets:
   - select:

diff --git a/examples/baremetal/values.yaml b/examples/baremetal/values.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: DataPlaneConfig
 metadata:
-  name: edpm-values
+  name: edpm-baremetal-values
   annotations:
     config.kubernetes.io/local-config: "true"
 data:

diff --git a/examples/base/files/nic-config.j2 b/examples/base/files/nic-config.j2
@@ -0,0 +1,31 @@
+---
+{% set mtu_list = [ctlplane_mtu] %}
+{% for network in role_networks %}
+{{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }}
+{%- endfor %}
+{% set min_viable_mtu = mtu_list | max %}
+network_config:
+- type: ovs_bridge
+name: {{ neutron_physical_bridge_name }}
+mtu: {{ min_viable_mtu }}
+use_dhcp: false
+dns_servers: {{ ctlplane_dns_nameservers }}
+domain: {{ dns_search_domains }}
+addresses:
+- ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }}
+routes: {{ ctlplane_host_routes }}
+members:
+- type: interface
+  name: nic1
+  mtu: {{ min_viable_mtu }}
+  # force the MAC address of the bridge to this interface
+  primary: true
+{% for network in role_networks %}
+- type: vlan
+  mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }}
+  vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }}
+  addresses:
+  - ip_netmask:
+      {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }}
+  routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }}
+{% endfor %}
diff --git a/examples/base/kustomization.yaml b/examples/base/kustomization.yaml
@@ -4,11 +4,22 @@ kind: Component
 resources:
 - crs/openstackdataplanenodeset.yaml
 - crs/openstackdataplanedeployment.yaml
-- vars/nic-config.yaml
-- vars/neutron.yaml
 
 namespace: openstack
 
+configMapGenerator:
+- name: network-config-template
+  files:
+    - network_config_template=files/nic-config.j2
+  options:
+    disableNameSuffixHash: true
+- name: neutron-edpm
+  literals:
+    - physical_bridge_name=br-ex
+    - public_interface_name=eth0
+  options:
+    disableNameSuffixHash: true
+
 configurations:
 - config/nodesetname.yaml
 - config/varsfromname.yaml
diff --git a/examples/base/vars/neutron.yaml b/examples/base/vars/neutron.yaml
diff --git a/examples/base/vars/nic-config.yaml b/examples/base/vars/nic-config.yaml
diff --git a/examples/bgp/kustomization.yaml b/examples/bgp/kustomization.yaml
@@ -4,7 +4,7 @@ kind: Component
 namespace: openstack
 
 components:
-- ../base
+- ../preprovisioned # for baremetal nodes, replace with baremetal
 
 resources:
   - values.yaml
@@ -13,7 +13,7 @@ replacements:
 # OpenStackDataPlaneNodeSet customizations
 - source:
     kind: DataPlaneConfig
-    name: edpm-values
+    name: edpm-bgp-values
     fieldPath: data.nodeset.nodetemplate.ansible.vars
   targets:
   - select:
@@ -24,7 +24,7 @@ replacements:
       create: true
 - source:
     kind: DataPlaneConfig
-    name: edpm-values
+    name: edpm-bgp-values
     fieldPath: data.nodeset.services
   targets:
   - select:

diff --git a/examples/bgp/values.yaml b/examples/bgp/values.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: DataPlaneConfig
 metadata:
-  name: edpm-values
+  name: edpm-bgp-values
   annotations:
     config.kubernetes.io/local-config: "true"
 data:

diff --git a/examples/bgp_ovn_cluster/kustomization.yaml b/examples/bgp_ovn_cluster/kustomization.yaml
@@ -4,7 +4,7 @@ kind: Component
 namespace: openstack
 
 components:
-- ../base
+- ../preprovisioned # for baremetal nodes, replace with baremetal
 
 resources:
   - values.yaml
@@ -13,7 +13,7 @@ replacements:
 # OpenStackDataPlaneNodeSet customizations
 - source:
     kind: DataPlaneConfig
-    name: edpm-values
+    name: edpm-bgp-ovn-cluster-values
     fieldPath: data.nodeset.nodetemplate.ansible.vars
   targets:
   - select:
@@ -24,7 +24,7 @@ replacements:
       create: true
 - source:
     kind: DataPlaneConfig
-    name: edpm-values
+    name: edpm-bgp-ovn-cluster-values
     fieldPath: data.nodeset.services
   targets:
   - select:

diff --git a/examples/bgp_ovn_cluster/values.yaml b/examples/bgp_ovn_cluster/values.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: DataPlaneConfig
 metadata:
-  name: edpm-values
+  name: edpm-bgp-ovn-cluster-values
   annotations:
     config.kubernetes.io/local-config: "true"
 data:

diff --git a/examples/ceph/kustomization.yaml b/examples/ceph/kustomization.yaml
@@ -5,7 +5,7 @@ namespace: openstack
 nameSuffix: -ceph
 
 components:
-- ../base
+- ../preprovisioned # for baremetal nodes, replace with baremetal
 
 resources:
   - values.yaml
@@ -14,7 +14,7 @@ replacements:
 # OpenStackDataPlaneNodeSet customizations
 - source:
     kind: DataPlaneConfig
-    name: edpm-values
+    name: edpm-ceph-values
     fieldPath: data.nodeset.services
   targets:
   - select:
@@ -25,7 +25,7 @@ replacements:
       create: true
 - source:
     kind: DataPlaneConfig
-    name: edpm-values
+    name: edpm-ceph-values
     fieldPath: data.nodetemplate.extramounts
   targets:
   - select:

diff --git a/examples/ceph/values.yaml b/examples/ceph/values.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: DataPlaneConfig
 metadata:
-  name: edpm-values
+  name: edpm-ceph-values
   annotations:
     config.kubernetes.io/local-config: "true"
 data:

diff --git a/examples/customnetworks/kustomization.yaml b/examples/customnetworks/kustomization.yaml
@@ -5,7 +5,7 @@ namespace: openstack
 nameSuffix: -custom-network
 
 components:
-- ../base
+- ../preprovisioned # for baremetal nodes, replace with baremetal
 
 resources:
   - values.yaml
@@ -14,7 +14,7 @@ replacements:
 # OpenStackDataPlaneNodeSet customizations
 - source:
     kind: DataPlaneConfig
-    name: edpm-values
+    name: edpm-custom-networks-values
     fieldPath: data.nodeset.nodetemplate.ansible.vars.neutron_public_interface_name
   targets:
   - select:
@@ -25,7 +25,7 @@ replacements:
       create: true
 - source:
     kind: DataPlaneConfig
-    name: edpm-values
+    name: edpm-custom-networks-values
     fieldPath: data.nodeset.nodetemplate.ansible.vars.ctlplane_dns_nameservers
   targets:
   - select:
@@ -36,7 +36,7 @@ replacements:
       create: true
 - source:
     kind: DataPlaneConfig
-    name: edpm-values
+    name: edpm-custom-networks-values
     fieldPath: data.nodeset.nodetemplate.ansible.vars.edpm_ovn_dbs
   targets:
   - select:
@@ -47,7 +47,7 @@ replacements:
       create: true
 - source:
     kind: DataPlaneConfig
-    name: edpm-values
+    name: edpm-custom-networks-values
     fieldPath: data.nodeset.nodetemplate.ansible.vars.edpm_sshd_allowed_ranges
   targets:
   - select:
@@ -58,7 +58,7 @@ replacements:
       create: true
 - source:
     kind: DataPlaneConfig
-    name: edpm-values
+    name: edpm-custom-networks-values
     fieldPath: data.nodeset.nodes
   targets:
   - select:

diff --git a/examples/customnetworks/values.yaml b/examples/customnetworks/values.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: DataPlaneConfig
 metadata:
-  name: edpm-values
+  name: edpm-custom-networks-values
   annotations:
     config.kubernetes.io/local-config: "true"
 data:

diff --git a/examples/networker/kustomization.yaml b/examples/networker/kustomization.yaml
@@ -5,7 +5,7 @@ namespace: openstack
 nameSuffix: -networker
 
 components:
-- ../base
+- ../preprovisioned # for baremetal nodes, replace with baremetal
 
 resources:
   - values.yaml
@@ -14,7 +14,7 @@ replacements:
 # OpenStackDataPlaneNodeSet customizations
 - source:
     kind: DataPlaneConfig
-    name: edpm-values
+    name: edpm-networker-values
     fieldPath: data.nodeset.nodetemplate.ansible.vars.edpm_enable_chassis_gw
   targets:
   - select:
@@ -25,7 +25,7 @@ replacements:
       create: true
 - source:
     kind: DataPlaneConfig
-    name: edpm-values
+    name: edpm-networker-values
     fieldPath: data.nodeset.services
   targets:
   - select:
@@ -36,7 +36,7 @@ replacements:
       create: true
 - source:
     kind: DataPlaneConfig
-    name: edpm-values
+    name: edpm-networker-values
     fieldPath: data.nodeset.nodes
   targets:
   - select:

diff --git a/examples/networker/values.yaml b/examples/networker/values.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: DataPlaneConfig
 metadata:
-  name: edpm-values
+  name: edpm-networker-values
   annotations:
     config.kubernetes.io/local-config: "true"
 data:

diff --git a/examples/nmstate/kustomization.yaml b/examples/nmstate/kustomization.yaml
@@ -4,7 +4,7 @@ kind: Component
 namespace: openstack
 
 components:
-- ../base
+- ../preprovisioned # for baremetal nodes, replace with baremetal
 
 resources:
   - values.yaml
@@ -13,7 +13,7 @@ replacements:
 # OpenStackDataPlaneNodeSet customizations
 - source:
     kind: DataPlaneConfig
-    name: edpm-values
+    name: edpm-nmstate-values
     fieldPath: data.nodeset.nodetemplate.ansible.vars
   targets:
   - select:

diff --git a/examples/nmstate/values.yaml b/examples/nmstate/values.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: DataPlaneConfig
 metadata:
-  name: edpm-values
+  name: edpm-nmstate-values
   annotations:
     config.kubernetes.io/local-config: "true"
 data: