Remove MR health check for ShootSystemComponentsHealthy condition

Gardener now checks all the ManagedResources in the shoot controlplane which does not specify `spec.class`, so these MRs are already covered.
gardener · Mar 2, 2023 · 4544169 · 4544169
1 parent b3b1308
commit 4544169
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 151 deletions.
diff --git a/cmd/gardener-extension-registry-cache/app/app.go b/cmd/gardener-extension-registry-cache/app/app.go
@@ -29,7 +29,6 @@ import (
 
 	registryinstall "github.com/gardener/gardener-extension-registry-cache/pkg/apis/registry/install"
 	"github.com/gardener/gardener-extension-registry-cache/pkg/controller"
-	"github.com/gardener/gardener-extension-registry-cache/pkg/controller/healthcheck"
 )
 
 // NewServiceControllerCommand creates a new command that is used to start the registry service controller.
@@ -87,10 +86,8 @@ func (o *Options) run(ctx context.Context) error {
 	}
 
 	ctrlConfig := o.registryOptions.Completed()
-	ctrlConfig.ApplyHealthCheckConfig(&healthcheck.DefaultAddOptions.HealthCheckConfig)
 	ctrlConfig.Apply(&controller.DefaultAddOptions.Config)
 	o.controllerOptions.Completed().Apply(&controller.DefaultAddOptions.ControllerOptions)
-	o.healthOptions.Completed().Apply(&healthcheck.DefaultAddOptions.Controller)
 	o.reconcileOptions.Completed().Apply(&controller.DefaultAddOptions.IgnoreOperationAnnotation)
 	o.heartbeatOptions.Completed().Apply(&heartbeat.DefaultAddOptions)
 

diff --git a/pkg/cmd/options.go b/pkg/cmd/options.go
@@ -20,7 +20,6 @@ import (
 
 	extensionsapisconfig "github.com/gardener/gardener/extensions/pkg/apis/config"
 	"github.com/gardener/gardener/extensions/pkg/controller/cmd"
-	extensionshealthcheckcontroller "github.com/gardener/gardener/extensions/pkg/controller/healthcheck"
 	extensionsheartbeatcontroller "github.com/gardener/gardener/extensions/pkg/controller/heartbeat"
 	"github.com/spf13/pflag"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -31,7 +30,6 @@ import (
 	"github.com/gardener/gardener-extension-registry-cache/pkg/apis/config/v1alpha1"
 	"github.com/gardener/gardener-extension-registry-cache/pkg/apis/config/validation"
 	"github.com/gardener/gardener-extension-registry-cache/pkg/controller"
-	healthcheckcontroller "github.com/gardener/gardener-extension-registry-cache/pkg/controller/healthcheck"
 )
 
 var (
@@ -104,7 +102,6 @@ func (c *RegistryServiceConfig) Apply(config *configapi.Configuration) {
 func ControllerSwitches() *cmd.SwitchOptions {
 	return cmd.NewSwitchOptions(
 		cmd.Switch(controller.ControllerName, controller.AddToManager),
-		cmd.Switch(extensionshealthcheckcontroller.ControllerName, healthcheckcontroller.AddToManager),
 		cmd.Switch(extensionsheartbeatcontroller.ControllerName, extensionsheartbeatcontroller.AddToManager),
 	)
 }

diff --git a/pkg/controller/healthcheck/add.go b/pkg/controller/healthcheck/add.go
diff --git a/pkg/controller/healthcheck/managed_resource_registries.go b/pkg/controller/healthcheck/managed_resource_registries.go