adapt to Gardener upstream changes

gardener · Jan 30, 2025 · 471dbc5 · 471dbc5
1 parent 0da27e4
commit 471dbc5
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 16 deletions.
diff --git a/cmd/gardener-extension-runtime-gvisor/app/app.go b/cmd/gardener-extension-runtime-gvisor/app/app.go
@@ -109,7 +109,7 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command {
 				return fmt.Errorf("could not add controllers to manager: %w", err)
 			}
 
-			if err := healthcheck.AddToManager(ctx, mgr); err != nil {
+			if err := healthcheck.AddToManager(mgr); err != nil {
 				return fmt.Errorf("could not add health check controller to manager: %w", err)
 			}
 

diff --git a/pkg/apis/config/types_client.go b/pkg/apis/config/types_client.go
@@ -5,7 +5,7 @@
 package config
 
 import (
-	healthcheckconfig "github.com/gardener/gardener/extensions/pkg/apis/config"
+	healthcheckconfig "github.com/gardener/gardener/extensions/pkg/apis/config/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	componentbaseconfig "k8s.io/component-base/config"
 )

diff --git a/pkg/apis/config/v1alpha1/zz_generated.conversion.go b/pkg/apis/config/v1alpha1/zz_generated.conversion.go
diff --git a/pkg/apis/config/zz_generated.deepcopy.go b/pkg/apis/config/zz_generated.deepcopy.go
diff --git a/pkg/cmd/config.go b/pkg/cmd/config.go
@@ -7,7 +7,7 @@ package cmd
 import (
 	"fmt"
 
-	healthcheckconfig "github.com/gardener/gardener/extensions/pkg/apis/config"
+	healthcheckconfig "github.com/gardener/gardener/extensions/pkg/apis/config/v1alpha1"
 	"github.com/spf13/pflag"
 
 	"github.com/gardener/gardener-extension-runtime-gvisor/pkg/apis/config"

diff --git a/pkg/controller/add.go b/pkg/controller/add.go
@@ -38,7 +38,7 @@ func AddToManagerWithOptions(ctx context.Context, mgr manager.Manager, opts AddO
 		return err
 	}
 
-	return containerruntime.Add(ctx, mgr, containerruntime.AddArgs{
+	return containerruntime.Add(mgr, containerruntime.AddArgs{
 		Actuator:                  NewActuator(mgr.GetClient(), extensioncontroller.ChartRendererFactoryFunc(util.NewChartRendererForShoot)),
 		ControllerOptions:         opts.Controller,
 		Predicates:                containerruntime.DefaultPredicates(ctx, mgr, opts.IgnoreOperationAnnotation),

diff --git a/pkg/healthcheck/add.go b/pkg/healthcheck/add.go
@@ -5,10 +5,9 @@
 package healthcheck
 
 import (
-	"context"
 	"time"
 
-	healthcheckconfig "github.com/gardener/gardener/extensions/pkg/apis/config"
+	healthcheckconfig "github.com/gardener/gardener/extensions/pkg/apis/config/v1alpha1"
 	"github.com/gardener/gardener/extensions/pkg/controller/healthcheck"
 	gardencorev1beta1 "github.com/gardener/gardener/pkg/apis/core/v1beta1"
 	extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1"
@@ -30,9 +29,8 @@ var (
 
 // RegisterHealthChecks adds a controller with the given Options to the manager.
 // The opts.Reconciler is being set with a newly instantiated Actuator.
-func RegisterHealthChecks(ctx context.Context, mgr manager.Manager, opts healthcheck.DefaultAddArgs) error {
+func RegisterHealthChecks(mgr manager.Manager, opts healthcheck.DefaultAddArgs) error {
 	return healthcheck.DefaultRegistration(
-		ctx,
 		gvisor.Type,
 		extensionsv1alpha1.SchemeGroupVersion.WithKind(extensionsv1alpha1.ContainerRuntimeResource),
 		func() client.ObjectList { return &extensionsv1alpha1.ContainerRuntimeList{} },
@@ -46,6 +44,6 @@ func RegisterHealthChecks(ctx context.Context, mgr manager.Manager, opts healthc
 }
 
 // AddToManager adds a controller with the default Options.
-func AddToManager(ctx context.Context, mgr manager.Manager) error {
-	return RegisterHealthChecks(ctx, mgr, AddOptions)
+func AddToManager(mgr manager.Manager) error {
+	return RegisterHealthChecks(mgr, AddOptions)
 }
diff --git a/test/integration/container-runtime/container_runtime.go b/test/integration/container-runtime/container_runtime.go
@@ -14,6 +14,7 @@ import (
 
 	gardencorev1beta1 "github.com/gardener/gardener/pkg/apis/core/v1beta1"
 	extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1"
+	kubernetesclient "github.com/gardener/gardener/pkg/client/kubernetes"
 	"github.com/gardener/gardener/pkg/utils"
 	"github.com/gardener/gardener/test/framework"
 	"github.com/onsi/ginkgo/v2"
@@ -104,13 +105,18 @@ var _ = ginkgo.Describe("gVisor tests", func() {
 		g.Expect(err).ToNot(g.HaveOccurred())
 
 		// check kernel startup logs
-		reader, err := framework.NewPodExecutor(f.ShootClient).Execute(ctx, gVisorPod.Namespace, gVisorPod.Name, gVisorPod.Spec.Containers[0].Name, "dmesg | grep -i -c gVisor")
+		//stdout, stderr, err := kubernetesclient.NewPodExecutor(f.ShootClient).Execute(ctx, gVisorPod.Namespace, gVisorPod.Name, gVisorPod.Spec.Containers[0].Name, "dmesg | grep -i -c gVisor")
+		stdout, stderr, err := kubernetesclient.NewPodExecutor(f.ShootClient.RESTConfig()).Execute(ctx, gVisorPod.Namespace, gVisorPod.Name, gVisorPod.Spec.Containers[0].Name, "dmesg | grep -i -c gVisor")
 		g.Expect(err).ToNot(g.HaveOccurred())
 
-		response, err := io.ReadAll(reader)
+		response, err := io.ReadAll(stdout)
+		g.Expect(err).ToNot(g.HaveOccurred())
+		errorResponse, err := io.ReadAll(stderr)
 		g.Expect(err).ToNot(g.HaveOccurred())
 		g.Expect(response).ToNot(g.BeNil())
+		g.Expect(errorResponse).ToNot(g.BeNil())
 		g.Expect(string(response)).To(g.Equal(fmt.Sprintf("%s\n", "1")))
+		g.Expect(string(errorResponse)).To(g.Equal(fmt.Sprintf("%s\n", "1")))
 
 		ginkgo.By("test removal of gVisor from worker pool")
 		// remove gVisor from the worker pool and wait for the Shoot to be successfully reconciled.