Merge pull request #410 from fultonj/OSPRH-10496

Revert addition of Swift network to va/hci This PR reverts the following merged PRs: #409 #404 For reasons documented in the Jira below we will not add the RGW network to va/hci. Jira: https://issues.redhat.com/browse/OSPRH-10496 Reviewed-by: Francesco Pantano <fpantano@redhat.com>
openstack-k8s-operators · Oct 2, 2024 · cd2734a · cd2734a
2 parents 932b0d9 + 1146c8c
commit cd2734a
Show file tree

Hide file tree

Showing 16 changed files with 1 addition and 367 deletions.
diff --git a/dt/pidone/kustomization.yaml b/dt/pidone/kustomization.yaml
@@ -39,37 +39,7 @@ patches:
             - _replaced_
           mtu: 1500
 
-  - target:
-      kind: NetConfig
-    patch: |-
-      - op: add
-        path: /spec/networks/-
-        value:
-          name: swift
-          mtu: 1500
-          dnsDomain: _replaced_
-          subnets:
-            - _replaced_
-
 replacements:
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.swift.dnsDomain
-    targets:
-      - select:
-          kind: NetConfig
-        fieldPaths:
-          - spec.networks.[name=swift].dnsDomain
-  - source:
-      kind: ConfigMap
-      name: network-values
-      fieldPath: data.swift.subnets
-    targets:
-      - select:
-          kind: NetConfig
-        fieldPaths:
-          - spec.networks.[name=swift].subnets
   - source:
       kind: ConfigMap
       name: service-values

diff --git a/examples/dt/pidone/nncp/values.yaml b/examples/dt/pidone/nncp/values.yaml
@@ -14,49 +14,42 @@ data:
     tenant_ip: 172.19.0.5
     ctlplane_ip: 192.168.122.10
     storage_ip: 172.18.0.5
-    swift_ip: 172.22.0.5
   node_1:
     name: ostest-master-1
     internalapi_ip: 172.17.0.6
     tenant_ip: 172.19.0.6
     ctlplane_ip: 192.168.122.11
     storage_ip: 172.18.0.6
-    swift_ip: 172.22.0.6
   node_2:
     name: ostest-master-2
     internalapi_ip: 172.17.0.7
     tenant_ip: 172.19.0.7
     ctlplane_ip: 192.168.122.12
     storage_ip: 172.18.0.7
-    swift_ip: 172.22.0.7
   node_3:
     name: ostest-worker-0
     internalapi_ip: 172.17.0.8
     tenant_ip: 172.19.0.8
     ctlplane_ip: 192.168.122.13
     storage_ip: 172.18.0.8
-    swift_ip: 172.22.0.8
   node_4:
     name: ostest-worker-1
     internalapi_ip: 172.17.0.9
     tenant_ip: 172.19.0.9
     ctlplane_ip: 192.168.122.14
     storage_ip: 172.18.0.9
-    swift_ip: 172.22.0.9
   node_5:
     name: ostest-worker-2
     internalapi_ip: 172.17.0.10
     tenant_ip: 172.19.0.10
     ctlplane_ip: 192.168.122.15
     storage_ip: 172.18.0.10
-    swift_ip: 172.22.0.10
   node_6:
     name: ostest-worker-3
     internalapi_ip: 172.17.0.11
     tenant_ip: 172.19.0.11
     ctlplane_ip: 192.168.122.16
     storage_ip: 172.18.0.11
-    swift_ip: 172.22.0.11
 
   # networks
   ctlplane:
@@ -203,36 +196,6 @@ data:
         gateway: 10.0.0.1
         name: subnet1
     mtu: 1500
-  swift:
-    dnsDomain: swift.example.com
-    subnets:
-      - allocationRanges:
-          - end: 172.22.0.250
-            start: 172.22.0.100
-        cidr: 172.22.0.0/24
-        gateway: 172.22.0.1
-        name: subnet1
-        vlan: 25
-    mtu: 1500
-    prefix-length: 24
-    iface: swift
-    vlan: 25
-    base_iface: enp6s0
-    lb_addresses:
-      - 172.22.0.80-172.22.0.90
-    net-attach-def: |
-      {
-        "cniVersion": "0.3.1",
-        "name": "swift",
-        "type": "macvlan",
-        "master": "swift",
-        "ipam": {
-          "type": "whereabouts",
-          "range": "172.22.0.0/24",
-          "range_start": "172.22.0.100",
-          "range_end": "172.22.0.250"
-        }
-      }
   datacentre:
     net-attach-def: |
       {

diff --git a/examples/va/hci/control-plane/nncp/kustomization.yaml b/examples/va/hci/control-plane/nncp/kustomization.yaml
@@ -18,7 +18,7 @@ transformers:
         create: true
 
 components:
-  - ../../../../../va/hci/nncp
+  - ../../../../../lib/nncp
 
 resources:
   - values.yaml
diff --git a/examples/va/hci/control-plane/nncp/values.yaml b/examples/va/hci/control-plane/nncp/values.yaml
@@ -14,21 +14,18 @@ data:
     tenant_ip: 172.19.0.5
     ctlplane_ip: 192.168.122.10
     storage_ip: 172.18.0.5
-    swift_ip: 172.22.0.5
   node_1:
     name: ostest-master-1
     internalapi_ip: 172.17.0.6
     tenant_ip: 172.19.0.6
     ctlplane_ip: 192.168.122.11
     storage_ip: 172.18.0.6
-    swift_ip: 172.22.0.6
   node_2:
     name: ostest-master-2
     internalapi_ip: 172.17.0.7
     tenant_ip: 172.19.0.7
     ctlplane_ip: 192.168.122.12
     storage_ip: 172.18.0.7
-    swift_ip: 172.22.0.7
 
   # networks
   ctlplane:
@@ -175,36 +172,6 @@ data:
         gateway: 10.0.0.1
         name: subnet1
     mtu: 1500
-  swift:
-    dnsDomain: swift.example.com
-    subnets:
-      - allocationRanges:
-          - end: 172.22.0.250
-            start: 172.22.0.100
-        cidr: 172.22.0.0/24
-        gateway: 172.22.0.1
-        name: subnet1
-        vlan: 25
-    mtu: 1500
-    prefix-length: 24
-    iface: swift
-    vlan: 25
-    base_iface: enp6s0
-    lb_addresses:
-      - 172.22.0.80-172.22.0.90
-    net-attach-def: |
-      {
-        "cniVersion": "0.3.1",
-        "name": "swift",
-        "type": "macvlan",
-        "master": "swift",
-        "ipam": {
-          "type": "whereabouts",
-          "range": "172.22.0.0/24",
-          "range_start": "172.22.0.100",
-          "range_end": "172.22.0.250"
-        }
-      }
   datacentre:
     net-attach-def: |
       {

diff --git a/lib/nncp/ocp_nodes_nncp.yaml b/lib/nncp/ocp_nodes_nncp.yaml
@@ -5,20 +5,17 @@ metadata:
   name: node-0
   labels:
     osp/nncm-config-type: standard
-    osp/nncm-node: "0"
 ---
 apiVersion: nmstate.io/v1
 kind: NodeNetworkConfigurationPolicy
 metadata:
   name: node-1
   labels:
     osp/nncm-config-type: standard
-    osp/nncm-node: "1"
 ---
 apiVersion: nmstate.io/v1
 kind: NodeNetworkConfigurationPolicy
 metadata:
   name: node-2
   labels:
     osp/nncm-config-type: standard
-    osp/nncm-node: "2"
diff --git a/va/hci/edpm-post-ceph/nodeset/kustomization.yaml b/va/hci/edpm-post-ceph/nodeset/kustomization.yaml
@@ -20,7 +20,6 @@ transformers:
 components:
   - ../../../../lib/control-plane
   - ../../../../lib/dataplane/nodeset
-  - ../../../../va/hci/nodeset
 
 resources:
   - ceph_secret.yaml

diff --git a/va/hci/edpm-pre-ceph/nodeset/kustomization.yaml b/va/hci/edpm-pre-ceph/nodeset/kustomization.yaml
@@ -19,4 +19,3 @@ transformers:
 
 components:
   - ../../../../lib/dataplane/nodeset
-  - ../../../../va/hci/nodeset
diff --git a/va/hci/kustomization.yaml b/va/hci/kustomization.yaml
@@ -19,11 +19,8 @@ transformers:
 
 components:
   - ../../lib/networking/metallb
-  - networking/metallb
   - ../../lib/networking/netconfig
-  - networking/netconfig
   - ../../lib/networking/nad
-  - networking/nad
   - ../../lib/control-plane
 
 # Add storagemgmt network template, as it is needed for CephHCI

diff --git a/va/hci/networking/metallb/kustomization.yaml b/va/hci/networking/metallb/kustomization.yaml
diff --git a/va/hci/networking/metallb/metallb_l2advertisement.yaml b/va/hci/networking/metallb/metallb_l2advertisement.yaml
diff --git a/va/hci/networking/metallb/ocp_ip_pools.yaml b/va/hci/networking/metallb/ocp_ip_pools.yaml
diff --git a/va/hci/networking/nad/kustomization.yaml b/va/hci/networking/nad/kustomization.yaml
diff --git a/va/hci/networking/nad/ocp_networks_netattach.yaml b/va/hci/networking/nad/ocp_networks_netattach.yaml
diff --git a/va/hci/networking/netconfig/kustomization.yaml b/va/hci/networking/netconfig/kustomization.yaml