Merge pull request #7259 from k0sproject/backport-7252-to-release-1.34

[Backport release-1.34] Remove retry cap when waiting for Helm CRDs

Author: twz123

go.mod

@@ -57,6 +57,7 @@ require (
 	golang.org/x/sync v0.19.0
 	golang.org/x/sys v0.40.0
 	golang.org/x/text v0.33.0
+	golang.org/x/time v0.12.0
 	golang.org/x/tools v0.40.0
 	google.golang.org/grpc v1.76.0
 	helm.sh/helm/v3 v3.19.3
@@ -258,7 +259,6 @@ require (
 	golang.org/x/net v0.48.0 // indirect
 	golang.org/x/oauth2 v0.30.0 // indirect
 	golang.org/x/term v0.39.0 // indirect
-	golang.org/x/time v0.12.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
 	google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20250804133106-a7a43d27e69b // indirect

pkg/component/controller/extensions_controller.go

@@ -15,7 +15,6 @@ import (
 	"slices"
 	"time"
 
-	"github.com/avast/retry-go"
 	"github.com/bombsimon/logrusr/v4"
 	"github.com/k0sproject/k0s/internal/pkg/templatewriter"
 	helmv1beta1 "github.com/k0sproject/k0s/pkg/apis/helm/v1beta1"
@@ -28,9 +27,11 @@ import (
 	kubeutil "github.com/k0sproject/k0s/pkg/kubernetes"
 	"github.com/k0sproject/k0s/pkg/leaderelection"
 	"github.com/sirupsen/logrus"
+	"golang.org/x/time/rate"
 	"helm.sh/helm/v3/pkg/release"
 	"helm.sh/helm/v3/pkg/storage/driver"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/tools/clientcmd"
@@ -414,10 +415,6 @@ func (ec *ExtensionsController) instantiateManager(ctx context.Context) (crman.M
 	if err != nil {
 		return nil, fmt.Errorf("can't build controller-runtime controller for helm extensions: %w", err)
 	}
-	gk := schema.GroupKind{
-		Group: helmv1beta1.GroupName,
-		Kind:  "Chart",
-	}
 
 	mgr, err := controllerruntime.NewManager(clientConfig, crman.Options{
 		Scheme: k0sscheme.Scheme,
@@ -430,16 +427,27 @@ func (ec *ExtensionsController) instantiateManager(ctx context.Context) (crman.M
 	if err != nil {
 		return nil, fmt.Errorf("can't build controller-runtime controller for helm extensions: %w", err)
 	}
-	if err := retry.Do(func() error {
-		_, err := mgr.GetRESTMapper().RESTMapping(gk)
-		if err != nil {
-			ec.L.Warn("Extensions CRD is not yet ready, waiting before starting ExtensionsController")
-			return err
+
+	for chart, sometimes := (schema.GroupKind{Group: helmv1beta1.GroupName, Kind: "Chart"}), (&rate.Sometimes{Every: 5}); ; {
+		_, err := mgr.GetRESTMapper().RESTMapping(chart)
+		if err == nil {
+			ec.L.Info(chart, " CRD is ready, going nuts")
+			break
+		}
+
+		sometimes.Do(func() {
+			if meta.IsNoMatchError(err) {
+				ec.L.Warn(chart, " CRD is not yet ready, waiting before starting ExtensionsController")
+			} else {
+				ec.L.WithError(err).Error("Failed to check for ", chart, " CRD readiness")
+			}
+		})
+
+		select {
+		case <-time.After(2 * time.Second):
+		case <-ctx.Done():
+			return nil, fmt.Errorf("while waiting for %s CRD: %w (last error: %w)", chart, context.Cause(ctx), err)
 		}
-		ec.L.Info("Extensions CRD is ready, going nuts")
-		return nil
-	}, retry.Context(ctx)); err != nil {
-		return nil, fmt.Errorf("can't start ExtensionsReconciler, helm CRD is not registered, check CRD registration reconciler: %w", err)
 	}
 
 	if err := builder.