Skip to content

Commit

Permalink
Merge pull request #1245 from bshephar/no-default-netmask
Browse files Browse the repository at this point in the history 
Remove use of CtlplaneNetmask
  • Loading branch information
@openshift-merge-bot
openshift-merge-bot[bot] authored Jan 3, 2025
2 parents 6aafc22 + 913bdc5 commit 3cca2eb
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 20 deletions.
1 change: 0 additions & 1 deletion apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ spec:
ctlplaneInterface:
type: string
ctlplaneNetmask:
default: 255.255.255.0
type: string
deploymentSSHSecret:
type: string
Expand Down
4 changes: 2 additions & 2 deletions apis/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ require (
github.com/openstack-k8s-operators/neutron-operator/api v0.5.1-0.20241217182919-a3ded0c98722
github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20241220125616-d7e33fc89841
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241217170121-a024e70d2575
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20241217095059-8c719f790765
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250103041701-34b0d04d4d81
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20241219010012-02d4a8664afd
github.com/openstack-k8s-operators/placement-operator/api v0.5.1-0.20241217165018-df31b237e2af
github.com/openstack-k8s-operators/swift-operator/api v0.5.1-0.20241218182118-b0eb827b3236
Expand Down Expand Up @@ -72,7 +72,7 @@ require (
github.com/json-iterator/go v1.1.12 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/metal3-io/baremetal-operator/apis v0.6.2 // indirect
github.com/metal3-io/baremetal-operator/apis v0.6.3 // indirect
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.1 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
Expand Down
8 changes: 4 additions & 4 deletions apis/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
github.com/metal3-io/baremetal-operator/apis v0.6.2 h1:/szSfHXW9+ocxy61J+54VIHsGeOFI9T9JHKdFfjR3jI=
github.com/metal3-io/baremetal-operator/apis v0.6.2/go.mod h1:zj6oG+P54XKkrBc6FdZEpLoJi0MykYWIqp7r7FB0F3k=
github.com/metal3-io/baremetal-operator/apis v0.6.3 h1:0HB0Nkz3PZFf1An9MxqyOfjgBztzihTSb4j3EPt8j88=
github.com/metal3-io/baremetal-operator/apis v0.6.3/go.mod h1:G7ZbZqrASbIDpHXB2Zu3KaCNaRasnB/sOt6ewgDSrMA=
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.1 h1:X0+MWsJ+Gj/TAkmhGybvesvxk6zQKu3NQXzvC6l0iJs=
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.1/go.mod h1:399nvdaqoU9rTI25UdFw2EWcVjmJPpeZPIhfDAIx/XU=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
Expand Down Expand Up @@ -128,8 +128,8 @@ github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20241220125616-d7e
github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20241220125616-d7e33fc89841/go.mod h1:JdqDrTXC9JYbTsZPyF/0aLLLW3EZKzcsVMY/gc+n6Zs=
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241217170121-a024e70d2575 h1:HiHadCnCGbFCSzlElGWykefUL1gssqVxro/DxeYEa6A=
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241217170121-a024e70d2575/go.mod h1:5togdZ035sh93/9DcEnGuJfyIvzvY2LMGnPVaWoU3H0=
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20241217095059-8c719f790765 h1:t874XFJW0eBoaiiIyvVaRS0EvB7p1exvUnG2UuJ3ieE=
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20241217095059-8c719f790765/go.mod h1:CV0QMKCE0B/Og/Ek5t1s+Keq36qVisuHN15vawzDi/Y=
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250103041701-34b0d04d4d81 h1:bLCqfrD3SwEMgSDQgdfDiP37jaroRLc6XVmZpbcka6o=
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250103041701-34b0d04d4d81/go.mod h1:7LxzemaCvewRGzR4Y1N9mko0D5VW2djoSHUQL6/uB7A=
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20241219010012-02d4a8664afd h1:tLG4A4Zyk8wvp7sObIZoeUMhPDzDdjzUryEYK0EeZYw=
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20241219010012-02d4a8664afd/go.mod h1:6CgkHOKRSOjzHTn9efJvMs7ULwfOy4WsP2n4M7n2jws=
github.com/openstack-k8s-operators/placement-operator/api v0.5.1-0.20241217165018-df31b237e2af h1:QLgduyY4xu/Z48ftKuJ941TrdS1CkKvaJQmG+daNY10=
Expand Down
1 change: 0 additions & 1 deletion config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ spec:
ctlplaneInterface:
type: string
ctlplaneNetmask:
default: 255.255.255.0
type: string
deploymentSSHSecret:
type: string
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ require (
github.com/openstack-k8s-operators/neutron-operator/api v0.5.1-0.20241217182919-a3ded0c98722
github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20241220125616-d7e33fc89841
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241217170121-a024e70d2575
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20241217095059-8c719f790765
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250103041701-34b0d04d4d81
github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240531084739-3b4c0451297c
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20241219010012-02d4a8664afd
github.com/openstack-k8s-operators/placement-operator/api v0.5.1-0.20241217165018-df31b237e2af
Expand Down Expand Up @@ -78,7 +78,7 @@ require (
github.com/json-iterator/go v1.1.12 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/metal3-io/baremetal-operator/apis v0.6.2 // indirect
github.com/metal3-io/baremetal-operator/apis v0.6.3 // indirect
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.1 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
github.com/metal3-io/baremetal-operator/apis v0.6.2 h1:/szSfHXW9+ocxy61J+54VIHsGeOFI9T9JHKdFfjR3jI=
github.com/metal3-io/baremetal-operator/apis v0.6.2/go.mod h1:zj6oG+P54XKkrBc6FdZEpLoJi0MykYWIqp7r7FB0F3k=
github.com/metal3-io/baremetal-operator/apis v0.6.3 h1:0HB0Nkz3PZFf1An9MxqyOfjgBztzihTSb4j3EPt8j88=
github.com/metal3-io/baremetal-operator/apis v0.6.3/go.mod h1:G7ZbZqrASbIDpHXB2Zu3KaCNaRasnB/sOt6ewgDSrMA=
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.1 h1:X0+MWsJ+Gj/TAkmhGybvesvxk6zQKu3NQXzvC6l0iJs=
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.1/go.mod h1:399nvdaqoU9rTI25UdFw2EWcVjmJPpeZPIhfDAIx/XU=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
Expand Down Expand Up @@ -140,8 +140,8 @@ github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20241220125616-d7e
github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20241220125616-d7e33fc89841/go.mod h1:JdqDrTXC9JYbTsZPyF/0aLLLW3EZKzcsVMY/gc+n6Zs=
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241217170121-a024e70d2575 h1:HiHadCnCGbFCSzlElGWykefUL1gssqVxro/DxeYEa6A=
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241217170121-a024e70d2575/go.mod h1:5togdZ035sh93/9DcEnGuJfyIvzvY2LMGnPVaWoU3H0=
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20241217095059-8c719f790765 h1:t874XFJW0eBoaiiIyvVaRS0EvB7p1exvUnG2UuJ3ieE=
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20241217095059-8c719f790765/go.mod h1:CV0QMKCE0B/Og/Ek5t1s+Keq36qVisuHN15vawzDi/Y=
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250103041701-34b0d04d4d81 h1:bLCqfrD3SwEMgSDQgdfDiP37jaroRLc6XVmZpbcka6o=
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250103041701-34b0d04d4d81/go.mod h1:7LxzemaCvewRGzR4Y1N9mko0D5VW2djoSHUQL6/uB7A=
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20241219010012-02d4a8664afd h1:tLG4A4Zyk8wvp7sObIZoeUMhPDzDdjzUryEYK0EeZYw=
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20241219010012-02d4a8664afd/go.mod h1:6CgkHOKRSOjzHTn9efJvMs7ULwfOy4WsP2n4M7n2jws=
github.com/openstack-k8s-operators/placement-operator/api v0.5.1-0.20241217165018-df31b237e2af h1:QLgduyY4xu/Z48ftKuJ941TrdS1CkKvaJQmG+daNY10=
Expand Down
3 changes: 0 additions & 3 deletions tests/functional/dataplane/openstackdataplanenodeset_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,6 @@ var _ = Describe("Dataplane NodeSet Test", func() {
ProvisioningInterface: "",
CtlplaneInterface: "",
CtlplaneGateway: "",
CtlplaneNetmask: "255.255.255.0",
BmhNamespace: "openshift-machine-api",
HardwareReqs: baremetalv1.HardwareReqs{
CPUReqs: baremetalv1.CPUReqs{
Expand Down Expand Up @@ -440,7 +439,6 @@ var _ = Describe("Dataplane NodeSet Test", func() {
ProvisioningInterface: "",
CtlplaneInterface: "",
CtlplaneGateway: "",
CtlplaneNetmask: "255.255.255.0",
BmhNamespace: "openshift-machine-api",
HardwareReqs: baremetalv1.HardwareReqs{
CPUReqs: baremetalv1.CPUReqs{
Expand Down Expand Up @@ -892,7 +890,6 @@ var _ = Describe("Dataplane NodeSet Test", func() {
ProvisioningInterface: "",
CtlplaneInterface: "",
CtlplaneGateway: "",
CtlplaneNetmask: "255.255.255.0",
BmhNamespace: "openshift-machine-api",
HardwareReqs: baremetalv1.HardwareReqs{
CPUReqs: baremetalv1.CPUReqs{
Expand Down
1 change: 0 additions & 1 deletion tests/kuttl/tests/dataplane-deploy-global-service-test/00-dataplane-create.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ spec:
bmhNamespace: openshift-machine-api
cloudUserName: ""
ctlplaneInterface: ""
ctlplaneNetmask: 255.255.255.0
deploymentSSHSecret: ""
hardwareReqs:
cpuReqs:
Expand Down
1 change: 0 additions & 1 deletion tests/kuttl/tests/dataplane-deploy-global-service-test/02-add-nodeset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ spec:
bmhNamespace: openshift-machine-api
cloudUserName: ""
ctlplaneInterface: ""
ctlplaneNetmask: 255.255.255.0
deploymentSSHSecret: ""
hardwareReqs:
cpuReqs:
Expand Down
1 change: 0 additions & 1 deletion tests/kuttl/tests/dataplane-deploy-no-nodes-test/06-add-nodeset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ spec:
bmhNamespace: openshift-machine-api
cloudUserName: ""
ctlplaneInterface: ""
ctlplaneNetmask: 255.255.255.0
deploymentSSHSecret: ""
hardwareReqs:
cpuReqs:
Expand Down

0 comments on commit 3cca2eb

Please sign in to comment.