Skip to content

Commit

Permalink
t
Browse files Browse the repository at this point in the history
  • Loading branch information
@stuggi
stuggi committed Oct 7, 2024
1 parent 1b34f39 commit 8253905
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 46 deletions.
18 changes: 0 additions & 18 deletions apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ spec:
type: string
type: object
x-kubernetes-map-type: atomic
preprovisioningNetworkDataName:
type: string
userData:
properties:
name:
Expand Down Expand Up @@ -166,14 +164,6 @@ spec:
type: object
type: object
type: object
networkData:
properties:
name:
type: string
namespace:
type: string
type: object
x-kubernetes-map-type: atomic
osContainerImageUrl:
type: string
osImage:
Expand All @@ -190,14 +180,6 @@ spec:
type: string
provisioningInterface:
type: string
userData:
properties:
name:
type: string
namespace:
type: string
type: object
x-kubernetes-map-type: atomic
required:
- cloudUserName
- ctlplaneInterface
Expand Down
4 changes: 3 additions & 1 deletion 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.4.1-0.20241002143558-cc9057fb3ecb
github.com/openstack-k8s-operators/nova-operator/api v0.4.1-0.20241004094255-bfc06d9ba5f0
github.com/openstack-k8s-operators/octavia-operator/api v0.4.1-0.20241004142613-90ffa9a759ca
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.4.1-0.20241004135556-199ee1a0e111
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.4.1-0.20241007083205-b5622e3c3d3c
github.com/openstack-k8s-operators/ovn-operator/api v0.4.1-0.20241004235326-1a06180488f1
github.com/openstack-k8s-operators/placement-operator/api v0.4.1-0.20240930083623-0dbd528ec911
github.com/openstack-k8s-operators/swift-operator/api v0.4.1-0.20240930070251-1f0a2f5e19b0
Expand Down Expand Up @@ -116,3 +116,5 @@ replace github.com/openshift/api => github.com/openshift/api v0.0.0-202408300231

// custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.6.0_patches_tag)
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20240719064129-c0201810c8f5 //allow-merging

replace github.com/openstack-k8s-operators/ovn-operator/api => github.com/stuggi/ovn-operator/api v0.0.0-20241007132957-66dd9da42e21
8 changes: 4 additions & 4 deletions apis/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,8 @@ github.com/openstack-k8s-operators/nova-operator/api v0.4.1-0.20241004094255-bfc
github.com/openstack-k8s-operators/nova-operator/api v0.4.1-0.20241004094255-bfc06d9ba5f0/go.mod h1:qdTEPioEQ8ey1HpRj+5ouJRdHCyCBr1Kf3698rsYNY0=
github.com/openstack-k8s-operators/octavia-operator/api v0.4.1-0.20241004142613-90ffa9a759ca h1:jRFZdV21Znft8V0w0RxleuH7TVZ619pwppctgwCiYpU=
github.com/openstack-k8s-operators/octavia-operator/api v0.4.1-0.20241004142613-90ffa9a759ca/go.mod h1:yIKaqQ/993P2ZiR65yLXw75gmVk2ay8SnQ/Ail1lM+Y=
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.4.1-0.20241004135556-199ee1a0e111 h1:HyFK5SadxI5odEdNA3PxJyeCd5oJHNTawX2U3mp08TE=
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.4.1-0.20241004135556-199ee1a0e111/go.mod h1:4ReMAMNps4FmLYDL8ZPWNF+yfDcF79p4dEyndf3m7kE=
github.com/openstack-k8s-operators/ovn-operator/api v0.4.1-0.20241004235326-1a06180488f1 h1:E23tnlk/WXv18hitEPSKb5S8izcThsjJ/l81mKoJgS4=
github.com/openstack-k8s-operators/ovn-operator/api v0.4.1-0.20241004235326-1a06180488f1/go.mod h1:YET0TIkbnwofOJ7qDV9rSP7zL+49Csrfq5YpCdxWbXE=
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.4.1-0.20241007083205-b5622e3c3d3c h1:B1ovjEHE0pn/aIgCXLGtNSMrign8zBPgnAUsxygKjsM=
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.4.1-0.20241007083205-b5622e3c3d3c/go.mod h1:4ReMAMNps4FmLYDL8ZPWNF+yfDcF79p4dEyndf3m7kE=
github.com/openstack-k8s-operators/placement-operator/api v0.4.1-0.20240930083623-0dbd528ec911 h1:j7sT4vz+tpOnsDtlqgDjggYyIMqHjAH5U4WDshIAVtQ=
github.com/openstack-k8s-operators/placement-operator/api v0.4.1-0.20240930083623-0dbd528ec911/go.mod h1:CeBXT1dVEyvuJ9rfhHiGAFBurkqPfl6T7L+jj8B7mCg=
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20240719064129-c0201810c8f5 h1:xlj///B7XOfz5RoJvvUnY/MA+mNWhDph9xwSY3bERx8=
Expand Down Expand Up @@ -167,6 +165,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/stuggi/ovn-operator/api v0.0.0-20241007132957-66dd9da42e21 h1:vo6/yhwK0FCkTzPtnz0U2yT2z/bLljTZcsd/itzWBeI=
github.com/stuggi/ovn-operator/api v0.0.0-20241007132957-66dd9da42e21/go.mod h1:YET0TIkbnwofOJ7qDV9rSP7zL+49Csrfq5YpCdxWbXE=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
Expand Down
18 changes: 0 additions & 18 deletions config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ spec:
type: string
type: object
x-kubernetes-map-type: atomic
preprovisioningNetworkDataName:
type: string
userData:
properties:
name:
Expand Down Expand Up @@ -166,14 +164,6 @@ spec:
type: object
type: object
type: object
networkData:
properties:
name:
type: string
namespace:
type: string
type: object
x-kubernetes-map-type: atomic
osContainerImageUrl:
type: string
osImage:
Expand All @@ -190,14 +180,6 @@ spec:
type: string
provisioningInterface:
type: string
userData:
properties:
name:
type: string
namespace:
type: string
type: object
x-kubernetes-map-type: atomic
required:
- cloudUserName
- ctlplaneInterface
Expand Down
4 changes: 3 additions & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ require (
github.com/openstack-k8s-operators/neutron-operator/api v0.4.1-0.20241002143558-cc9057fb3ecb
github.com/openstack-k8s-operators/nova-operator/api v0.4.1-0.20241004094255-bfc06d9ba5f0
github.com/openstack-k8s-operators/octavia-operator/api v0.4.1-0.20241004142613-90ffa9a759ca
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.4.1-0.20241004135556-199ee1a0e111
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.4.1-0.20241007083205-b5622e3c3d3c
github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240531084739-3b4c0451297c
github.com/openstack-k8s-operators/ovn-operator/api v0.4.1-0.20241004235326-1a06180488f1
github.com/openstack-k8s-operators/placement-operator/api v0.4.1-0.20240930083623-0dbd528ec911
Expand Down Expand Up @@ -126,3 +126,5 @@ replace github.com/openshift/api => github.com/openshift/api v0.0.0-202408300231

// custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.6.0_patches_tag)
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20240719064129-c0201810c8f5 //allow-merging

replace github.com/openstack-k8s-operators/ovn-operator/api => github.com/stuggi/ovn-operator/api v0.0.0-20241007132957-66dd9da42e21
8 changes: 4 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,8 @@ github.com/openstack-k8s-operators/nova-operator/api v0.4.1-0.20241004094255-bfc
github.com/openstack-k8s-operators/nova-operator/api v0.4.1-0.20241004094255-bfc06d9ba5f0/go.mod h1:qdTEPioEQ8ey1HpRj+5ouJRdHCyCBr1Kf3698rsYNY0=
github.com/openstack-k8s-operators/octavia-operator/api v0.4.1-0.20241004142613-90ffa9a759ca h1:jRFZdV21Znft8V0w0RxleuH7TVZ619pwppctgwCiYpU=
github.com/openstack-k8s-operators/octavia-operator/api v0.4.1-0.20241004142613-90ffa9a759ca/go.mod h1:yIKaqQ/993P2ZiR65yLXw75gmVk2ay8SnQ/Ail1lM+Y=
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.4.1-0.20241004135556-199ee1a0e111 h1:HyFK5SadxI5odEdNA3PxJyeCd5oJHNTawX2U3mp08TE=
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.4.1-0.20241004135556-199ee1a0e111/go.mod h1:4ReMAMNps4FmLYDL8ZPWNF+yfDcF79p4dEyndf3m7kE=
github.com/openstack-k8s-operators/ovn-operator/api v0.4.1-0.20241004235326-1a06180488f1 h1:E23tnlk/WXv18hitEPSKb5S8izcThsjJ/l81mKoJgS4=
github.com/openstack-k8s-operators/ovn-operator/api v0.4.1-0.20241004235326-1a06180488f1/go.mod h1:YET0TIkbnwofOJ7qDV9rSP7zL+49Csrfq5YpCdxWbXE=
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.4.1-0.20241007083205-b5622e3c3d3c h1:B1ovjEHE0pn/aIgCXLGtNSMrign8zBPgnAUsxygKjsM=
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.4.1-0.20241007083205-b5622e3c3d3c/go.mod h1:4ReMAMNps4FmLYDL8ZPWNF+yfDcF79p4dEyndf3m7kE=
github.com/openstack-k8s-operators/placement-operator/api v0.4.1-0.20240930083623-0dbd528ec911 h1:j7sT4vz+tpOnsDtlqgDjggYyIMqHjAH5U4WDshIAVtQ=
github.com/openstack-k8s-operators/placement-operator/api v0.4.1-0.20240930083623-0dbd528ec911/go.mod h1:CeBXT1dVEyvuJ9rfhHiGAFBurkqPfl6T7L+jj8B7mCg=
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20240719064129-c0201810c8f5 h1:xlj///B7XOfz5RoJvvUnY/MA+mNWhDph9xwSY3bERx8=
Expand Down Expand Up @@ -181,6 +179,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/stuggi/ovn-operator/api v0.0.0-20241007132957-66dd9da42e21 h1:vo6/yhwK0FCkTzPtnz0U2yT2z/bLljTZcsd/itzWBeI=
github.com/stuggi/ovn-operator/api v0.0.0-20241007132957-66dd9da42e21/go.mod h1:YET0TIkbnwofOJ7qDV9rSP7zL+49Csrfq5YpCdxWbXE=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
Expand Down

0 comments on commit 8253905

Please sign in to comment.