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

Fix(AzureRedis): Do not update status if state has not changed #983

Merged
merged 1 commit into from
Jan 27, 2025
Merged

Fix(AzureRedis): Do not update status if state has not changed #983

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 16 additions & 4 deletions pkg/kcp/provider/azure/redisinstance/updateStatus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,38 @@ func updateStatus(ctx context.Context, st composed.State) (error, context.Contex
state := st.(*State)

redisInstance := state.ObjAsRedisInstance()
hasChanged := false

redisInstance.Status.PrimaryEndpoint = fmt.Sprintf(
primaryEndpoint := fmt.Sprintf(
"%s:%d",
*state.azureRedisInstance.Properties.HostName,
*state.azureRedisInstance.Properties.SSLPort,
)
if redisInstance.Status.PrimaryEndpoint != primaryEndpoint {
redisInstance.Status.PrimaryEndpoint = primaryEndpoint
hasChanged = true
}
resourceGroupName := state.resourceGroupName
keys, err := state.client.GetRedisInstanceAccessKeys(ctx, resourceGroupName, state.ObjAsRedisInstance().Name)

if err != nil {
return composed.LogErrorAndReturn(err, "Error retrieving Azure RedisInstance access keys", composed.StopWithRequeue, ctx)
}

authString := ""
if state.azureRedisInstance != nil {
redisInstance.Status.AuthString = pie.First(keys)
authString = pie.First(keys)
}
if redisInstance.Status.AuthString != authString {
redisInstance.Status.AuthString = authString
hasChanged = true
}

hasReadyCondition := meta.FindStatusCondition(redisInstance.Status.Conditions, cloudcontrolv1beta1.ConditionTypeReady) != nil
if hasReadyCondition && redisInstance.Status.State != cloudcontrolv1beta1.StateReady {
composed.LoggerFromCtx(ctx).Info("Ready condition already present, StopAndForget-ing")
hasReadyStatusState := redisInstance.Status.State == cloudcontrolv1beta1.StateReady

if !hasChanged && hasReadyCondition && hasReadyStatusState {
composed.LoggerFromCtx(ctx).Info("RedisInstance status fields are already up-to-date, StopAndForget-ing")
return composed.StopAndForget, nil
}

Expand Down
Loading