From 923dd1f61060351ca058cbbc8c9c934c0e6027e5 Mon Sep 17 00:00:00 2001 From: Benjamin Schimke Date: Wed, 3 Jul 2024 08:55:50 +0200 Subject: [PATCH] fix microcluster port propagation (#21) --- bootstrap/controllers/ck8sconfig_controller.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bootstrap/controllers/ck8sconfig_controller.go b/bootstrap/controllers/ck8sconfig_controller.go index d109fbe8..a56de6f6 100644 --- a/bootstrap/controllers/ck8sconfig_controller.go +++ b/bootstrap/controllers/ck8sconfig_controller.go @@ -220,7 +220,8 @@ func (r *CK8sConfigReconciler) joinControlplane(ctx context.Context, scope *Scop // injects into config.Version values from top level object r.reconcileTopLevelObjectSettings(scope.Cluster, machine, scope.Config) - workloadCluster, err := r.managementCluster.GetWorkloadCluster(ctx, util.ObjectKey(scope.Cluster), scope.Config.Spec.ControlPlaneConfig.GetMicroclusterPort()) + microclusterPort := scope.Config.Spec.ControlPlaneConfig.GetMicroclusterPort() + workloadCluster, err := r.managementCluster.GetWorkloadCluster(ctx, util.ObjectKey(scope.Cluster), microclusterPort) if err != nil { return fmt.Errorf("failed to create remote cluster client: %w", err) } @@ -254,6 +255,7 @@ func (r *CK8sConfigReconciler) joinControlplane(ctx context.Context, scope *Scop ExtraFiles: cloudinit.FilesFromAPI(files), ConfigFileContents: string(joinConfig), MicroclusterAddress: scope.Config.Spec.ControlPlaneConfig.MicroclusterAddress, + MicroclusterPort: microclusterPort, AirGapped: scope.Config.Spec.AirGapped, }, JoinToken: joinToken, @@ -293,7 +295,8 @@ func (r *CK8sConfigReconciler) joinWorker(ctx context.Context, scope *Scope) err return fmt.Errorf("auth token not yet generated") } - workloadCluster, err := r.managementCluster.GetWorkloadCluster(ctx, util.ObjectKey(scope.Cluster), scope.Config.Spec.ControlPlaneConfig.GetMicroclusterPort()) + microclusterPort := scope.Config.Spec.ControlPlaneConfig.GetMicroclusterPort() + workloadCluster, err := r.managementCluster.GetWorkloadCluster(ctx, util.ObjectKey(scope.Cluster), microclusterPort) if err != nil { return fmt.Errorf("failed to create remote cluster client: %w", err) } @@ -324,6 +327,7 @@ func (r *CK8sConfigReconciler) joinWorker(ctx context.Context, scope *Scope) err ExtraFiles: cloudinit.FilesFromAPI(files), ConfigFileContents: string(joinConfig), MicroclusterAddress: scope.Config.Spec.ControlPlaneConfig.MicroclusterAddress, + MicroclusterPort: microclusterPort, AirGapped: scope.Config.Spec.AirGapped, }, JoinToken: joinToken, @@ -478,6 +482,7 @@ func (r *CK8sConfigReconciler) handleClusterNotInitialized(ctx context.Context, ExtraFiles: cloudinit.FilesFromAPI(files), ConfigFileContents: string(initConfig), MicroclusterAddress: scope.Config.Spec.ControlPlaneConfig.MicroclusterAddress, + MicroclusterPort: microclusterPort, AirGapped: scope.Config.Spec.AirGapped, }, Token: *token,