From d0c4f15050e9e278c140324a9a1df1c84c4cee18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Charri=C3=A8re?= Date: Mon, 12 Aug 2024 12:03:43 +0200 Subject: [PATCH] Print release version in `get cluster` (#1399) * Add Release information to `get cluster` from release label Obtain data from the Cluster CR. Signed-off-by: Matias Charriere * Make the default provider the generic ProviderDefault OpenStack is not supported anymore. Signed-off-by: Matias Charriere * update changelog Signed-off-by: Matias Charriere * Fix tests Signed-off-by: Matias Charriere --------- Signed-off-by: Matias Charriere --- CHANGELOG.md | 1 + cmd/get/clusters/provider/common.go | 2 ++ internal/key/provider.go | 1 + pkg/commonconfig/commonconfig.go | 2 +- pkg/commonconfig/commonconfig_test.go | 20 +++++--------------- 5 files changed, 10 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a3c13d9e..eb4286988 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ and this project's packages adheres to [Semantic Versioning](http://semver.org/s - Use more portable, Bash specific shebang for GitOps pre-commit script template - Schedule cluster upgrades for CAPI clusters. +- Print Release information in `get cluster` command. ## [3.1.0] - 2024-07-23 diff --git a/cmd/get/clusters/provider/common.go b/cmd/get/clusters/provider/common.go index ccf085de6..a9041dd79 100644 --- a/cmd/get/clusters/provider/common.go +++ b/cmd/get/clusters/provider/common.go @@ -28,6 +28,7 @@ func GetCommonClusterTable(clusterResource cluster.Resource) *metav1.Table { {Name: "Name", Type: "string"}, {Name: "Age", Type: "string", Format: "date-time"}, {Name: "Condition", Type: "string"}, + {Name: "Release", Type: "string"}, {Name: "Service Priority", Type: "string"}, {Name: "Organization", Type: "string"}, {Name: "Description", Type: "string"}, @@ -98,6 +99,7 @@ func getCommonClusterRow(c cluster.Cluster) metav1.TableRow { c.Cluster.GetName(), output.TranslateTimestampSince(c.Cluster.CreationTimestamp), getLatestCondition(c.Cluster.GetConditions()), + c.Cluster.Labels[label.ReleaseVersion], getClusterServicePriority(c.Cluster), c.Cluster.Labels[label.Organization], getClusterDescription(c.Cluster), diff --git a/internal/key/provider.go b/internal/key/provider.go index bad15a72a..37eb0e070 100644 --- a/internal/key/provider.go +++ b/internal/key/provider.go @@ -11,6 +11,7 @@ const ( ProviderOpenStack = "openstack" ProviderVSphere = "vsphere" ProviderCloudDirector = "cloud-director" + ProviderDefault = "default" ) const ( diff --git a/pkg/commonconfig/commonconfig.go b/pkg/commonconfig/commonconfig.go index d65503ce1..6f6202be7 100644 --- a/pkg/commonconfig/commonconfig.go +++ b/pkg/commonconfig/commonconfig.go @@ -79,7 +79,7 @@ func (cc *CommonConfig) GetProviderFromConfig(ctx context.Context, athenaUrl str case capaRegexp.MatchString(config.Host): provider = key.ProviderCAPA default: - provider = key.ProviderOpenStack + provider = key.ProviderDefault } return provider, nil diff --git a/pkg/commonconfig/commonconfig_test.go b/pkg/commonconfig/commonconfig_test.go index ae8ccdf94..8e01f0063 100644 --- a/pkg/commonconfig/commonconfig_test.go +++ b/pkg/commonconfig/commonconfig_test.go @@ -32,29 +32,19 @@ func TestCommonConfig_GetProviderFromInstallation(t *testing.T) { expectedResult: key.ProviderAzure, }, { - name: "case 2: AWS url", + name: "case 2: AWS URL", k8sApiURL: "https://g8s.test.eu-west-1.aws.coolio.com", expectedResult: key.ProviderAWS, }, { - name: "case 3: Azure url", + name: "case 3: Azure URL", k8sApiURL: "https://g8s.test.eu-west-1.azure.coolio.com", expectedResult: key.ProviderAzure, }, { - name: "case 4: OpenStack url", - k8sApiURL: "https://test12.customer.coolio.com", - expectedResult: key.ProviderOpenStack, - }, - { - name: "case 5: URL containing 'aws', but not AWS", - k8sApiURL: "https://aws12.customer.coolio.com", - expectedResult: key.ProviderOpenStack, - }, - { - name: "case 6: URL containing 'azure', but not Azure", - k8sApiURL: "https://azure12.customer.coolio.com", - expectedResult: key.ProviderOpenStack, + name: "case 4: Teleport URL", + k8sApiURL: "https://teleport.coolio.io", + expectedResult: key.ProviderDefault, }, }