From 24fe2b482bc30b5b39ec1559d0fe77d3b43ea63d Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Mon, 16 Dec 2024 13:30:23 +0530 Subject: [PATCH] Drop redhat service from default nodeset samples The service requires rhel nodes to run which we don't have upstream and so is not being tested. Also enabling this service requires additional vars like activationkey,token, username etc. Also it broke some downstream jobs which running older version of operators and using these upstream samples. Related-Issue: OSPCIX-596 --- .../dataplane.openstack.org_openstackdataplanenodesets.yaml | 1 - apis/dataplane/v1beta1/openstackdataplanenodeset_types.go | 2 +- .../dataplane.openstack.org_openstackdataplanenodesets.yaml | 1 - .../samples/dataplane_v1beta1_openstackdataplanenodeset.yaml | 1 - .../dataplane/openstackdataplanenodeset_controller_test.go | 4 ---- 5 files changed, 1 insertion(+), 8 deletions(-) diff --git a/apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml b/apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml index 3293d3fb9..5cf26d9a5 100644 --- a/apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml +++ b/apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml @@ -900,7 +900,6 @@ 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 32b1a1609..bb2527700 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={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} + // +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} // Services list Services []string `json:"services"` diff --git a/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml b/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml index 3293d3fb9..5cf26d9a5 100644 --- a/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml +++ b/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml @@ -900,7 +900,6 @@ 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 c68a1d4f2..7c832284b 100644 --- a/config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml +++ b/config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml @@ -8,7 +8,6 @@ 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 184c225ef..1780e5805 100644 --- a/tests/functional/dataplane/openstackdataplanenodeset_controller_test.go +++ b/tests/functional/dataplane/openstackdataplanenodeset_controller_test.go @@ -355,7 +355,6 @@ var _ = Describe("Dataplane NodeSet Test", func() { }, }, Services: []string{ - "redhat", "download-cache", "bootstrap", "configure-network", @@ -405,7 +404,6 @@ var _ = Describe("Dataplane NodeSet Test", func() { BeforeEach(func() { nodeSetSpec := DefaultDataPlaneNoNodeSetSpec(tlsEnabled) nodeSetSpec["services"] = []string{ - "redhat", "download-cache", "bootstrap", "configure-network", @@ -496,7 +494,6 @@ var _ = Describe("Dataplane NodeSet Test", func() { }, }, Services: []string{ - "redhat", "download-cache", "bootstrap", "configure-network", @@ -951,7 +948,6 @@ var _ = Describe("Dataplane NodeSet Test", func() { }, }, Services: []string{ - "redhat", "download-cache", "bootstrap", "configure-network",