Skip to content

Update cincinatti interaction to use maestro for clusterID #5045

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

Merged
openshift-merge-bot merged 1 commit into from
Apr 28, 2026
Merged

Update cincinatti interaction to use maestro for clusterID #5045

Show file tree
Hide file tree
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
37 changes: 19 additions & 18 deletions backend/pkg/controllers/upgradecontrollers/control_plane_desired_version_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import (
"github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils"
"github.com/Azure/ARO-HCP/backend/pkg/informers"
"github.com/Azure/ARO-HCP/backend/pkg/listers"
"github.com/Azure/ARO-HCP/backend/pkg/maestrohelpers"
"github.com/Azure/ARO-HCP/internal/admission"
"github.com/Azure/ARO-HCP/internal/api"
"github.com/Azure/ARO-HCP/internal/cincinatti"
Expand All @@ -49,10 +50,11 @@ import (
// It handles automated (managed) z-stream (patch) upgrades and assists with y-stream (minor)
// version upgrades by selecting the appropriate z-stream within the user-desired minor version.
type controlPlaneDesiredVersionSyncer struct {
cooldownChecker controllerutils.CooldownChecker
cosmosClient database.DBClient
clusterServiceClient ocm.ClusterServiceClientSpec
subscriptionLister listers.SubscriptionLister
cooldownChecker controllerutils.CooldownChecker
clusterManagementClusterContentLister listers.ManagementClusterContentLister
cosmosClient database.DBClient
clusterServiceClient ocm.ClusterServiceClientSpec
subscriptionLister listers.SubscriptionLister

cincinnatiClientLock sync.RWMutex
clusterToCincinnatiClient *lru.Cache
Expand All @@ -71,13 +73,14 @@ func NewControlPlaneDesiredVersionController(
informers informers.BackendInformers,
subscriptionLister listers.SubscriptionLister,
) controllerutils.Controller {

_, clusterManagementClusterContentLister := informers.ManagementClusterContents()
syncer := &controlPlaneDesiredVersionSyncer{
cooldownChecker: controllerutils.DefaultActiveOperationPrioritizingCooldown(activeOperationLister),
cosmosClient: cosmosClient,
clusterToCincinnatiClient: lru.New(100000),
clusterServiceClient: clusterServiceClient,
subscriptionLister: subscriptionLister,
cooldownChecker: controllerutils.DefaultActiveOperationPrioritizingCooldown(activeOperationLister),
clusterManagementClusterContentLister: clusterManagementClusterContentLister,
cosmosClient: cosmosClient,
clusterToCincinnatiClient: lru.New(100000),
clusterServiceClient: clusterServiceClient,
subscriptionLister: subscriptionLister,
}

controller := controllerutils.NewClusterWatchingController(
Expand Down Expand Up @@ -123,16 +126,14 @@ func (c *controlPlaneDesiredVersionSyncer) SyncOnce(ctx context.Context, key con
return utils.TrackError(fmt.Errorf("failed to get or create ServiceProviderCluster: %w", err))
}

// TODO bring the cluster uuid into serviceprovidercluster
clusterServiceCluster, err := c.clusterServiceClient.GetCluster(ctx, *existingCluster.ServiceProviderProperties.ClusterServiceID)
// Resolve the cluster UUID from the cached HostedCluster so we can build the Cincinnati client.
clusterUUID, found, err := maestrohelpers.GetCachedHostedClusterUUIDForCluster(ctx, c.clusterManagementClusterContentLister, key.SubscriptionID, key.ResourceGroupName, key.HCPClusterName)
Comment thread
machi1990 marked this conversation as resolved.
if err != nil {
return utils.TrackError(fmt.Errorf("failed to get cluster from Cluster Service: %w", err))
return err
}

// Create Cincinnati client with cluster UUID from Cluster Service
clusterUUID, err := uuid.Parse(clusterServiceCluster.ExternalID())
if err != nil {
return utils.TrackError(fmt.Errorf("invalid cluster UUID from Cluster Service: %w", err))
if !found {
Comment thread
machi1990 marked this conversation as resolved.
// will reappear once the informer relists; without the UUID we cannot build the Cincinnati client
return nil
}
cincinnatiClient := c.getCincinnatiClient(key, clusterUUID)

Expand Down
34 changes: 19 additions & 15 deletions backend/pkg/controllers/upgradecontrollers/nodepool_version_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import (
"github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils"
"github.com/Azure/ARO-HCP/backend/pkg/informers"
"github.com/Azure/ARO-HCP/backend/pkg/listers"
"github.com/Azure/ARO-HCP/backend/pkg/maestrohelpers"
"github.com/Azure/ARO-HCP/internal/api"
"github.com/Azure/ARO-HCP/internal/api/arm"
"github.com/Azure/ARO-HCP/internal/cincinatti"
Expand All @@ -47,9 +48,10 @@ import (
// from CS and internal and helps selecting a valid desiredVersion within the user's
// desired
type nodePoolVersionSyncer struct {
cooldownChecker controllerutils.CooldownChecker
cosmosClient database.DBClient
clusterServiceClient ocm.ClusterServiceClientSpec
cooldownChecker controllerutils.CooldownChecker
clusterManagementClusterContentLister listers.ManagementClusterContentLister
cosmosClient database.DBClient
clusterServiceClient ocm.ClusterServiceClientSpec

cincinnatiClientLock sync.RWMutex
clusterToCincinnatiClient *lru.Cache
Expand All @@ -66,11 +68,13 @@ func NewNodePoolVersionController(
activeOperationLister listers.ActiveOperationLister,
informers informers.BackendInformers,
) controllerutils.Controller {
_, clusterManagementClusterContentLister := informers.ManagementClusterContents()
syncer := &nodePoolVersionSyncer{
cooldownChecker: controllerutils.DefaultActiveOperationPrioritizingCooldown(activeOperationLister),
cosmosClient: cosmosClient,
clusterServiceClient: clusterServiceClient,
clusterToCincinnatiClient: lru.New(100000),
cooldownChecker: controllerutils.DefaultActiveOperationPrioritizingCooldown(activeOperationLister),
clusterManagementClusterContentLister: clusterManagementClusterContentLister,
cosmosClient: cosmosClient,
clusterServiceClient: clusterServiceClient,
clusterToCincinnatiClient: lru.New(100000),
}

controller := controllerutils.NewNodePoolWatchingController(
Expand Down Expand Up @@ -107,6 +111,8 @@ func NewNodePoolVersionController(
// If the desired version is already among the active versions, validation is skipped
// (the upgrade is already in progress or complete).
func (c *nodePoolVersionSyncer) SyncOnce(ctx context.Context, key controllerutils.HCPNodePoolKey) error {
logger := utils.LoggerFromContext(ctx)

// Get node pool from Cosmos to get CS internal ID
nodePool, err := c.cosmosClient.HCPClusters(key.SubscriptionID, key.ResourceGroupName).
NodePools(key.HCPClusterName).Get(ctx, key.HCPNodePoolName)
Expand Down Expand Up @@ -144,15 +150,14 @@ func (c *nodePoolVersionSyncer) SyncOnce(ctx context.Context, key controllerutil
return nil
}

// Get the cluster from Cluster Service to obtain the cluster UUID for Cincinnati
csCluster, err := c.clusterServiceClient.GetCluster(ctx, *cluster.ServiceProviderProperties.ClusterServiceID)
// Resolve the cluster UUID from the cached HostedCluster so we can build the Cincinnati client.
clusterUUID, found, err := maestrohelpers.GetCachedHostedClusterUUIDForCluster(ctx, c.clusterManagementClusterContentLister, key.SubscriptionID, key.ResourceGroupName, key.HCPClusterName)
if err != nil {
return utils.TrackError(fmt.Errorf("failed to get cluster from Cluster Service: %w", err))
return err
}

clusterUUID, err := uuid.Parse(csCluster.ExternalID())
if err != nil {
return utils.TrackError(fmt.Errorf("invalid cluster UUID from Cluster Service: %w", err))
if !found {
// will reappear once the informer relists; without the UUID we cannot build the Cincinnati client
return nil
}

clusterKey := controllerutils.HCPClusterKey{
Expand Down Expand Up @@ -189,7 +194,6 @@ func (c *nodePoolVersionSyncer) SyncOnce(ctx context.Context, key controllerutil
// - upgradepolicy.targetVersion: if the policy has started this version is applying to the nodepool
// - In Hypershift
// - .Status.Version: shows the latest applied version https://github.com/openshift/hypershift/blob/main/api/hypershift/v1beta1/nodepool_types.go#L246-L251
logger := utils.LoggerFromContext(ctx)
if !slices.Equal(oldActiveVersions, existingServiceProviderNodePool.Status.NodePoolVersion.ActiveVersions) {
logger.Info("Active versions changed", "oldActiveVersions", oldActiveVersions, "newActiveVersions", existingServiceProviderNodePool.Status.NodePoolVersion.ActiveVersions)
existingServiceProviderNodePool, err = serviceProviderCosmosNodePoolClient.Replace(ctx, existingServiceProviderNodePool, nil)
Expand Down
Loading
Loading