From b58fef88593fa467b81830a3b356d025fa5b3474 Mon Sep 17 00:00:00 2001 From: Dario Tranchitella Date: Fri, 15 Jul 2022 18:29:57 +0200 Subject: [PATCH] refactor(kubeadmphases): using ingress spec for status update --- internal/resources/kubeadm_config.go | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/internal/resources/kubeadm_config.go b/internal/resources/kubeadm_config.go index c78fd77..988e727 100644 --- a/internal/resources/kubeadm_config.go +++ b/internal/resources/kubeadm_config.go @@ -28,14 +28,14 @@ type KubeadmConfigResource struct { } func (r *KubeadmConfigResource) ShouldStatusBeUpdated(ctx context.Context, tenantControlPlane *kamajiv1alpha1.TenantControlPlane) bool { - address, _, err := tenantControlPlane.AssignedControlPlaneAddress() + address, port, err := tenantControlPlane.AssignedControlPlaneAddress() if err != nil { return true } return !(tenantControlPlane.Status.KubeadmConfig.Checksum == r.resource.GetAnnotations()["checksum"] && tenantControlPlane.Status.KubeadmConfig.ConfigmapName == r.resource.GetName() && - tenantControlPlane.Status.ControlPlaneEndpoint == r.getControlPlaneEndpoint(tenantControlPlane, address)) + tenantControlPlane.Status.ControlPlaneEndpoint == r.getControlPlaneEndpoint(tenantControlPlane.Spec.ControlPlane.Ingress, address, port)) } func (r *KubeadmConfigResource) ShouldCleanup(plane *kamajiv1alpha1.TenantControlPlane) bool { @@ -78,17 +78,17 @@ func (r *KubeadmConfigResource) UpdateTenantControlPlaneStatus(ctx context.Conte tenantControlPlane.Status.KubeadmConfig.LastUpdate = metav1.Now() tenantControlPlane.Status.KubeadmConfig.Checksum = r.resource.GetAnnotations()["checksum"] tenantControlPlane.Status.KubeadmConfig.ConfigmapName = r.resource.GetName() - tenantControlPlane.Status.ControlPlaneEndpoint = r.getControlPlaneEndpoint(tenantControlPlane, address) + tenantControlPlane.Status.ControlPlaneEndpoint = r.getControlPlaneEndpoint(tenantControlPlane.Spec.ControlPlane.Ingress, address, 0) return nil } -func (r *KubeadmConfigResource) getControlPlaneEndpoint(tenantControlPlane *kamajiv1alpha1.TenantControlPlane, address string) string { - if tenantControlPlane.Spec.ControlPlane.Ingress.Hostname != "" { - return tenantControlPlane.Spec.ControlPlane.Ingress.Hostname +func (r *KubeadmConfigResource) getControlPlaneEndpoint(ingress kamajiv1alpha1.IngressSpec, address string, port int32) string { + if hostname := ingress.Hostname; len(hostname) > 0 { + return hostname } - return fmt.Sprintf("%s:%d", address, tenantControlPlane.Spec.NetworkProfile.Port) + return fmt.Sprintf("%s:%d", address, port) } func (r *KubeadmConfigResource) mutate(tenantControlPlane *kamajiv1alpha1.TenantControlPlane) controllerutil.MutateFn { @@ -133,7 +133,3 @@ func (r *KubeadmConfigResource) mutate(tenantControlPlane *kamajiv1alpha1.Tenant return nil } } - -func getAddress(ctx context.Context, client client.Client, tenantControlPlane kamajiv1alpha1.TenantControlPlane) (string, error) { - return tenantControlPlane.GetControlPlaneAddress(ctx, client) -}