Merge pull request #1433 from openshift-cherrypick-robot/cherry-pick-1399-to-18.0-fr2

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

Author: openshift-merge-bot[bot]

apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml

@@ -860,6 +860,7 @@ spec:
                 type: integer
               services:
                 default:
+                - redhat
                 - download-cache
                 - bootstrap
                 - configure-network

apis/dataplane/v1beta1/openstackdataplanenodeset_types.go

@@ -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"`
 

bindata/crds/crds.yaml

@@ -18882,6 +18882,7 @@ spec:
                 type: integer
               services:
                 default:
+                - redhat
                 - download-cache
                 - bootstrap
                 - configure-network

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

@@ -860,6 +860,7 @@ spec:
                 type: integer
               services:
                 default:
+                - redhat
                 - download-cache
                 - bootstrap
                 - configure-network

config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml

@@ -8,6 +8,7 @@ spec:
     - name: ANSIBLE_FORCE_COLOR
       value: "True"
   services:
+    - redhat
     - bootstrap
     - download-cache
     - configure-network

tests/functional/dataplane/openstackdataplanenodeset_controller_test.go

@@ -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",
@@ -368,6 +369,7 @@ var _ = Describe("Dataplane NodeSet Test", func() {
 			BeforeEach(func() {
 				nodeSetSpec := DefaultDataPlaneNoNodeSetSpec(tlsEnabled)
 				nodeSetSpec["services"] = []string{
+					"redhat",
 					"download-cache",
 					"bootstrap",
 					"configure-network",
@@ -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",
@@ -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",