Skip to content

Commit 2a87f4c

Browse files
Addressing comments on ctx for logger
1 parent e364597 commit 2a87f4c

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

pkg/controllers/raycluster_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ func (r *RayClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request)
103103

104104
isLocalInteractive := annotationBoolVal(logger, &cluster, "sdk.codeflare.dev/local_interactive")
105105
ingressDomain := cluster.ObjectMeta.Annotations["sdk.codeflare.dev/ingress_domain"]
106-
isOpenShift, ingressHost := getClusterType(logger, r.kubeClient, &cluster, ingressDomain)
106+
isOpenShift, ingressHost := getClusterType(ctx, r.kubeClient, &cluster, ingressDomain)
107107

108108
if cluster.ObjectMeta.DeletionTimestamp.IsZero() {
109109
if !controllerutil.ContainsFinalizer(&cluster, oAuthFinalizer) {

pkg/controllers/support.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,9 @@ func getDiscoveryClient(config *rest.Config) (*discovery.DiscoveryClient, error)
127127

128128
// Check where we are running. We are trying to distinguish here whether
129129
// this is vanilla kubernetes cluster or Openshift
130-
func getClusterType(logger logr.Logger, clientset *kubernetes.Clientset, cluster *rayv1.RayCluster, ingressDomain string) (bool, string) {
130+
func getClusterType(ctx context.Context, clientset *kubernetes.Clientset, cluster *rayv1.RayCluster, ingressDomain string) (bool, string) {
131131
// The discovery package is used to discover APIs supported by a Kubernetes API server.
132+
logger := ctrl.LoggerFrom(ctx)
132133
config, err := ctrl.GetConfig()
133134
if err == nil && config != nil {
134135
dclient, err := getDiscoveryClient(config)

0 commit comments

Comments
 (0)