Skip to content

fix: fail fast in case of server version retrieval failure #124

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
merged 1 commit into from
Aug 1, 2025
Merged

fix: fail fast in case of server version retrieval failure #124

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
11 changes: 5 additions & 6 deletions cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import (

"k8s.io/apimachinery/pkg/runtime"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/version"
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/healthz"
Expand Down Expand Up @@ -82,10 +81,10 @@ func main() {

versionInfo, err := clusterInfo.GetClusterVersion()
if err != nil {
setupLog.Error(err, "failed to get cluster version, continuing...")
} else {
setupLog.Info("cluster info", "version", versionInfo.GitVersion)
setupLog.Error(err, "failed to get cluster version")
os.Exit(1)
}
setupLog.Info("cluster info", "version", versionInfo.GitVersion)

podLevelResourcesEnabled := false
if cfg.ValidateFeatureEnabled {
Expand Down Expand Up @@ -138,7 +137,7 @@ func main() {

boostMgr := boost.NewManager(mgr.GetClient())
controllersReady := make(chan struct{})
go setupControllers(mgr, boostMgr, cfg, podLevelResourcesEnabled, versionInfo, certsReady,
go setupControllers(mgr, boostMgr, cfg, podLevelResourcesEnabled, versionInfo.GitVersion, certsReady,
controllersReady)
if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
setupLog.Error(err, "unable to set up health check")
Expand All @@ -159,7 +158,7 @@ func main() {
}

func setupControllers(mgr ctrl.Manager, boostMgr boost.Manager, cfg *config.Config,
podLevelResourcesEnabled bool, serverVersion *version.Info, certsReady chan struct{},
podLevelResourcesEnabled bool, serverVersion string, certsReady chan struct{},
controllersReady chan struct{}) {
defer close(controllersReady)
setupLog.Info("Waiting for certificate generation to complete")
Expand Down
6 changes: 3 additions & 3 deletions internal/controller/boost_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ func (r *StartupCPUBoostReconciler) Reconcile(ctx context.Context, req ctrl.Requ

// SetupWithManager sets up the controller with the Manager.
func (r *StartupCPUBoostReconciler) SetupWithManager(mgr ctrl.Manager,
serverVersion *version.Info) error {
serverVersion string) error {
boostPodHandler := NewBoostPodHandler(r.Manager, ctrl.Log.WithName("pod-handler"))
lsPredicate, err := predicate.LabelSelectorPredicate(*boostPodHandler.GetPodLabelSelector())
if err != nil {
Expand Down Expand Up @@ -174,7 +174,7 @@ func (r *StartupCPUBoostReconciler) Generic(e event.GenericEvent) bool {

// shouldUseLegacyRevertMode determines if legacy resource revert mode should be used
// basing on server version
func shouldUseLegacyRevertMode(serverVersion *version.Info) (legacyMode bool) {
func shouldUseLegacyRevertMode(serverVersion string) (legacyMode bool) {
return version.CompareKubeAwareVersionStrings(WantedServerVersionForNewRevert,
serverVersion.GitVersion) < 0
serverVersion) < 0
}
11 changes: 3 additions & 8 deletions internal/controller/boost_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/version"
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/cache/informertest"
Expand Down Expand Up @@ -62,7 +61,7 @@ var _ = Describe("BoostController", func() {
Describe("Setups with manager", func() {
var (
mockCtrlManager *mock.MockCtrlManager
serverVersion *version.Info
serverVersion string
err error
)
BeforeEach(func() {
Expand All @@ -83,9 +82,7 @@ var _ = Describe("BoostController", func() {
})
When("server version is newer or equal to 1.32.0", func() {
BeforeEach(func() {
serverVersion = &version.Info{
GitVersion: "v1.32.0",
}
serverVersion = "v1.32.0"
})
It("doesn't error", func() {
Expect(err).NotTo(HaveOccurred())
Expand All @@ -96,9 +93,7 @@ var _ = Describe("BoostController", func() {
})
When("server version is less than 1.32.0", func() {
BeforeEach(func() {
serverVersion = &version.Info{
GitVersion: "v1.29.2",
}
serverVersion = "v1.29.2"
})
It("doesn't error", func() {
Expect(err).NotTo(HaveOccurred())
Expand Down