github/open-cluster-management
1
0
Fork 0
mirror of https://github.com/open-cluster-management-io/ocm.git synced 2026-05-07 01:36:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix wrong replica in condition message (#201)

Browse Source 
Signed-off-by: Jian Qiu <jqiu@redhat.com>
This commit is contained in:
Jian Qiu
2022-02-09 10:49:11 +08:00
committed by GitHub
parent bd3c2bbaa6
commit d67b0fb905
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/operators/klusterlet/controllers/statuscontroller/klusterlet_status_controller.go
View File

@@ -86,8 +86,8 @@ func (k *klusterletStatusController) sync(ctx context.Context, controllerContext
},
)
registrationDesiredCondition := checkAgentDeploymentDired(ctx, k.kubeClient, klusterletNS, registrationDeploymentName, klusterletRegistrationDesiredDegraded)
workDesiredCondition := checkAgentDeploymentDired(ctx, k.kubeClient, klusterletNS, workDeploymentName, klusterletWorkDesiredDegraded)
registrationDesiredCondition := checkAgentDeploymentDesired(ctx, k.kubeClient, klusterletNS, registrationDeploymentName, klusterletRegistrationDesiredDegraded)
workDesiredCondition := checkAgentDeploymentDesired(ctx, k.kubeClient, klusterletNS, workDeploymentName, klusterletWorkDesiredDegraded)
_, _, err = helpers.UpdateKlusterletStatus(ctx, k.klusterletClient, klusterletName,
helpers.UpdateKlusterletConditionFn(availableCondition),
@@ -103,7 +103,7 @@ type klusterletAgent struct {
}
// Check agent deployment, if the desired replicas is not equal to available replicas, return degraded condition
func checkAgentDeploymentDired(ctx context.Context, kubeClient kubernetes.Interface, namespace, deploymentName, conditionType string) metav1.Condition {
func checkAgentDeploymentDesired(ctx context.Context, kubeClient kubernetes.Interface, namespace, deploymentName, conditionType string) metav1.Condition {
deployment, err := kubeClient.AppsV1().Deployments(namespace).Get(ctx, deploymentName, metav1.GetOptions{})
if err != nil {
return metav1.Condition{
@@ -126,7 +126,7 @@ func checkAgentDeploymentDired(ctx context.Context, kubeClient kubernetes.Interf
Type: conditionType,
Status: metav1.ConditionFalse,
Reason: "DeploymentsFunctional",
Message: fmt.Sprintf("deployments replicas are desired: %d", &deployment.Spec.Replicas),
Message: fmt.Sprintf("deployments replicas are desired: %d", *deployment.Spec.Replicas),
}
}