Skip to content

Commit 3cca2eb

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1245 from bshephar/no-default-netmask
Remove use of CtlplaneNetmask
2 parents 6aafc22 + 913bdc5 commit 3cca2eb

10 files changed

Lines changed: 12 additions & 20 deletions

File tree

‎apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ spec:
9797
ctlplaneInterface:
9898
type: string
9999
ctlplaneNetmask:
100-
default: 255.255.255.0
101100
type: string
102101
deploymentSSHSecret:
103102
type: string

‎apis/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
github.com/openstack-k8s-operators/neutron-operator/api v0.5.1-0.20241217182919-a3ded0c98722
2424
github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20241220125616-d7e33fc89841
2525
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241217170121-a024e70d2575
26-
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20241217095059-8c719f790765
26+
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250103041701-34b0d04d4d81
2727
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20241219010012-02d4a8664afd
2828
github.com/openstack-k8s-operators/placement-operator/api v0.5.1-0.20241217165018-df31b237e2af
2929
github.com/openstack-k8s-operators/swift-operator/api v0.5.1-0.20241218182118-b0eb827b3236
@@ -72,7 +72,7 @@ require (
7272
github.com/json-iterator/go v1.1.12 // indirect
7373
github.com/leodido/go-urn v1.4.0 // indirect
7474
github.com/mailru/easyjson v0.7.7 // indirect
75-
github.com/metal3-io/baremetal-operator/apis v0.6.2 // indirect
75+
github.com/metal3-io/baremetal-operator/apis v0.6.3 // indirect
7676
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.1 // indirect
7777
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7878
github.com/modern-go/reflect2 v1.0.2 // indirect

‎apis/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
7777
github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
7878
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
7979
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
80-
github.com/metal3-io/baremetal-operator/apis v0.6.2 h1:/szSfHXW9+ocxy61J+54VIHsGeOFI9T9JHKdFfjR3jI=
81-
github.com/metal3-io/baremetal-operator/apis v0.6.2/go.mod h1:zj6oG+P54XKkrBc6FdZEpLoJi0MykYWIqp7r7FB0F3k=
80+
github.com/metal3-io/baremetal-operator/apis v0.6.3 h1:0HB0Nkz3PZFf1An9MxqyOfjgBztzihTSb4j3EPt8j88=
81+
github.com/metal3-io/baremetal-operator/apis v0.6.3/go.mod h1:G7ZbZqrASbIDpHXB2Zu3KaCNaRasnB/sOt6ewgDSrMA=
8282
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.1 h1:X0+MWsJ+Gj/TAkmhGybvesvxk6zQKu3NQXzvC6l0iJs=
8383
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.1/go.mod h1:399nvdaqoU9rTI25UdFw2EWcVjmJPpeZPIhfDAIx/XU=
8484
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -128,8 +128,8 @@ github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20241220125616-d7e
128128
github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20241220125616-d7e33fc89841/go.mod h1:JdqDrTXC9JYbTsZPyF/0aLLLW3EZKzcsVMY/gc+n6Zs=
129129
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241217170121-a024e70d2575 h1:HiHadCnCGbFCSzlElGWykefUL1gssqVxro/DxeYEa6A=
130130
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241217170121-a024e70d2575/go.mod h1:5togdZ035sh93/9DcEnGuJfyIvzvY2LMGnPVaWoU3H0=
131-
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20241217095059-8c719f790765 h1:t874XFJW0eBoaiiIyvVaRS0EvB7p1exvUnG2UuJ3ieE=
132-
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20241217095059-8c719f790765/go.mod h1:CV0QMKCE0B/Og/Ek5t1s+Keq36qVisuHN15vawzDi/Y=
131+
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250103041701-34b0d04d4d81 h1:bLCqfrD3SwEMgSDQgdfDiP37jaroRLc6XVmZpbcka6o=
132+
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250103041701-34b0d04d4d81/go.mod h1:7LxzemaCvewRGzR4Y1N9mko0D5VW2djoSHUQL6/uB7A=
133133
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20241219010012-02d4a8664afd h1:tLG4A4Zyk8wvp7sObIZoeUMhPDzDdjzUryEYK0EeZYw=
134134
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20241219010012-02d4a8664afd/go.mod h1:6CgkHOKRSOjzHTn9efJvMs7ULwfOy4WsP2n4M7n2jws=
135135
github.com/openstack-k8s-operators/placement-operator/api v0.5.1-0.20241217165018-df31b237e2af h1:QLgduyY4xu/Z48ftKuJ941TrdS1CkKvaJQmG+daNY10=

‎config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ spec:
9797
ctlplaneInterface:
9898
type: string
9999
ctlplaneNetmask:
100-
default: 255.255.255.0
101100
type: string
102101
deploymentSSHSecret:
103102
type: string

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ require (
3232
github.com/openstack-k8s-operators/neutron-operator/api v0.5.1-0.20241217182919-a3ded0c98722
3333
github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20241220125616-d7e33fc89841
3434
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241217170121-a024e70d2575
35-
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20241217095059-8c719f790765
35+
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250103041701-34b0d04d4d81
3636
github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240531084739-3b4c0451297c
3737
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20241219010012-02d4a8664afd
3838
github.com/openstack-k8s-operators/placement-operator/api v0.5.1-0.20241217165018-df31b237e2af
@@ -78,7 +78,7 @@ require (
7878
github.com/json-iterator/go v1.1.12 // indirect
7979
github.com/leodido/go-urn v1.4.0 // indirect
8080
github.com/mailru/easyjson v0.7.7 // indirect
81-
github.com/metal3-io/baremetal-operator/apis v0.6.2 // indirect
81+
github.com/metal3-io/baremetal-operator/apis v0.6.3 // indirect
8282
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.1 // indirect
8383
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8484
github.com/modern-go/reflect2 v1.0.2 // indirect

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
8383
github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
8484
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
8585
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
86-
github.com/metal3-io/baremetal-operator/apis v0.6.2 h1:/szSfHXW9+ocxy61J+54VIHsGeOFI9T9JHKdFfjR3jI=
87-
github.com/metal3-io/baremetal-operator/apis v0.6.2/go.mod h1:zj6oG+P54XKkrBc6FdZEpLoJi0MykYWIqp7r7FB0F3k=
86+
github.com/metal3-io/baremetal-operator/apis v0.6.3 h1:0HB0Nkz3PZFf1An9MxqyOfjgBztzihTSb4j3EPt8j88=
87+
github.com/metal3-io/baremetal-operator/apis v0.6.3/go.mod h1:G7ZbZqrASbIDpHXB2Zu3KaCNaRasnB/sOt6ewgDSrMA=
8888
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.1 h1:X0+MWsJ+Gj/TAkmhGybvesvxk6zQKu3NQXzvC6l0iJs=
8989
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.1/go.mod h1:399nvdaqoU9rTI25UdFw2EWcVjmJPpeZPIhfDAIx/XU=
9090
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -140,8 +140,8 @@ github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20241220125616-d7e
140140
github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20241220125616-d7e33fc89841/go.mod h1:JdqDrTXC9JYbTsZPyF/0aLLLW3EZKzcsVMY/gc+n6Zs=
141141
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241217170121-a024e70d2575 h1:HiHadCnCGbFCSzlElGWykefUL1gssqVxro/DxeYEa6A=
142142
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241217170121-a024e70d2575/go.mod h1:5togdZ035sh93/9DcEnGuJfyIvzvY2LMGnPVaWoU3H0=
143-
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20241217095059-8c719f790765 h1:t874XFJW0eBoaiiIyvVaRS0EvB7p1exvUnG2UuJ3ieE=
144-
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20241217095059-8c719f790765/go.mod h1:CV0QMKCE0B/Og/Ek5t1s+Keq36qVisuHN15vawzDi/Y=
143+
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250103041701-34b0d04d4d81 h1:bLCqfrD3SwEMgSDQgdfDiP37jaroRLc6XVmZpbcka6o=
144+
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250103041701-34b0d04d4d81/go.mod h1:7LxzemaCvewRGzR4Y1N9mko0D5VW2djoSHUQL6/uB7A=
145145
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20241219010012-02d4a8664afd h1:tLG4A4Zyk8wvp7sObIZoeUMhPDzDdjzUryEYK0EeZYw=
146146
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20241219010012-02d4a8664afd/go.mod h1:6CgkHOKRSOjzHTn9efJvMs7ULwfOy4WsP2n4M7n2jws=
147147
github.com/openstack-k8s-operators/placement-operator/api v0.5.1-0.20241217165018-df31b237e2af h1:QLgduyY4xu/Z48ftKuJ941TrdS1CkKvaJQmG+daNY10=

‎tests/functional/dataplane/openstackdataplanenodeset_controller_test.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,6 @@ var _ = Describe("Dataplane NodeSet Test", func() {
301301
ProvisioningInterface: "",
302302
CtlplaneInterface: "",
303303
CtlplaneGateway: "",
304-
CtlplaneNetmask: "255.255.255.0",
305304
BmhNamespace: "openshift-machine-api",
306305
HardwareReqs: baremetalv1.HardwareReqs{
307306
CPUReqs: baremetalv1.CPUReqs{
@@ -440,7 +439,6 @@ var _ = Describe("Dataplane NodeSet Test", func() {
440439
ProvisioningInterface: "",
441440
CtlplaneInterface: "",
442441
CtlplaneGateway: "",
443-
CtlplaneNetmask: "255.255.255.0",
444442
BmhNamespace: "openshift-machine-api",
445443
HardwareReqs: baremetalv1.HardwareReqs{
446444
CPUReqs: baremetalv1.CPUReqs{
@@ -892,7 +890,6 @@ var _ = Describe("Dataplane NodeSet Test", func() {
892890
ProvisioningInterface: "",
893891
CtlplaneInterface: "",
894892
CtlplaneGateway: "",
895-
CtlplaneNetmask: "255.255.255.0",
896893
BmhNamespace: "openshift-machine-api",
897894
HardwareReqs: baremetalv1.HardwareReqs{
898895
CPUReqs: baremetalv1.CPUReqs{

‎tests/kuttl/tests/dataplane-deploy-global-service-test/00-dataplane-create.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ spec:
139139
bmhNamespace: openshift-machine-api
140140
cloudUserName: ""
141141
ctlplaneInterface: ""
142-
ctlplaneNetmask: 255.255.255.0
143142
deploymentSSHSecret: ""
144143
hardwareReqs:
145144
cpuReqs:

‎tests/kuttl/tests/dataplane-deploy-global-service-test/02-add-nodeset.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ spec:
88
bmhNamespace: openshift-machine-api
99
cloudUserName: ""
1010
ctlplaneInterface: ""
11-
ctlplaneNetmask: 255.255.255.0
1211
deploymentSSHSecret: ""
1312
hardwareReqs:
1413
cpuReqs:

‎tests/kuttl/tests/dataplane-deploy-no-nodes-test/06-add-nodeset.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ spec:
88
bmhNamespace: openshift-machine-api
99
cloudUserName: ""
1010
ctlplaneInterface: ""
11-
ctlplaneNetmask: 255.255.255.0
1211
deploymentSSHSecret: ""
1312
hardwareReqs:
1413
cpuReqs:

0 commit comments

Comments
 (0)