Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't use the deprecated fields in ToolchainCluster.Spec #84

Merged
merged 2 commits into from
Oct 3, 2024
Merged

Don't use the deprecated fields in ToolchainCluster.Spec #84

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0039510
Update to the streamlined version of ToolchainCluster and fix
metlos Sep 18, 2024
9e008d9
Use the predefined host and member operator namespaces from the test …
metlos Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 4 additions & 21 deletions pkg/cmd/adm/register_member.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@ func (v *registerMemberValidated) addCluster(ctx *extendedCommandContext, source
ctx.Printlnf("creating secret %s/%s in the %s cluster", targetClusterDetails.namespace, secretName, sourceClusterType.TheOtherType())
kubeConfigSecret := &v1.Secret{ObjectMeta: metav1.ObjectMeta{Name: secretName, Namespace: targetClusterDetails.namespace}}
_, err = controllerutil.CreateOrUpdate(context.TODO(), targetClusterDetails.client, kubeConfigSecret, func() error {

// update the secret label
labels := kubeConfigSecret.GetLabels()
if labels == nil {
Expand All @@ -196,7 +195,6 @@ func (v *registerMemberValidated) addCluster(ctx *extendedCommandContext, source

return nil
})

if err != nil {
return err
}
Expand All @@ -210,24 +208,9 @@ func (v *registerMemberValidated) addCluster(ctx *extendedCommandContext, source
ctx.Printlnf("creating ToolchainCluster representation of %s in %s:", sourceClusterType, targetClusterDetails.toolchainClusterName)
toolchainClusterCR := &toolchainv1alpha1.ToolchainCluster{ObjectMeta: metav1.ObjectMeta{Name: sourceClusterDetails.toolchainClusterName, Namespace: targetClusterDetails.namespace}}
_, err = controllerutil.CreateOrUpdate(context.TODO(), targetClusterDetails.client, toolchainClusterCR, func() error {

// update the tc label
labels := toolchainClusterCR.GetLabels()
if labels == nil {
labels = make(map[string]string)
}
// TODO drop this "namespace" label as soon as ToolchainCluster controller supports loading data from kubeconfig
labels["namespace"] = sourceClusterDetails.namespace
toolchainClusterCR.Labels = labels
toolchainClusterCR.Spec.APIEndpoint = sourceClusterDetails.apiEndpoint
toolchainClusterCR.Spec.SecretRef.Name = secretName
if insecureSkipTLSVerify {
toolchainClusterCR.Spec.DisabledTLSValidations = []toolchainv1alpha1.TLSValidation{toolchainv1alpha1.TLSAll}
}

return nil
})

if err != nil {
return err
}
Expand Down Expand Up @@ -346,7 +329,7 @@ func getToolchainClustersWithHostname(ctx context.Context, cl runtimeclient.Clie

clusters := []toolchainv1alpha1.ToolchainCluster{}
for _, tc := range list.Items {
if tc.Spec.APIEndpoint == hostName {
if tc.Status.APIEndpoint == hostName {
clusters = append(clusters, tc)
}
}
Expand Down Expand Up @@ -428,8 +411,8 @@ func validateArgs(ctx *extendedCommandContext, args registerMemberArgs) (*regist
if len(hostsInMember.Items) > 1 {
errors = append(errors, fmt.Sprintf("member misconfigured: the member cluster (%s) is already registered with more than 1 host in namespace %s", memberApiEndpoint, args.memberNamespace))
} else if len(hostsInMember.Items) == 1 {
if hostsInMember.Items[0].Spec.APIEndpoint != hostApiEndpoint {
errors = append(errors, fmt.Sprintf("the member is already registered with another host (%s) so registering it with the new one (%s) would result in an invalid configuration", hostsInMember.Items[0].Spec.APIEndpoint, hostApiEndpoint))
if hostsInMember.Items[0].Status.APIEndpoint != hostApiEndpoint {
errors = append(errors, fmt.Sprintf("the member is already registered with another host (%s) so registering it with the new one (%s) would result in an invalid configuration", hostsInMember.Items[0].Status.APIEndpoint, hostApiEndpoint))
}
if hostsInMember.Items[0].Name != hostToolchainClusterName {
errors = append(errors, fmt.Sprintf("the host is already in the member namespace using a ToolchainCluster object with the name '%s' but the new registration would use a ToolchainCluster with the name '%s' which would lead to an invalid configuration", hostsInMember.Items[0].Name, hostToolchainClusterName))
Expand Down Expand Up @@ -528,7 +511,7 @@ until the SpaceProvisionerConfig.spec.enabled is set to true.

func findToolchainClusterForMember(allToolchainClusters []toolchainv1alpha1.ToolchainCluster, memberAPIEndpoint, memberOperatorNamespace string) *toolchainv1alpha1.ToolchainCluster {
for _, tc := range allToolchainClusters {
if tc.Spec.APIEndpoint == memberAPIEndpoint && tc.Labels["namespace"] == memberOperatorNamespace {
if tc.Status.APIEndpoint == memberAPIEndpoint && tc.Status.OperatorNamespace == memberOperatorNamespace {
return &tc
}
}
Expand Down
Loading
Loading