From 9e848a73713b1038718ae59a61f13e8e17e9d118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Jeanneret?= <cjeanner@redhat.com>
Date: Wed, 9 Apr 2025 16:06:27 +0200
Subject: [PATCH] Re-add "redhat" service in default service list

This patch reverts #1229 by re-adding the "redhat" service in default
service list for openstackdataplanenodeset.

Depends-On: https://github.com/openstack-k8s-operators/edpm-ansible/pull/932
Related-Issue: OSPRH-15644
---
 .../dataplane.openstack.org_openstackdataplanenodesets.yaml   | 1 +
 apis/dataplane/v1beta1/openstackdataplanenodeset_types.go     | 2 +-
 bindata/crds/crds.yaml                                        | 1 +
 .../dataplane.openstack.org_openstackdataplanenodesets.yaml   | 1 +
 .../samples/dataplane_v1beta1_openstackdataplanenodeset.yaml  | 1 +
 .../dataplane/openstackdataplanenodeset_controller_test.go    | 4 ++++
 6 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml b/apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml
index 70fa7d4f8d..5aa48ad4ec 100644
--- a/apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml
+++ b/apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml
@@ -860,6 +860,7 @@ spec:
                 type: integer
               services:
                 default:
+                - redhat
                 - download-cache
                 - bootstrap
                 - configure-network
diff --git a/apis/dataplane/v1beta1/openstackdataplanenodeset_types.go b/apis/dataplane/v1beta1/openstackdataplanenodeset_types.go
index a8ea125ede..c865a51df8 100644
--- a/apis/dataplane/v1beta1/openstackdataplanenodeset_types.go
+++ b/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"`
 
diff --git a/bindata/crds/crds.yaml b/bindata/crds/crds.yaml
index 2349d6b0af..516ba64913 100644
--- a/bindata/crds/crds.yaml
+++ b/bindata/crds/crds.yaml
@@ -18882,6 +18882,7 @@ spec:
                 type: integer
               services:
                 default:
+                - redhat
                 - download-cache
                 - bootstrap
                 - configure-network
diff --git a/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml b/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml
index 70fa7d4f8d..5aa48ad4ec 100644
--- a/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml
+++ b/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml
@@ -860,6 +860,7 @@ spec:
                 type: integer
               services:
                 default:
+                - redhat
                 - download-cache
                 - bootstrap
                 - configure-network
diff --git a/config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml b/config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml
index 7c832284bf..c68a1d4f2e 100644
--- a/config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml
+++ b/config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml
@@ -8,6 +8,7 @@ spec:
     - name: ANSIBLE_FORCE_COLOR
       value: "True"
   services:
+    - redhat
     - bootstrap
     - download-cache
     - configure-network
diff --git a/tests/functional/dataplane/openstackdataplanenodeset_controller_test.go b/tests/functional/dataplane/openstackdataplanenodeset_controller_test.go
index 9e8561ca20..c45abaf47a 100644
--- a/tests/functional/dataplane/openstackdataplanenodeset_controller_test.go
+++ b/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",