Use ClusterName instead of ClusterID

Author: andfasano

pkg/asset/agent/joiner/clusterinfo.go

@@ -3,7 +3,6 @@ package joiner
 import (
 	"context"
 	"fmt"
-	"net/url"
 
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -24,11 +23,11 @@ import (
 // from an already existing cluster. A number of different resources
 // are inspected to extract the required configuration.
 type ClusterInfo struct {
-	Config          *rest.Config
 	Client          kubernetes.Interface
 	OpenshiftClient configclient.Interface
 
 	ClusterID                     string
+	ClusterName                   string
 	Version                       string
 	ReleaseImage                  string
 	APIDNSName                    string
@@ -73,10 +72,6 @@ func (ci *ClusterInfo) Generate(dependencies asset.Parents) error {
 	if err != nil {
 		return err
 	}
-	err = ci.retrieveAPIDNSName()
-	if err != nil {
-		return err
-	}
 	err = ci.retrieveClusterData()
 	if err != nil {
 		return err
@@ -123,15 +118,14 @@ func (ci *ClusterInfo) initClients(kubeconfig string) error {
 	if err != nil {
 		return err
 	}
-	ci.Config = config
 
-	openshiftClient, err := configclient.NewForConfig(ci.Config)
+	openshiftClient, err := configclient.NewForConfig(config)
 	if err != nil {
 		return err
 	}
 	ci.OpenshiftClient = openshiftClient
 
-	k8sclientset, err := kubernetes.NewForConfig(ci.Config)
+	k8sclientset, err := kubernetes.NewForConfig(config)
 	if err != nil {
 		return err
 	}
@@ -166,16 +160,6 @@ func (ci *ClusterInfo) retrieveProxy() error {
 	return nil
 }
 
-func (ci *ClusterInfo) retrieveAPIDNSName() error {
-	parsedURL, err := url.Parse(ci.Config.Host)
-	if err != nil {
-		return err
-	}
-
-	ci.APIDNSName = parsedURL.Hostname()
-	return nil
-}
-
 func (ci *ClusterInfo) retrievePullSecret() error {
 	pullSecret, err := ci.Client.CoreV1().Secrets("openshift-config").Get(context.Background(), "pull-secret", metav1.GetOptions{})
 	if err != nil {
@@ -233,6 +217,8 @@ func (ci *ClusterInfo) retrieveInstallConfigData() error {
 	ci.DeprecatedImageContentSources = installConfig.DeprecatedImageContentSources
 	ci.PlatformType = agent.HivePlatformType(installConfig.Platform)
 	ci.SSHKey = installConfig.SSHKey
+	ci.ClusterName = installConfig.ObjectMeta.Name
+	ci.APIDNSName = fmt.Sprintf("api.%s.%s", ci.ClusterName, installConfig.BaseDomain)
 
 	return nil
 }

pkg/asset/agent/joiner/clusterinfo_test.go

@@ -3,31 +3,28 @@ package joiner
 import (
 	"testing"
 
-	"github.com/openshift/assisted-service/api/hiveextension/v1beta1"
-	fakeclientconfig "github.com/openshift/client-go/config/clientset/versioned/fake"
-	"gopkg.in/yaml.v2"
+	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-
 	"k8s.io/client-go/kubernetes/fake"
-	"k8s.io/client-go/rest"
+	"sigs.k8s.io/yaml"
 
 	configv1 "github.com/openshift/api/config/v1"
+	"github.com/openshift/assisted-service/api/hiveextension/v1beta1"
+	fakeclientconfig "github.com/openshift/client-go/config/clientset/versioned/fake"
 	"github.com/openshift/installer/pkg/asset"
 	"github.com/openshift/installer/pkg/asset/agent/workflow"
 	"github.com/openshift/installer/pkg/types"
 	"github.com/openshift/installer/pkg/types/baremetal"
-	"github.com/stretchr/testify/assert"
 )
 
 func TestClusterInfo_Generate(t *testing.T) {
 	cases := []struct {
 		name                string
 		workflow            workflow.AgentWorkflowType
 		objects             []runtime.Object
-		openshiftOjects     []runtime.Object
-		configHost          string
+		openshiftObjects    []runtime.Object
 		expectedClusterInfo ClusterInfo
 	}{
 		{
@@ -36,10 +33,9 @@ func TestClusterInfo_Generate(t *testing.T) {
 			expectedClusterInfo: ClusterInfo{},
 		},
 		{
-			name:       "default",
-			workflow:   workflow.AgentWorkflowTypeAddNodes,
-			configHost: "https://api.ostest.test.metalkube.org:6443",
-			openshiftOjects: []runtime.Object{
+			name:     "default",
+			workflow: workflow.AgentWorkflowTypeAddNodes,
+			openshiftObjects: []runtime.Object{
 				&configv1.ClusterVersion{
 					ObjectMeta: v1.ObjectMeta{
 						Name: "version",
@@ -110,6 +106,7 @@ func TestClusterInfo_Generate(t *testing.T) {
 			},
 			expectedClusterInfo: ClusterInfo{
 				ClusterID:    "1b5ba46b-7e56-47b1-a326-a9eebddfb38c",
+				ClusterName:  "ostest",
 				ReleaseImage: "registry.ci.openshift.org/ocp/release@sha256:65d9b652d0d23084bc45cb66001c22e796d43f5e9e005c2bc2702f94397d596e",
 				Version:      "4.15.0",
 				APIDNSName:   "api.ostest.test.metalkube.org",
@@ -144,20 +141,17 @@ func TestClusterInfo_Generate(t *testing.T) {
 			parents.Add(addNodesConfig)
 
 			fakeClient := fake.NewSimpleClientset(tc.objects...)
-			fakeOCClient := fakeclientconfig.NewSimpleClientset(tc.openshiftOjects...)
-			fakeConfig := &rest.Config{
-				Host: tc.configHost,
-			}
+			fakeOCClient := fakeclientconfig.NewSimpleClientset(tc.openshiftObjects...)
 
 			clusterInfo := &ClusterInfo{
-				Config:          fakeConfig,
 				Client:          fakeClient,
 				OpenshiftClient: fakeOCClient,
 			}
 			err := clusterInfo.Generate(parents)
 
 			assert.NoError(t, err)
 			assert.Equal(t, tc.expectedClusterInfo.ClusterID, clusterInfo.ClusterID)
+			assert.Equal(t, tc.expectedClusterInfo.ClusterName, clusterInfo.ClusterName)
 			assert.Equal(t, tc.expectedClusterInfo.Version, clusterInfo.Version)
 			assert.Equal(t, tc.expectedClusterInfo.ReleaseImage, clusterInfo.ReleaseImage)
 			assert.Equal(t, tc.expectedClusterInfo.APIDNSName, clusterInfo.APIDNSName)
@@ -175,7 +169,12 @@ func TestClusterInfo_Generate(t *testing.T) {
 }
 
 func makeInstallConfig(t *testing.T) string {
+	t.Helper()
 	ic := &types.InstallConfig{
+		ObjectMeta: v1.ObjectMeta{
+			Name: "ostest",
+		},
+		BaseDomain: "test.metalkube.org",
 		ImageDigestSources: []types.ImageDigestSource{
 			{
 				Source: "quay.io/openshift-release-dev/ocp-v4.0-art-dev",
@@ -193,5 +192,6 @@ func makeInstallConfig(t *testing.T) string {
 	if err != nil {
 		t.Error(err)
 	}
+
 	return string(data)
 }

pkg/asset/agent/manifests/agentpullsecret.go

@@ -64,7 +64,7 @@ func (a *AgentPullSecret) Generate(dependencies asset.Parents) error {
 		}
 
 	case workflow.AgentWorkflowTypeAddNodes:
-		a.generateSecret(clusterInfo.ClusterID, clusterInfo.Namespace, clusterInfo.PullSecret)
+		a.generateSecret(clusterInfo.ClusterName, clusterInfo.Namespace, clusterInfo.PullSecret)
 
 	default:
 		return fmt.Errorf("AgentWorkflowType value not supported: %s", agentWorkflow.Workflow)

pkg/asset/agent/manifests/agentpullsecret_test.go

@@ -31,9 +31,9 @@ func TestAgentPullSecret_Generate(t *testing.T) {
 				&agent.OptionalInstallConfig{},
 				&workflow.AgentWorkflow{Workflow: workflow.AgentWorkflowTypeAddNodes},
 				&joiner.ClusterInfo{
-					ClusterID:  "ostest",
-					Namespace:  "cluster0",
-					PullSecret: "{\n  \"auths\": {\n    \"cloud.openshift.com\": {\n      \"auth\": \"b3BlUTA=\",\n      \"email\": \"[email protected]\"\n    }\n  }\n}",
+					ClusterName: "ostest",
+					Namespace:   "cluster0",
+					PullSecret:  "{\n  \"auths\": {\n    \"cloud.openshift.com\": {\n      \"auth\": \"b3BlUTA=\",\n      \"email\": \"[email protected]\"\n    }\n  }\n}",
 				},
 			},
 			expectedConfig: &corev1.Secret{

pkg/asset/agent/manifests/infraenv.go

@@ -72,7 +72,7 @@ func (i *InfraEnv) Generate(dependencies asset.Parents) error {
 		}
 
 	case workflow.AgentWorkflowTypeAddNodes:
-		err := i.generateManifest(clusterInfo.ClusterID, clusterInfo.Namespace, clusterInfo.SSHKey, clusterInfo.UserCaBundle, clusterInfo.Proxy, clusterInfo.Architecture)
+		err := i.generateManifest(clusterInfo.ClusterName, clusterInfo.Namespace, clusterInfo.SSHKey, clusterInfo.UserCaBundle, clusterInfo.Proxy, clusterInfo.Architecture)
 		if err != nil {
 			return err
 		}

pkg/asset/agent/manifests/infraenv_test.go

@@ -161,7 +161,7 @@ func TestInfraEnv_Generate(t *testing.T) {
 			dependencies: []asset.Asset{
 				&workflow.AgentWorkflow{Workflow: workflow.AgentWorkflowTypeAddNodes},
 				&joiner.ClusterInfo{
-					ClusterID:    "agent-cluster",
+					ClusterName:  "agent-cluster",
 					Namespace:    "agent-ns",
 					UserCaBundle: "user-ca-bundle",
 					Proxy: &types.Proxy{