Cleanup

Signed-off-by: Tamal Saha <[email protected]>

Author: tamalsaha

.config/api-rules/violation_exceptions.list

@@ -6,6 +6,9 @@ API rule violation: list_type_missing,kmodules.xyz/client-go/api/v1,CertificateS
 API rule violation: list_type_missing,kmodules.xyz/client-go/api/v1,CertificateSpec,EmailAddresses
 API rule violation: list_type_missing,kmodules.xyz/client-go/api/v1,CertificateSpec,IPAddresses
 API rule violation: list_type_missing,kmodules.xyz/client-go/api/v1,CertificateSpec,URIs
+API rule violation: list_type_missing,kmodules.xyz/client-go/api/v1,ClusterClaimFeatures,DisabledFeatures
+API rule violation: list_type_missing,kmodules.xyz/client-go/api/v1,ClusterClaimFeatures,EnabledFeatures
+API rule violation: list_type_missing,kmodules.xyz/client-go/api/v1,ClusterClaimFeatures,ExternallyManagedFeatures
 API rule violation: list_type_missing,kmodules.xyz/client-go/api/v1,ClusterInfo,ClusterManagers
 API rule violation: list_type_missing,kmodules.xyz/client-go/api/v1,ImageInfo,Lineages
 API rule violation: list_type_missing,kmodules.xyz/client-go/api/v1,Lineage,Chain

apis/supervisor/v1alpha1/openapi_generated.go

@@ -20,7 +20,7 @@ require (
 	k8s.io/client-go v0.32.3
 	k8s.io/klog/v2 v2.130.1
 	k8s.io/kube-openapi v0.0.0-20250304201544-e5f78fe3ede9
-	kmodules.xyz/client-go v0.32.0
+	kmodules.xyz/client-go v0.32.1
 	kmodules.xyz/crd-schema-fuzz v0.32.0
 	kubedb.dev/apimachinery v0.52.1-0.20250318023929-051711da2e5d
 	sigs.k8s.io/controller-runtime v0.20.2

go.mod

@@ -633,8 +633,8 @@ k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJ
 k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 kmodules.xyz/apiversion v0.2.0 h1:vAQYqZFm4xu4pbB1cAdHbFEPES6EQkcR4wc06xdTOWk=
 kmodules.xyz/apiversion v0.2.0/go.mod h1:oPX8g8LvlPdPX3Yc5YvCzJHQnw3YF/X4/jdW0b1am80=
-kmodules.xyz/client-go v0.32.0 h1:9KMvG9bKOTiKaDDUniCaxJTdnEwULxi8YLlHJP9spNQ=
-kmodules.xyz/client-go v0.32.0/go.mod h1:tqe40/iDtO/RSNaDJs/a+rgnMPSOcK622HpOmOFvcds=
+kmodules.xyz/client-go v0.32.1 h1:W8TWGBBaokQEqfesbdhlRFMMV0TChcRbMRQ0eTIRS88=
+kmodules.xyz/client-go v0.32.1/go.mod h1:tqe40/iDtO/RSNaDJs/a+rgnMPSOcK622HpOmOFvcds=
 kmodules.xyz/crd-schema-fuzz v0.32.0 h1:VATOsnCwmm7SrgnsBWqzcVx+C14l6rNREWrs1leBWaI=
 kmodules.xyz/crd-schema-fuzz v0.32.0/go.mod h1:Fh2q+q60ZoQ6NQX0CWtZuXmu+Lnu8o1HofTaBBX7wYk=
 kmodules.xyz/custom-resources v0.30.2-0.20250303080226-05eb1392c05f h1:JLpRh71RC/o6tsqyNJuaHCML/wD218G8Hh2dNm77DPU=

go.sum

@@ -74,12 +74,12 @@ func NewCmdRun() *cobra.Command {
 		secureMetrics        bool   = true
 		enableHTTP2          bool   = false
 
-		ResyncPeriod           time.Duration = 10 * time.Minute
-		MaxConcurrentReconcile int           // NumThreads = 2
-		RequeueAfterDuration   time.Duration
-		MaxRetryOnFailure      int // MaxNumRequeues = 5
-		RetryAfterDuration     time.Duration
-		BeforeDeadlineDuration time.Duration
+		resyncPeriod               = 10 * time.Minute
+		maxConcurrentReconcile int // NumThreads = 2
+		requeueAfterDuration   time.Duration
+		maxRetryOnFailure      int // MaxNumRequeues = 5
+		retryAfterDuration     time.Duration
+		beforeDeadlineDuration time.Duration
 	)
 	cmd := &cobra.Command{
 		Use:               "run",
@@ -181,7 +181,7 @@ func NewCmdRun() *cobra.Command {
 				// after the manager stops then its usage might be unsafe.
 				// LeaderElectionReleaseOnCancel: true,
 				Cache: cache.Options{
-					SyncPeriod: &ResyncPeriod,
+					SyncPeriod: &resyncPeriod,
 				},
 				NewClient: cu.NewClient,
 			})
@@ -213,15 +213,15 @@ func NewCmdRun() *cobra.Command {
 			}
 
 			recommendationControllerOpts := controller.Options{
-				MaxConcurrentReconciles: MaxConcurrentReconcile,
+				MaxConcurrentReconciles: maxConcurrentReconcile,
 			}
 			if err = (&supervisorcontrollers.RecommendationReconciler{
 				Client:                 mgr.GetClient(),
 				Scheme:                 mgr.GetScheme(),
 				Mutex:                  &sync.Mutex{},
-				RequeueAfterDuration:   RequeueAfterDuration,
-				RetryAfterDuration:     RetryAfterDuration,
-				BeforeDeadlineDuration: BeforeDeadlineDuration,
+				RequeueAfterDuration:   requeueAfterDuration,
+				RetryAfterDuration:     retryAfterDuration,
+				BeforeDeadlineDuration: beforeDeadlineDuration,
 				Clock:                  api.GetClock(),
 			}).SetupWithManager(mgr, recommendationControllerOpts); err != nil {
 				setupLog.Error(err, "unable to create controller", "controller", "Recommendation")
@@ -304,12 +304,12 @@ func NewCmdRun() *cobra.Command {
 	cmd.Flags().BoolVar(&enableHTTP2, "enable-http2", enableHTTP2,
 		"If set, HTTP/2 will be enabled for the metrics and webhook servers")
 
-	cmd.Flags().DurationVar(&ResyncPeriod, "resync-period", ResyncPeriod, "If non-zero, will re-list this often. Otherwise, re-list will be delayed aslong as possible (until the upstream source closes the watch or times out.")
-	cmd.Flags().IntVar(&MaxConcurrentReconcile, "max-concurrent-reconcile", MaxConcurrentReconcile, "Maximum number of Recommendation object that will be reconciled concurrently")
-	cmd.Flags().DurationVar(&RequeueAfterDuration, "requeue-after-duration", RequeueAfterDuration, "Duration after the Recommendation object will be requeue when it is waiting for MaintenanceWindow. The flag accepts a value acceptable to time.ParseDuration. Ref: https://pkg.go.dev/time#ParseDuration")
-	cmd.Flags().IntVar(&MaxRetryOnFailure, "max-retry-on-failure", MaxRetryOnFailure, "Maximum number of retry on any kind of failure in Recommendation execution")
-	cmd.Flags().DurationVar(&RetryAfterDuration, "retry-after-duration", RetryAfterDuration, "Duration after the failure events will be requeue again. The flag accepts a value acceptable to time.ParseDuration. Ref: https://pkg.go.dev/time#ParseDuration")
-	cmd.Flags().DurationVar(&BeforeDeadlineDuration, "before-deadline-duration", BeforeDeadlineDuration, "When there is less time than `BeforeDeadlineDuration` before deadline, Recommendations are free to execute regardless of Parallelism")
+	cmd.Flags().DurationVar(&resyncPeriod, "resync-period", resyncPeriod, "If non-zero, will re-list this often. Otherwise, re-list will be delayed aslong as possible (until the upstream source closes the watch or times out.")
+	cmd.Flags().IntVar(&maxConcurrentReconcile, "max-concurrent-reconcile", maxConcurrentReconcile, "Maximum number of Recommendation object that will be reconciled concurrently")
+	cmd.Flags().DurationVar(&requeueAfterDuration, "requeue-after-duration", requeueAfterDuration, "Duration after the Recommendation object will be requeue when it is waiting for MaintenanceWindow. The flag accepts a value acceptable to time.ParseDuration. Ref: https://pkg.go.dev/time#ParseDuration")
+	cmd.Flags().IntVar(&maxRetryOnFailure, "max-retry-on-failure", maxRetryOnFailure, "Maximum number of retry on any kind of failure in Recommendation execution")
+	cmd.Flags().DurationVar(&retryAfterDuration, "retry-after-duration", retryAfterDuration, "Duration after the failure events will be requeue again. The flag accepts a value acceptable to time.ParseDuration. Ref: https://pkg.go.dev/time#ParseDuration")
+	cmd.Flags().DurationVar(&beforeDeadlineDuration, "before-deadline-duration", beforeDeadlineDuration, "When there is less time than `BeforeDeadlineDuration` before deadline, Recommendations are free to execute regardless of Parallelism")
 
 	return cmd
 }

pkg/cmds/run.go

@@ -24,6 +24,7 @@ import (
 	kmapi "kmodules.xyz/client-go/api/v1"
 
 	core "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -47,7 +48,9 @@ func IsOpenClusterSpoke(kc client.Reader) bool {
 	list.SetKind("Klusterlet")
 	err := kc.List(context.TODO(), &list)
 	if err != nil {
-		panic(err)
+		if !meta.IsNoMatchError(err) && !apierrors.IsNotFound(err) {
+			panic(err) // panic if 403 (missing rbac)
+		}
 	}
 	return len(list.Items) > 0
 }

vendor/kmodules.xyz/client-go/cluster/ocm.go

@@ -1164,7 +1164,7 @@ k8s.io/utils/trace
 # kmodules.xyz/apiversion v0.2.0
 ## explicit; go 1.14
 kmodules.xyz/apiversion
-# kmodules.xyz/client-go v0.32.0
+# kmodules.xyz/client-go v0.32.1
 ## explicit; go 1.23.0
 kmodules.xyz/client-go
 kmodules.xyz/client-go/api/v1