From a639520003d4d6b633c46ad3a9719d51a50c4a28 Mon Sep 17 00:00:00 2001 From: Mahesh Palkar Date: Mon, 29 Dec 2025 13:06:44 +0530 Subject: [PATCH] removing non azure offering flavour id - osd --- internal/ocm/convert.go | 3 --- internal/ocm/convert_test.go | 2 -- .../initial-cluster-service-state/basic-cluster.json | 4 ---- .../initial-cluster-service-state/immutability-cluster.json | 4 ---- .../initial-cluster-service-state/invalid-format-cluster.json | 4 ---- .../initial-cluster-service-state/minimal-cluster.json | 4 ---- .../missing-required-fields-cluster.json | 4 ---- .../initial-cluster-service-state/noop-update-cluster.json | 4 ---- 8 files changed, 29 deletions(-) diff --git a/internal/ocm/convert.go b/internal/ocm/convert.go index a4df88919a..62f4944980 100644 --- a/internal/ocm/convert.go +++ b/internal/ocm/convert.go @@ -35,7 +35,6 @@ import ( ) const ( - csFlavourId string = "osd-4" // managed cluster csCloudProvider string = "azure" csProductId string = "aro" csHypershifEnabled bool = true @@ -621,8 +620,6 @@ func withImmutableAttributes(clusterBuilder *arohcpv1alpha1.ClusterBuilder, hcpC clusterBuilder. Name(strings.ToLower(hcpCluster.Name)). - Flavour(arohcpv1alpha1.NewFlavour(). - ID(csFlavourId)). Region(arohcpv1alpha1.NewCloudRegion(). ID(arm.GetAzureLocation())). CloudProvider(arohcpv1alpha1.NewCloudProvider(). diff --git a/internal/ocm/convert_test.go b/internal/ocm/convert_test.go index 57d78ba333..95c7f380d7 100644 --- a/internal/ocm/convert_test.go +++ b/internal/ocm/convert_test.go @@ -376,8 +376,6 @@ func ocmClusterDefaults() *arohcpv1alpha1.ClusterBuilder { CCS(arohcpv1alpha1.NewCCS().Enabled(true)). CloudProvider(arohcpv1alpha1.NewCloudProvider(). ID("azure")). - Flavour(arohcpv1alpha1.NewFlavour(). - ID("osd-4")). Hypershift(arohcpv1alpha1.NewHypershift(). Enabled(true)). Name(strings.ToLower(api.TestClusterName)). diff --git a/test-integration/frontend/artifacts/NodePoolMutation/initial-cluster-service-state/basic-cluster.json b/test-integration/frontend/artifacts/NodePoolMutation/initial-cluster-service-state/basic-cluster.json index 6129eb0dd0..5294c1cb83 100644 --- a/test-integration/frontend/artifacts/NodePoolMutation/initial-cluster-service-state/basic-cluster.json +++ b/test-integration/frontend/artifacts/NodePoolMutation/initial-cluster-service-state/basic-cluster.json @@ -58,10 +58,6 @@ "id": "azure", "kind": "CloudProvider" }, - "flavour": { - "id": "osd-4", - "kind": "Flavour" - }, "href": "/api/aro_hcp/v1alpha1/clusters/cs-basic", "hypershift": { "enabled": true diff --git a/test-integration/frontend/artifacts/NodePoolMutation/initial-cluster-service-state/immutability-cluster.json b/test-integration/frontend/artifacts/NodePoolMutation/initial-cluster-service-state/immutability-cluster.json index c4955a46ea..a4136ed05e 100644 --- a/test-integration/frontend/artifacts/NodePoolMutation/initial-cluster-service-state/immutability-cluster.json +++ b/test-integration/frontend/artifacts/NodePoolMutation/initial-cluster-service-state/immutability-cluster.json @@ -58,10 +58,6 @@ "id": "azure", "kind": "CloudProvider" }, - "flavour": { - "id": "osd-4", - "kind": "Flavour" - }, "href": "/api/aro_hcp/v1alpha1/clusters/cs-immutability", "hypershift": { "enabled": true diff --git a/test-integration/frontend/artifacts/NodePoolMutation/initial-cluster-service-state/invalid-format-cluster.json b/test-integration/frontend/artifacts/NodePoolMutation/initial-cluster-service-state/invalid-format-cluster.json index 839d352e65..4164d85192 100644 --- a/test-integration/frontend/artifacts/NodePoolMutation/initial-cluster-service-state/invalid-format-cluster.json +++ b/test-integration/frontend/artifacts/NodePoolMutation/initial-cluster-service-state/invalid-format-cluster.json @@ -58,10 +58,6 @@ "id": "azure", "kind": "CloudProvider" }, - "flavour": { - "id": "osd-4", - "kind": "Flavour" - }, "href": "/api/aro_hcp/v1alpha1/clusters/cs-invalid-format", "hypershift": { "enabled": true diff --git a/test-integration/frontend/artifacts/NodePoolMutation/initial-cluster-service-state/minimal-cluster.json b/test-integration/frontend/artifacts/NodePoolMutation/initial-cluster-service-state/minimal-cluster.json index 0b1a0e0ca5..77e0057b55 100644 --- a/test-integration/frontend/artifacts/NodePoolMutation/initial-cluster-service-state/minimal-cluster.json +++ b/test-integration/frontend/artifacts/NodePoolMutation/initial-cluster-service-state/minimal-cluster.json @@ -58,10 +58,6 @@ "id": "azure", "kind": "CloudProvider" }, - "flavour": { - "id": "osd-4", - "kind": "Flavour" - }, "href": "/api/aro_hcp/v1alpha1/clusters/cs-minimal", "hypershift": { "enabled": true diff --git a/test-integration/frontend/artifacts/NodePoolMutation/initial-cluster-service-state/missing-required-fields-cluster.json b/test-integration/frontend/artifacts/NodePoolMutation/initial-cluster-service-state/missing-required-fields-cluster.json index 44a8afbe81..ab984c747c 100644 --- a/test-integration/frontend/artifacts/NodePoolMutation/initial-cluster-service-state/missing-required-fields-cluster.json +++ b/test-integration/frontend/artifacts/NodePoolMutation/initial-cluster-service-state/missing-required-fields-cluster.json @@ -58,10 +58,6 @@ "id": "azure", "kind": "CloudProvider" }, - "flavour": { - "id": "osd-4", - "kind": "Flavour" - }, "href": "/api/aro_hcp/v1alpha1/clusters/cs-missing-required-fields", "hypershift": { "enabled": true diff --git a/test-integration/frontend/artifacts/NodePoolMutation/initial-cluster-service-state/noop-update-cluster.json b/test-integration/frontend/artifacts/NodePoolMutation/initial-cluster-service-state/noop-update-cluster.json index 0e016bdbc1..2abcde4b21 100644 --- a/test-integration/frontend/artifacts/NodePoolMutation/initial-cluster-service-state/noop-update-cluster.json +++ b/test-integration/frontend/artifacts/NodePoolMutation/initial-cluster-service-state/noop-update-cluster.json @@ -58,10 +58,6 @@ "id": "azure", "kind": "CloudProvider" }, - "flavour": { - "id": "osd-4", - "kind": "Flavour" - }, "href": "/api/aro_hcp/v1alpha1/clusters/cs-noop-update", "hypershift": { "enabled": true