Skip to content

Commit

Permalink
Merge pull request #1203 from olliewalsh/18.0-fr1
Browse files Browse the repository at this point in the history 
[18.0-fr1] Update openstack-k8s-operators
  • Loading branch information
@openshift-merge-bot
openshift-merge-bot[bot] authored Nov 22, 2024
2 parents 3e46792 + edb4be5 commit 09155ef
Show file tree
Hide file tree
Showing 45 changed files with 636 additions and 203 deletions.
48 changes: 44 additions & 4 deletions apis/bases/core.openstack.org_openstackcontrolplanes.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2128,9 +2128,6 @@ spec:
type: string
transportURLSecret:
type: string
required:
- controlNetworkName
- storageRequest
type: object
designateCentral:
properties:
Expand Down Expand Up @@ -2613,7 +2610,6 @@ spec:
- designateBackendbind9
- designateCentral
- designateMdns
- designateNetworkAttachment
- designateProducer
- designateWorker
- rabbitMqClusterName
Expand Down Expand Up @@ -7286,6 +7282,14 @@ spec:
format: int32
minimum: 1
type: integer
httpdCustomization:
properties:
processNumber:
default: 3
format: int32
minimum: 1
type: integer
type: object
memcachedInstance:
default: memcached
type: string
Expand Down Expand Up @@ -12632,6 +12636,10 @@ spec:
format: int32
minimum: 0
type: integer
nodeSelector:
additionalProperties:
type: string
type: object
override:
properties:
service:
Expand Down Expand Up @@ -16456,6 +16464,10 @@ spec:
templates:
additionalProperties:
properties:
nodeSelector:
additionalProperties:
type: string
type: object
replicas:
default: 1
format: int32
Expand Down Expand Up @@ -16612,6 +16624,10 @@ spec:
items:
type: string
type: array
nodeSelector:
additionalProperties:
type: string
type: object
storageClass:
default: ""
type: string
Expand All @@ -16634,6 +16650,10 @@ spec:
items:
type: string
type: array
nodeSelector:
additionalProperties:
type: string
type: object
override:
properties:
service:
Expand Down Expand Up @@ -16739,6 +16759,10 @@ spec:
format: int64
minimum: 1
type: integer
nodeSelector:
additionalProperties:
type: string
type: object
partPower:
default: 10
format: int64
Expand Down Expand Up @@ -16775,6 +16799,10 @@ spec:
items:
type: string
type: array
nodeSelector:
additionalProperties:
type: string
type: object
replicas:
default: 1
format: int32
Expand Down Expand Up @@ -17215,6 +17243,10 @@ spec:
items:
type: string
type: array
nodeSelector:
additionalProperties:
type: string
type: object
override:
properties:
service:
Expand Down Expand Up @@ -17366,6 +17398,10 @@ spec:
items:
type: string
type: array
nodeSelector:
additionalProperties:
type: string
type: object
passwordSelector:
default:
ceilometerService: CeilometerPassword
Expand Down Expand Up @@ -18092,6 +18128,10 @@ spec:
type: string
type: object
type: object
nodeSelector:
additionalProperties:
type: string
type: object
type: object
type: object
tls:
Expand Down
4 changes: 2 additions & 2 deletions apis/client/v1beta1/openstackclient_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ type OpenStackClientSpecCore struct {
OpenStackConfigSecret *string `json:"openStackConfigSecret"`

// +kubebuilder:validation:Optional
// NodeSelector to target subset of worker nodes running control plane services (currently only applies to KeystoneAPI and PlacementAPI)
NodeSelector map[string]string `json:"nodeSelector,omitempty"`
// NodeSelector to target subset of worker nodes
NodeSelector *map[string]string `json:"nodeSelector,omitempty"`

// +kubebuilder:validation:Optional
// +operator-sdk:csv:customresourcedefinitions:type=spec
Expand Down
10 changes: 7 additions & 3 deletions apis/client/v1beta1/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion apis/core/v1beta1/openstackcontrolplane_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ type OpenStackControlPlaneSpec struct {

// +kubebuilder:validation:Optional
// +operator-sdk:csv:customresourcedefinitions:type=spec
// NodeSelector to target subset of worker nodes running control plane services (currently only applies to KeystoneAPI and PlacementAPI)
// NodeSelector to target subset of worker nodes running control plane services
NodeSelector map[string]string `json:"nodeSelector,omitempty"`

// +kubebuilder:validation:Optional
Expand Down Expand Up @@ -507,6 +507,10 @@ type RabbitmqTemplate struct {
// +operator-sdk:csv:customresourcedefinitions:type=spec
// Overrides to use when creating the Rabbitmq clusters
rabbitmqv2.RabbitmqClusterSpecCore `json:",inline"`
// +kubebuilder:validation:Optional
// +operator-sdk:csv:customresourcedefinitions:type=spec
// NodeSelector to target subset of worker nodes running this service
NodeSelector *map[string]string `json:"nodeSelector,omitempty"`
}

// OvnSection defines the desired state of OVN services
Expand Down
11 changes: 11 additions & 0 deletions apis/core/v1beta1/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 18 additions & 18 deletions apis/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,27 @@ require (
github.com/go-playground/validator/v10 v10.22.1
github.com/onsi/ginkgo/v2 v2.20.1
github.com/onsi/gomega v1.34.1
github.com/openstack-k8s-operators/barbican-operator/api v0.5.1-0.20241114211344-1b231eb16c92
github.com/openstack-k8s-operators/cinder-operator/api v0.5.1-0.20241105155912-ff3f0d455309
github.com/openstack-k8s-operators/designate-operator/api v0.5.0
github.com/openstack-k8s-operators/glance-operator/api v0.5.1-0.20241119075400-402f7758bda3
github.com/openstack-k8s-operators/heat-operator/api v0.5.1-0.20241028235411-eaf5b063654f
github.com/openstack-k8s-operators/horizon-operator/api v0.5.0
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20241120213010-335e32b1dc65
github.com/openstack-k8s-operators/ironic-operator/api v0.5.0
github.com/openstack-k8s-operators/keystone-operator/api v0.5.0
github.com/openstack-k8s-operators/barbican-operator/api v0.5.1-0.20241122125559-6de316c14027
github.com/openstack-k8s-operators/cinder-operator/api v0.5.1-0.20241122125843-c716f59e13f9
github.com/openstack-k8s-operators/designate-operator/api v0.5.1-0.20241122132349-a043c75b53ad
github.com/openstack-k8s-operators/glance-operator/api v0.5.1-0.20241122125600-ef3dc51eea99
github.com/openstack-k8s-operators/heat-operator/api v0.5.1-0.20241122125317-93eece5fcfa0
github.com/openstack-k8s-operators/horizon-operator/api v0.5.1-0.20241122125601-2e200c1224ce
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20241122125042-ff0bda8161fe
github.com/openstack-k8s-operators/ironic-operator/api v0.5.1-0.20241122125317-56d6da8098be
github.com/openstack-k8s-operators/keystone-operator/api v0.5.1-0.20241122131229-de8969562e62
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.0
github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.0
github.com/openstack-k8s-operators/manila-operator/api v0.5.0
github.com/openstack-k8s-operators/mariadb-operator/api v0.5.0
github.com/openstack-k8s-operators/neutron-operator/api v0.5.1-0.20241112143215-294abc29ae85
github.com/openstack-k8s-operators/nova-operator/api v0.5.0
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241119144914-248c7edb4442
github.com/openstack-k8s-operators/manila-operator/api v0.5.1-0.20241122125316-c77565257def
github.com/openstack-k8s-operators/mariadb-operator/api v0.5.1-0.20241122125601-f248f6c7e2d1
github.com/openstack-k8s-operators/neutron-operator/api v0.5.1-0.20241122125044-affa1773a767
github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20241122111943-e2caf725b1be
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20241122124748-e27c3e9d95cd
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20241120122537-78d219a20372
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20241119133501-af147950fdbb
github.com/openstack-k8s-operators/placement-operator/api v0.5.0
github.com/openstack-k8s-operators/swift-operator/api v0.5.0
github.com/openstack-k8s-operators/telemetry-operator/api v0.5.1-0.20241120170327-df16dea2cae6
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20241122125317-6ca662dca481
github.com/openstack-k8s-operators/placement-operator/api v0.5.1-0.20241122125843-ad42d8c488ae
github.com/openstack-k8s-operators/swift-operator/api v0.5.1-0.20241122125042-e71e20768f68
github.com/openstack-k8s-operators/telemetry-operator/api v0.5.1-0.20241122125043-2ef48ecf8aa7
github.com/rabbitmq/cluster-operator/v2 v2.11.0
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.71.0-rhobs1 // indirect
github.com/rhobs/observability-operator v0.3.1 // indirect
Expand Down
Loading

0 comments on commit 09155ef

Please sign in to comment.