Skip to content

[18.0-fr2] Re-add "redhat" service in default service list #1433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
May 13, 2025
Merged

[18.0-fr2] Re-add "redhat" service in default service list #1433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -860,6 +860,7 @@ spec:
type: integer
services:
default:
- redhat
- download-cache
- bootstrap
- configure-network
Expand Down
2 changes: 1 addition & 1 deletion apis/dataplane/v1beta1/openstackdataplanenodeset_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ type OpenStackDataPlaneNodeSetSpec struct {
NetworkAttachments []string `json:"networkAttachments,omitempty"`

// +kubebuilder:validation:Optional
// +kubebuilder:default={download-cache,bootstrap,configure-network,validate-network,install-os,configure-os,ssh-known-hosts,run-os,reboot-os,install-certs,ovn,neutron-metadata,libvirt,nova,telemetry}
// +kubebuilder:default={redhat,download-cache,bootstrap,configure-network,validate-network,install-os,configure-os,ssh-known-hosts,run-os,reboot-os,install-certs,ovn,neutron-metadata,libvirt,nova,telemetry}
// Services list
Services []string `json:"services"`

Expand Down
1 change: 1 addition & 0 deletions bindata/crds/crds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18882,6 +18882,7 @@ spec:
type: integer
services:
default:
- redhat
- download-cache
- bootstrap
- configure-network
Expand Down
1 change: 1 addition & 0 deletions config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -860,6 +860,7 @@ spec:
type: integer
services:
default:
- redhat
- download-cache
- bootstrap
- configure-network
Expand Down
1 change: 1 addition & 0 deletions config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ spec:
- name: ANSIBLE_FORCE_COLOR
value: "True"
services:
- redhat
- bootstrap
- download-cache
- configure-network
Expand Down
4 changes: 4 additions & 0 deletions tests/functional/dataplane/openstackdataplanenodeset_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@ var _ = Describe("Dataplane NodeSet Test", func() {
}
Expect(dataplaneNodeSetInstance.Spec.Nodes).Should(Equal(nodes))
services := []string{
"redhat",
"download-cache",
"bootstrap",
"configure-network",
Expand Down Expand Up @@ -368,6 +369,7 @@ var _ = Describe("Dataplane NodeSet Test", func() {
BeforeEach(func() {
nodeSetSpec := DefaultDataPlaneNoNodeSetSpec(tlsEnabled)
nodeSetSpec["services"] = []string{
"redhat",
"download-cache",
"bootstrap",
"configure-network",
Expand Down Expand Up @@ -419,6 +421,7 @@ var _ = Describe("Dataplane NodeSet Test", func() {
}
Expect(dataplaneNodeSetInstance.Spec.Nodes).Should(Equal(nodes))
services := []string{
"redhat",
"download-cache",
"bootstrap",
"configure-network",
Expand Down Expand Up @@ -841,6 +844,7 @@ var _ = Describe("Dataplane NodeSet Test", func() {
}
Expect(dataplaneNodeSetInstance.Spec.Nodes).Should(Equal(nodes))
services := []string{
"redhat",
"download-cache",
"bootstrap",
"configure-network",
Expand Down