Skip to content

Commit

Permalink
Address PR review feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
@shafeeqes
shafeeqes committed Dec 21, 2022
1 parent a290705 commit dba8c9b
Show file tree
Hide file tree
Showing 14 changed files with 40 additions and 46 deletions.
4 changes: 2 additions & 2 deletions cmd/gardener-controller-manager/app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"k8s.io/klog/v2"
"k8s.io/utils/pointer"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/config/v1alpha1"
controllerconfigv1alpha1 "sigs.k8s.io/controller-runtime/pkg/config/v1alpha1"
"sigs.k8s.io/controller-runtime/pkg/healthz"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/manager"
Expand Down Expand Up @@ -139,7 +139,7 @@ func run(ctx context.Context, log logr.Logger, cfg *config.ControllerManagerConf
LeaseDuration: &cfg.LeaderElection.LeaseDuration.Duration,
RenewDeadline: &cfg.LeaderElection.RenewDeadline.Duration,
RetryPeriod: &cfg.LeaderElection.RetryPeriod.Duration,
Controller: v1alpha1.ControllerConfigurationSpec{
Controller: controllerconfigv1alpha1.ControllerConfigurationSpec{
RecoverPanic: pointer.Bool(true),
},
})
Expand Down
4 changes: 2 additions & 2 deletions cmd/gardener-operator/app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
"k8s.io/utils/clock"
"k8s.io/utils/pointer"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/config/v1alpha1"
controllerconfigv1alpha1 "sigs.k8s.io/controller-runtime/pkg/config/v1alpha1"
"sigs.k8s.io/controller-runtime/pkg/healthz"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/manager"
Expand Down Expand Up @@ -140,7 +140,7 @@ func run(ctx context.Context, log logr.Logger, cfg *config.OperatorConfiguration
LeaseDuration: &cfg.LeaderElection.LeaseDuration.Duration,
RenewDeadline: &cfg.LeaderElection.RenewDeadline.Duration,
RetryPeriod: &cfg.LeaderElection.RetryPeriod.Duration,
Controller: v1alpha1.ControllerConfigurationSpec{
Controller: controllerconfigv1alpha1.ControllerConfigurationSpec{
RecoverPanic: pointer.Bool(true),
},
})
Expand Down
4 changes: 2 additions & 2 deletions cmd/gardener-resource-manager/app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
"sigs.k8s.io/controller-runtime/pkg/cluster"
"sigs.k8s.io/controller-runtime/pkg/config/v1alpha1"
controllerconfigv1alpha1 "sigs.k8s.io/controller-runtime/pkg/config/v1alpha1"
"sigs.k8s.io/controller-runtime/pkg/healthz"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/manager"
Expand Down Expand Up @@ -158,7 +158,7 @@ func run(ctx context.Context, log logr.Logger, cfg *config.ResourceManagerConfig
LeaseDuration: &cfg.LeaderElection.LeaseDuration.Duration,
RenewDeadline: &cfg.LeaderElection.RenewDeadline.Duration,
RetryPeriod: &cfg.LeaderElection.RetryPeriod.Duration,
Controller: v1alpha1.ControllerConfigurationSpec{
Controller: controllerconfigv1alpha1.ControllerConfigurationSpec{
RecoverPanic: pointer.Bool(true),
},
})
Expand Down
4 changes: 2 additions & 2 deletions cmd/gardener-scheduler/app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"k8s.io/component-base/version/verflag"
"k8s.io/klog/v2"
"k8s.io/utils/pointer"
"sigs.k8s.io/controller-runtime/pkg/config/v1alpha1"
controllerconfigv1alpha1 "sigs.k8s.io/controller-runtime/pkg/config/v1alpha1"
"sigs.k8s.io/controller-runtime/pkg/healthz"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/manager"
Expand Down Expand Up @@ -126,7 +126,7 @@ func run(ctx context.Context, log logr.Logger, cfg *config.SchedulerConfiguratio
LeaseDuration: &cfg.LeaderElection.LeaseDuration.Duration,
RenewDeadline: &cfg.LeaderElection.RenewDeadline.Duration,
RetryPeriod: &cfg.LeaderElection.RetryPeriod.Duration,
Controller: v1alpha1.ControllerConfigurationSpec{
Controller: controllerconfigv1alpha1.ControllerConfigurationSpec{
RecoverPanic: pointer.Bool(true),
},
})
Expand Down
4 changes: 2 additions & 2 deletions cmd/gardenlet/app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/cache"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/cluster"
"sigs.k8s.io/controller-runtime/pkg/config/v1alpha1"
controllerconfigv1alpha1 "sigs.k8s.io/controller-runtime/pkg/config/v1alpha1"
"sigs.k8s.io/controller-runtime/pkg/healthz"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/manager"
Expand Down Expand Up @@ -166,7 +166,7 @@ func run(ctx context.Context, cancel context.CancelFunc, log logr.Logger, cfg *c
LeaseDuration: &cfg.LeaderElection.LeaseDuration.Duration,
RenewDeadline: &cfg.LeaderElection.RenewDeadline.Duration,
RetryPeriod: &cfg.LeaderElection.RetryPeriod.Duration,
Controller: v1alpha1.ControllerConfigurationSpec{
Controller: controllerconfigv1alpha1.ControllerConfigurationSpec{
RecoverPanic: pointer.Bool(true),
},

Expand Down
4 changes: 2 additions & 2 deletions extensions/pkg/controller/cmd/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
"k8s.io/client-go/tools/leaderelection/resourcelock"
"sigs.k8s.io/controller-runtime/pkg/config/v1alpha1"
controllerconfigv1alpha1 "sigs.k8s.io/controller-runtime/pkg/config/v1alpha1"
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/manager"

Expand Down Expand Up @@ -302,7 +302,7 @@ func (c *ManagerConfig) Apply(opts *manager.Options) {
opts.MetricsBindAddress = c.MetricsBindAddress
opts.HealthProbeBindAddress = c.HealthBindAddress
opts.Logger = c.Logger
opts.Controller = v1alpha1.ControllerConfigurationSpec{RecoverPanic: c.RecoverPanic}
opts.Controller = controllerconfigv1alpha1.ControllerConfigurationSpec{RecoverPanic: c.RecoverPanic}
}

// Options initializes empty manager.Options, applies the set values and returns it.
Expand Down
4 changes: 2 additions & 2 deletions extensions/pkg/controller/cmd/options_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
"k8s.io/utils/pointer"
"sigs.k8s.io/controller-runtime/pkg/config/v1alpha1"
controllerconfigv1alpha1 "sigs.k8s.io/controller-runtime/pkg/config/v1alpha1"
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/manager"
)
Expand Down Expand Up @@ -613,7 +613,7 @@ var _ = Describe("Options", func() {
LeaderElectionResourceLock: leaderElectionResourceLock,
LeaderElectionID: leaderElectionID,
LeaderElectionNamespace: leaderElectionNamespace,
Controller: v1alpha1.ControllerConfigurationSpec{
Controller: controllerconfigv1alpha1.ControllerConfigurationSpec{
RecoverPanic: pointer.Bool(true),
},
}))
Expand Down
3 changes: 1 addition & 2 deletions pkg/admissioncontroller/webhook/auth/seed/graph/graph.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,7 @@ func (g *graph) Setup(ctx context.Context, c cache.Cache) error {
if err != nil {
return err
}
err = resource.setupFn(ctx, informer)
if err != nil {
if err := resource.setupFn(ctx, informer); err != nil {
return err
}
}
Expand Down
44 changes: 21 additions & 23 deletions pkg/api/indexer/core.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,34 +25,32 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
)

var (
// ProjectNamespaceIndexerFunc extracts the .spec.namespace field of a Project.
ProjectNamespaceIndexerFunc = func(obj client.Object) []string {
project, ok := obj.(*gardencorev1beta1.Project)
if !ok {
return []string{""}
}
return []string{pointer.StringDeref(project.Spec.Namespace, "")}
// ProjectNamespaceIndexerFunc extracts the .spec.namespace field of a Project.
func ProjectNamespaceIndexerFunc(obj client.Object) []string {
project, ok := obj.(*gardencorev1beta1.Project)
if !ok {
return []string{""}
}
return []string{pointer.StringDeref(project.Spec.Namespace, "")}
}

// BackupBucketSeedNameIndexerFunc extracts the .spec.seedName field of a BackupBucket.
BackupBucketSeedNameIndexerFunc = func(obj client.Object) []string {
backupBucket, ok := obj.(*gardencorev1beta1.BackupBucket)
if !ok {
return []string{""}
}
return []string{pointer.StringDeref(backupBucket.Spec.SeedName, "")}
// BackupBucketSeedNameIndexerFunc extracts the .spec.seedName field of a BackupBucket.
func BackupBucketSeedNameIndexerFunc(obj client.Object) []string {
backupBucket, ok := obj.(*gardencorev1beta1.BackupBucket)
if !ok {
return []string{""}
}
return []string{pointer.StringDeref(backupBucket.Spec.SeedName, "")}
}

// ControllerInstallationSeedRefNameIndexerFunc extracts the .spec.seedRef.name field of a ControllerInstallation.
ControllerInstallationSeedRefNameIndexerFunc = func(obj client.Object) []string {
controllerInstallation, ok := obj.(*gardencorev1beta1.ControllerInstallation)
if !ok {
return []string{""}
}
return []string{controllerInstallation.Spec.SeedRef.Name}
// ControllerInstallationSeedRefNameIndexerFunc extracts the .spec.seedRef.name field of a ControllerInstallation.
func ControllerInstallationSeedRefNameIndexerFunc(obj client.Object) []string {
controllerInstallation, ok := obj.(*gardencorev1beta1.ControllerInstallation)
if !ok {
return []string{""}
}
)
return []string{controllerInstallation.Spec.SeedRef.Name}
}

// AddProjectNamespace adds an index for core.ProjectNamespace to the given indexer.
func AddProjectNamespace(ctx context.Context, indexer client.FieldIndexer) error {
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/indexer/operations.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
)

// BastionShootNameIndexerFunc extracts the .spec.shootRef.name field of a Bastion.
var BastionShootNameIndexerFunc = func(obj client.Object) []string {
func BastionShootNameIndexerFunc(obj client.Object) []string {
bastion, ok := obj.(*operationsv1alpha1.Bastion)
if !ok {
return []string{""}
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/indexer/seedmanagement.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
)

// ManagedSeedShootNameIndexerFunc extracts the .spec.shoot.name field of a ManagedSeed.
var ManagedSeedShootNameIndexerFunc = func(obj client.Object) []string {
func ManagedSeedShootNameIndexerFunc(obj client.Object) []string {
managedSeed, ok := obj.(*seedmanagementv1alpha1.ManagedSeed)
if !ok {
return []string{""}
Expand Down
2 changes: 1 addition & 1 deletion test/integration/resourcemanager/garbagecollector/garbagecollector_suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ var _ = BeforeSuite(func() {
Clock: clock.RealClock{},
MinimumObjectLifetime: pointer.Duration(0),
// Use the same version as the envtest package
TargetKubernetesVersion: semver.MustParse("1.25.0"),
TargetKubernetesVersion: semver.MustParse("1.26.0"),
}).AddToManager(mgr, mgr)).To(Succeed())

By("starting manager")
Expand Down
2 changes: 1 addition & 1 deletion test/integration/resourcemanager/highavailabilityconfig/highavailabilityconfig_suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ var _ = BeforeSuite(func() {
Logger: log,
TargetClient: testClient,
// Use the same version as the envtest package
TargetVersion: semver.MustParse("1.25.0"),
TargetVersion: semver.MustParse("1.26.0"),
}).AddToManager(mgr)).To(Succeed())

By("starting manager")
Expand Down
3 changes: 0 additions & 3 deletions test/utils/shoots/access/adminkubeconfig.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ func CreateShootClientFromAdminKubeconfig(ctx context.Context, gardenClient kube
if err := gardenClient.Client().SubResource("adminkubeconfig").Create(ctx, shoot, adminKubeconfigRequest); err != nil {
return nil, err
}
if err := gardenClient.Client().SubResource("adminkubeconfig").Get(ctx, shoot, adminKubeconfigRequest); err != nil {
return nil, err
}

return kubernetes.NewClientFromBytes(adminKubeconfigRequest.Status.Kubeconfig, kubernetes.WithDisabledCachedClient())
}

0 comments on commit dba8c9b

Please sign in to comment.