Skip to content

[release-4.22] OCPBUGS-87364: Gate Route watch on management cluster capability #8692

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

Open
openshift-cherrypick-robot wants to merge 1 commit into
base: release-4.22
Choose a base branch
from
+67 −46
Open

[release-4.22] OCPBUGS-87364: Gate Route watch on management cluster capability #8692

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
58 changes: 37 additions & 21 deletions control-plane-operator/hostedclusterconfigoperator/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,14 @@ import (
"github.com/openshift/hypershift/control-plane-operator/hostedclusterconfigoperator/controllers/spotremediation"
"github.com/openshift/hypershift/control-plane-operator/hostedclusterconfigoperator/operator"
hyperapi "github.com/openshift/hypershift/support/api"
"github.com/openshift/hypershift/support/capabilities"
"github.com/openshift/hypershift/support/labelenforcingclient"
"github.com/openshift/hypershift/support/releaseinfo"
"github.com/openshift/hypershift/support/supportedversion"
"github.com/openshift/hypershift/support/upsert"
"github.com/openshift/hypershift/support/util"

"k8s.io/client-go/discovery"
"k8s.io/client-go/rest"

ctrl "sigs.k8s.io/controller-runtime"
Expand Down Expand Up @@ -222,6 +224,19 @@ func (o *HostedClusterConfigOperator) Run(ctx context.Context) error {
}
cfg := operator.CfgFromFile(o.TargetKubeconfig)
cpConfig := ctrl.GetConfigOrDie()

// Detect the management cluster capabilities once at startup so controllers can
// gate optional behavior (e.g. watching route.openshift.io Routes) without each
// having to build its own discovery client.
cpDiscoveryClient, err := discovery.NewDiscoveryClientForConfig(cpConfig)
if err != nil {
return fmt.Errorf("failed to create management cluster discovery client: %w", err)
}
mgmtClusterCaps, err := capabilities.DetectManagementClusterCapabilities(cpDiscoveryClient)
if err != nil {
return fmt.Errorf("failed to detect management cluster capabilities: %w", err)
}

mgr := operator.Mgr(ctx, cfg, cpConfig, o.Namespace, o.HostedControlPlaneName)
mgr.GetLogger().Info("Starting hosted-cluster-config-operator", "version", supportedversion.String())
cpCluster, err := cluster.New(cpConfig, func(opt *cluster.Options) {
Expand Down Expand Up @@ -302,27 +317,28 @@ func (o *HostedClusterConfigOperator) Run(ctx context.Context) error {
APIClient: apiReadingClient,
},

Config: cpConfig,
TargetConfig: cfg,
KubevirtInfraConfig: kubevirtInfraConfig,
Manager: mgr,
Namespace: o.Namespace,
HCPName: o.HostedControlPlaneName,
InitialCA: string(o.initialCA),
ClusterSignerCA: string(o.clusterSignerCA),
ControllerFuncs: controllersToRun,
Versions: versions,
PlatformType: hyperv1.PlatformType(o.platformType),
CPCluster: cpCluster,
Logger: ctrl.Log.WithName("hypershift-operator"),
ReleaseProvider: releaseProvider,
KonnectivityAddress: o.KonnectivityAddress,
KonnectivityPort: o.KonnectivityPort,
OAuthAddress: o.OAuthAddress,
OAuthPort: o.OAuthPort,
OperateOnReleaseImage: os.Getenv("OPERATE_ON_RELEASE_IMAGE"),
EnableCIDebugOutput: o.enableCIDebugOutput,
ImageMetaDataProvider: imageMetaDataProvider,
Config: cpConfig,
TargetConfig: cfg,
KubevirtInfraConfig: kubevirtInfraConfig,
Manager: mgr,
Namespace: o.Namespace,
HCPName: o.HostedControlPlaneName,
InitialCA: string(o.initialCA),
ClusterSignerCA: string(o.clusterSignerCA),
ControllerFuncs: controllersToRun,
Versions: versions,
PlatformType: hyperv1.PlatformType(o.platformType),
CPCluster: cpCluster,
Logger: ctrl.Log.WithName("hypershift-operator"),
ReleaseProvider: releaseProvider,
KonnectivityAddress: o.KonnectivityAddress,
KonnectivityPort: o.KonnectivityPort,
OAuthAddress: o.OAuthAddress,
OAuthPort: o.OAuthPort,
OperateOnReleaseImage: os.Getenv("OPERATE_ON_RELEASE_IMAGE"),
EnableCIDebugOutput: o.enableCIDebugOutput,
ImageMetaDataProvider: imageMetaDataProvider,
ManagementClusterCapabilities: mgmtClusterCaps,
}
configmetrics.Register(mgr.GetCache())
return operatorConfig.Start(ctx)
Expand Down
8 changes: 6 additions & 2 deletions control-plane-operator/hostedclusterconfigoperator/controllers/resources/resources.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,12 @@ func Setup(ctx context.Context, opts *operator.HostedClusterConfigOperatorConfig
}

// Watch metrics-proxy Route on the control plane cluster for hostname changes.
if err := c.Watch(source.Kind[client.Object](opts.CPCluster.GetCache(), &routev1.Route{}, eventHandler())); err != nil {
return fmt.Errorf("failed to watch Route: %w", err)
// Skip when the management cluster does not expose the route.openshift.io API
// (non-OpenShift management cluster); otherwise the watch fails and HCCO does not start.
if opts.ManagementClusterCapabilities.Has(capabilities.CapabilityRoute) {
if err := c.Watch(source.Kind[client.Object](opts.CPCluster.GetCache(), &routev1.Route{}, eventHandler())); err != nil {
return fmt.Errorf("failed to watch Route: %w", err)
}
}

// Watch HostedControlPlane namespace pull-secret on the control plane cluster so guest pull secrets
Expand Down
47 changes: 24 additions & 23 deletions control-plane-operator/hostedclusterconfigoperator/operator/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,29 +56,30 @@ func cacheLabelSelector() labels.Selector {
type ControllerSetupFunc func(context.Context, *HostedClusterConfigOperatorConfig) error

type HostedClusterConfigOperatorConfig struct {
Manager ctrl.Manager
Config *rest.Config
TargetConfig *rest.Config
KubevirtInfraConfig *rest.Config
TargetCreateOrUpdateProvider upsert.CreateOrUpdateProvider
CPCluster cluster.Cluster
Logger logr.Logger
Versions map[string]string
HCPName string
Namespace string
InitialCA string
ClusterSignerCA string
Controllers []string
PlatformType hyperv1.PlatformType
ControllerFuncs map[string]ControllerSetupFunc
ReleaseProvider releaseinfo.Provider
KonnectivityAddress string
KonnectivityPort int32
OAuthAddress string
OAuthPort int32
OperateOnReleaseImage string
EnableCIDebugOutput bool
ImageMetaDataProvider util.ImageMetadataProvider
Manager ctrl.Manager
Config *rest.Config
TargetConfig *rest.Config
KubevirtInfraConfig *rest.Config
TargetCreateOrUpdateProvider upsert.CreateOrUpdateProvider
CPCluster cluster.Cluster
Logger logr.Logger
Versions map[string]string
HCPName string
Namespace string
InitialCA string
ClusterSignerCA string
Controllers []string
PlatformType hyperv1.PlatformType
ControllerFuncs map[string]ControllerSetupFunc
ReleaseProvider releaseinfo.Provider
KonnectivityAddress string
KonnectivityPort int32
OAuthAddress string
OAuthPort int32
OperateOnReleaseImage string
EnableCIDebugOutput bool
ImageMetaDataProvider util.ImageMetadataProvider
ManagementClusterCapabilities capabilities.CapabiltyChecker

kubeClient kubeclient.Interface
}
Expand Down
Loading