Address fra98 comments

liqotech · Oct 24, 2024 · 0fb45f0 · 0fb45f0
1 parent c16a934
commit 0fb45f0
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/apis/core/v1beta1/foreigncluster_types.go b/apis/core/v1beta1/foreigncluster_types.go
@@ -100,6 +100,7 @@ const (
 	NetworkConfigurationStatusCondition ConditionType = "NetworkConfigurationStatus"
 	// NetworkConnectionStatusCondition shows the network connection status.
 	NetworkConnectionStatusCondition ConditionType = "NetworkConnectionStatus"
+	NetworkGatewayPresenceCondition  ConditionType = "NetworkGatewayPresence"
 	// NetworkGatewayServerStatusCondition shows the network gateway server status.
 	NetworkGatewayServerStatusCondition ConditionType = "NetworkGatewayServerStatus"
 	// NetworkGatewayClientStatusCondition shows the network gateway client status.
@@ -141,7 +142,7 @@ const (
 // Condition contains details about state of a.
 type Condition struct {
 	// Type of the condition.
-	// +kubebuilder:validation:Enum="APIServerStatus";"NetworkConnectionStatus";"NetworkGatewayServerStatus";"NetworkGatewayClientStatus";"NetworkConfigurationStatus";"AuthIdentityControlPlaneStatus";"AuthTenantStatus";"OffloadingVirtualNodeStatus";"OffloadingNodeStatus"
+	// +kubebuilder:validation:Enum="APIServerStatus";"NetworkConnectionStatus";"NetworkGatewayServerStatus";"NetworkGatewayClientStatus";"NetworkGatewayPresence";"NetworkConfigurationStatus";"AuthIdentityControlPlaneStatus";"AuthTenantStatus";"OffloadingVirtualNodeStatus";"OffloadingNodeStatus"
 	//
 	//nolint:lll // ignore long lines given by Kubebuilder marker annotations
 	Type ConditionType `json:"type"`

diff --git a/deployments/liqo/charts/liqo-crds/crds/core.liqo.io_foreignclusters.yaml b/deployments/liqo/charts/liqo-crds/crds/core.liqo.io_foreignclusters.yaml
@@ -107,6 +107,7 @@ spec:
                       - NetworkConnectionStatus
                       - NetworkGatewayServerStatus
                       - NetworkGatewayClientStatus
+                      - NetworkGatewayPresence
                       - NetworkConfigurationStatus
                       - AuthIdentityControlPlaneStatus
                       - AuthTenantStatus
@@ -171,6 +172,7 @@ spec:
                               - NetworkConnectionStatus
                               - NetworkGatewayServerStatus
                               - NetworkGatewayClientStatus
+                              - NetworkGatewayPresence
                               - NetworkConfigurationStatus
                               - AuthIdentityControlPlaneStatus
                               - AuthTenantStatus
@@ -233,6 +235,7 @@ spec:
                               - NetworkConnectionStatus
                               - NetworkGatewayServerStatus
                               - NetworkGatewayClientStatus
+                              - NetworkGatewayPresence
                               - NetworkConfigurationStatus
                               - AuthIdentityControlPlaneStatus
                               - AuthTenantStatus
@@ -295,6 +298,7 @@ spec:
                               - NetworkConnectionStatus
                               - NetworkGatewayServerStatus
                               - NetworkGatewayClientStatus
+                              - NetworkGatewayPresence
                               - NetworkConfigurationStatus
                               - AuthIdentityControlPlaneStatus
                               - AuthTenantStatus

diff --git a/pkg/liqo-controller-manager/core/foreigncluster-controller/conditions.go b/pkg/liqo-controller-manager/core/foreigncluster-controller/conditions.go
@@ -39,8 +39,11 @@ const (
 	gatewayMissingReason  = "GatewayMissing"
 	gatewayMissingMessage = "The gateway resource connecting to the foreign cluster is missing"
 
-	networkConfigurationStatusReason  = "NetworkConfigurationPresence"
-	networkConfigurationStatusMessage = "The network configuration of the peer cluster is present"
+	gatewayPresentReason  = "GatewayPresence"
+	gatewayPresentMessage = "There is a gateway connecting to the foreign cluster"
+
+	networkConfigurationPresenceReason  = "NetworkConfigurationPresence"
+	networkConfigurationPresenceMessage = "The network configuration of the peer cluster is present"
 
 	networkConfigurationMissingReason  = "NetworkConfigurationMissing"
 	networkConfigurationMissingMessage = "The network configuration for the connection with the foreign cluster is missing"

diff --git a/pkg/liqo-controller-manager/core/foreigncluster-controller/status.go b/pkg/liqo-controller-manager/core/foreigncluster-controller/status.go
@@ -107,11 +107,17 @@ func (r *ForeignClusterReconciler) handleGatewaysStatus(ctx context.Context,
 
 	if errors.IsNotFound(errServer) && errors.IsNotFound(errClient) {
 		klog.V(6).Infof("Both GatewayServer and GatewayClient resources not found for ForeignCluster %q", clusterID)
-		statusExceptions[liqov1beta1.NetworkGatewayClientStatusCondition] = statusException{
+		statusExceptions[liqov1beta1.NetworkGatewayPresenceCondition] = statusException{
 			ConditionStatusType: liqov1beta1.ConditionStatusNotReady,
 			Reason:              gatewayMissingReason,
 			Message:             gatewayMissingMessage,
 		}
+	} else {
+		statusExceptions[liqov1beta1.NetworkGatewayPresenceCondition] = statusException{
+			ConditionStatusType: liqov1beta1.ConditionStatusReady,
+			Reason:              gatewayPresentReason,
+			Message:             gatewayPresentMessage,
+		}
 	}
 
 	switch {
@@ -207,7 +213,7 @@ func (r *ForeignClusterReconciler) handleNetworkConfigurationStatus(ctx context.
 		fcutils.EnableModuleNetworking(fc)
 		fcutils.EnsureModuleCondition(&fc.Status.Modules.Networking,
 			liqov1beta1.NetworkConfigurationStatusCondition, liqov1beta1.ConditionStatusReady,
-			networkConfigurationStatusReason, networkConfigurationStatusMessage)
+			networkConfigurationPresenceReason, networkConfigurationPresenceMessage)
 	}
 	return nil
 }