Remove NetworkConfig override handling

This change removes the CRD level override for network config files. Instead, this allows us to use the Ansible variable directly to set any require network config customizations. Depends-On: openstack-k8s-operators/edpm-ansible#341 Depends-On: openstack-k8s-operators/ci-framework#560 Signed-off-by: Brendan Shephard <[email protected]>
openstack-k8s-operators · Sep 21, 2023 · 1102f28 · 1102f28
1 parent 033dbc3
commit 1102f28
Show file tree

Hide file tree

Showing 20 changed files with 199 additions and 194 deletions.
diff --git a/api/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml b/api/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml
@@ -1021,11 +1021,6 @@ spec:
                     type: array
                   managementNetwork:
                     type: string
-                  networkConfig:
-                    properties:
-                      template:
-                        type: string
-                    type: object
                   networkData:
                     properties:
                       name:
@@ -1826,11 +1821,6 @@ spec:
                       type: string
                     managementNetwork:
                       type: string
-                    networkConfig:
-                      properties:
-                        template:
-                          type: string
-                      type: object
                     networkData:
                       properties:
                         name:

diff --git a/api/v1beta1/common.go b/api/v1beta1/common.go
@@ -52,11 +52,6 @@ type NodeSection struct {
 	// +kubebuilder:validation:Optional
 	HostName string `json:"hostName,omitempty"`
 
-	// NetworkConfig - Network configuration details. Contains os-net-config
-	// related properties.
-	// +kubebuilder:validation:Optional
-	NetworkConfig NetworkConfigSection `json:"networkConfig"`
-
 	// Networks - Instance networks
 	// +kubebuilder:validation:Optional
 	Networks []infranetworkv1.IPSetNetwork `json:"networks,omitempty"`
@@ -93,11 +88,6 @@ type NodeTemplate struct {
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:io.kubernetes:Secret"}
 	AnsibleSSHPrivateKeySecret string `json:"ansibleSSHPrivateKeySecret"`
 
-	// NetworkConfig - Network configuration details. Contains os-net-config
-	// related properties.
-	// +kubebuilder:validation:Optional
-	NetworkConfig NetworkConfigSection `json:"networkConfig,omitempty"`
-
 	// Networks - Instance networks
 	// +kubebuilder:validation:Optional
 	Networks []infranetworkv1.IPSetNetwork `json:"networks,omitempty"`
@@ -123,15 +113,6 @@ type NodeTemplate struct {
 	NetworkData *corev1.SecretReference `json:"networkData,omitempty"`
 }
 
-// NetworkConfigSection is a specification of the Network configuration details
-type NetworkConfigSection struct {
-
-	// Template - Contains a Ansible j2 nic config template to use when applying node
-	// network configuration
-	// +kubebuilder:validation:Optional
-	Template string `json:"template,omitempty" yaml:"template,omitempty"`
-}
-
 // AnsibleEESpec is a specification of the ansible EE attributes
 type AnsibleEESpec struct {
 	// +kubebuilder:validation:Optional

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml b/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml
@@ -1021,11 +1021,6 @@ spec:
                     type: array
                   managementNetwork:
                     type: string
-                  networkConfig:
-                    properties:
-                      template:
-                        type: string
-                    type: object
                   networkData:
                     properties:
                       name:
@@ -1826,11 +1821,6 @@ spec:
                       type: string
                     managementNetwork:
                       type: string
-                    networkConfig:
-                      properties:
-                        template:
-                          type: string
-                      type: object
                     networkData:
                       properties:
                         name:

diff --git a/config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml b/config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml
@@ -47,6 +47,39 @@ spec:
          # These vars are edpm_network_config role vars
          edpm_network_config_hide_sensitive_logs: false
          edpm_network_config_template: templates/single_nic_vlans/single_nic_vlans.j2
+         edpm_network_config_override: |
+              ---
+              {% 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_subnet_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 %}
+
          # These vars are for the network config templates themselves and are
          # considered EDPM network defaults.
          neutron_physical_bridge_name: br-ex

diff --git a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_baremetal.yaml b/config/samples/dataplane_v1beta1_openstackdataplanenodeset_baremetal.yaml
@@ -67,9 +67,40 @@ spec:
         # edpm_network_config
         # Default nic config template for a EDPM compute node
         # These vars are edpm_network_config role vars
-        edpm_network_config_template: templates/single_nic_vlans/single_nic_vlans.j2
         edpm_network_config_hide_sensitive_logs: false
-
+        edpm_network_config_template: templates/single_nic_vlans/single_nic_vlans.j2
+        edpm_network_config_override: |
+             ---
+             {% 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_subnet_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 %}
         # These vars are for the network config templates themselves and are
         # considered EDPM network defaults.
         neutron_physical_bridge_name: br-ex

diff --git a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_baremetal_with_ipam.yaml b/config/samples/dataplane_v1beta1_openstackdataplanenodeset_baremetal_with_ipam.yaml
@@ -55,6 +55,38 @@ spec:
          # These vars are edpm_network_config role vars
          edpm_network_config_hide_sensitive_logs: false
          edpm_network_config_template: templates/single_nic_vlans/single_nic_vlans.j2
+         edpm_network_config_override: |
+              ---
+              {% 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_subnet_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 %}
          # These vars are for the network config templates themselves and are
          # considered EDPM network defaults.
          neutron_physical_bridge_name: br-ex

diff --git a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_ceph.yaml b/config/samples/dataplane_v1beta1_openstackdataplanenodeset_ceph.yaml
@@ -57,6 +57,39 @@ spec:
         # Default nic config template for a EDPM compute node
         # These vars are edpm_network_config role vars
         edpm_network_config_template: templates/single_nic_vlans/single_nic_vlans.j2
+        edpm_network_config_override: |
+             ---
+             {% 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_subnet_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 %}
+
         edpm_network_config_hide_sensitive_logs: false
         #
         # These vars are for the network config templates themselves and are

diff --git a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_customnetworks.yaml b/config/samples/dataplane_v1beta1_openstackdataplanenodeset_customnetworks.yaml
@@ -48,7 +48,39 @@ spec:
         # edpm_network_config
         # Default nic config template for a EDPM compute node
         # These vars are edpm_network_config role vars
-        edpm_network_config_template: /runner/network/nic-config-template
+        edpm_network_config_template: templates/single_nic_vlans/single_nic_vlans.j2
+        edpm_network_config_override: |
+             ---
+             {% 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_subnet_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 %}
         edpm_network_config_hide_sensitive_logs: false
         edpm_network_config_update: false
         #

diff --git a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_with_ipam.yaml b/config/samples/dataplane_v1beta1_openstackdataplanenodeset_with_ipam.yaml
@@ -66,6 +66,39 @@ spec:
          # edpm_network_config
          # Default nic config template for a EDPM compute node
          # These vars are edpm_network_config role vars
+         edpm_network_config_template: templates/single_nic_vlans/single_nic_vlans.j2
+         edpm_network_config_override: |
+              ---
+              {% 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_subnet_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 %}
          edpm_network_config_hide_sensitive_logs: false
          # These vars are for the network config templates themselves and are
          # considered EDPM network defaults.