diff --git a/cmd/gardener-extension-provider-ironcore/app/app.go b/cmd/gardener-extension-provider-ironcore/app/app.go index ca2a72b5..85b429e4 100644 --- a/cmd/gardener-extension-provider-ironcore/app/app.go +++ b/cmd/gardener-extension-provider-ironcore/app/app.go @@ -214,11 +214,11 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command { bastionCtrlOpts.Completed().Apply(&bastioncontroller.DefaultAddOptions.Controller) backupBucketCtrlOpts.Completed().Apply(&backupbucketcontroller.DefaultAddOptions.Controller) backupEntryCtrlOpts.Completed().Apply(&backupentrycontroller.DefaultAddOptions.Controller) - reconcileOpts.Completed().Apply(&bastioncontroller.DefaultAddOptions.IgnoreOperationAnnotation, nil) - reconcileOpts.Completed().Apply(&infrastructurecontroller.DefaultAddOptions.IgnoreOperationAnnotation, nil) - reconcileOpts.Completed().Apply(&workercontroller.DefaultAddOptions.IgnoreOperationAnnotation, nil) - reconcileOpts.Completed().Apply(&backupbucketcontroller.DefaultAddOptions.IgnoreOperationAnnotation, nil) - reconcileOpts.Completed().Apply(&backupentrycontroller.DefaultAddOptions.IgnoreOperationAnnotation, nil) + reconcileOpts.Completed().Apply(&bastioncontroller.DefaultAddOptions.IgnoreOperationAnnotation, &bastioncontroller.DefaultAddOptions.ExtensionClass) + reconcileOpts.Completed().Apply(&infrastructurecontroller.DefaultAddOptions.IgnoreOperationAnnotation, &infrastructurecontroller.DefaultAddOptions.ExtensionClass) + reconcileOpts.Completed().Apply(&workercontroller.DefaultAddOptions.IgnoreOperationAnnotation, &workercontroller.DefaultAddOptions.ExtensionClass) + reconcileOpts.Completed().Apply(&backupbucketcontroller.DefaultAddOptions.IgnoreOperationAnnotation, &backupbucketcontroller.DefaultAddOptions.ExtensionClass) + reconcileOpts.Completed().Apply(&backupentrycontroller.DefaultAddOptions.IgnoreOperationAnnotation, &backupentrycontroller.DefaultAddOptions.ExtensionClass) workercontroller.DefaultAddOptions.GardenCluster = gardenCluster if _, err := webhookOptions.Completed().AddToManager(ctx, mgr, nil); err != nil { diff --git a/go.sum b/go.sum index 85045338..0201e6df 100644 --- a/go.sum +++ b/go.sum @@ -400,8 +400,6 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= -golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= -golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= diff --git a/pkg/controller/backupbucket/add.go b/pkg/controller/backupbucket/add.go index 12e90cdf..363d2dda 100644 --- a/pkg/controller/backupbucket/add.go +++ b/pkg/controller/backupbucket/add.go @@ -7,6 +7,7 @@ import ( "context" "github.com/gardener/gardener/extensions/pkg/controller/backupbucket" + extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1" "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/manager" @@ -27,6 +28,8 @@ type AddOptions struct { IgnoreOperationAnnotation bool // BackupBucketConfig contains config for the BackupBucket config. BackupBucketConfig controllerconfig.BackupBucketConfig + // ExtensionClass defines the extension class this extension is responsible for. + ExtensionClass extensionsv1alpha1.ExtensionClass } // AddToManagerWithOptions adds a controller with the given Options to the given manager. @@ -37,6 +40,7 @@ func AddToManagerWithOptions(ctx context.Context, mgr manager.Manager, opts AddO ControllerOptions: opts.Controller, Predicates: backupbucket.DefaultPredicates(opts.IgnoreOperationAnnotation), Type: ironcore.Type, + ExtensionClass: opts.ExtensionClass, }) } diff --git a/pkg/controller/backupentry/add.go b/pkg/controller/backupentry/add.go index 951b0a20..a43cf841 100644 --- a/pkg/controller/backupentry/add.go +++ b/pkg/controller/backupentry/add.go @@ -8,6 +8,7 @@ import ( "github.com/gardener/gardener/extensions/pkg/controller/backupentry" "github.com/gardener/gardener/extensions/pkg/controller/backupentry/genericactuator" + extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1" "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/manager" @@ -25,6 +26,8 @@ type AddOptions struct { Controller controller.Options // IgnoreOperationAnnotation specifies whether to ignore the operation annotation or not. IgnoreOperationAnnotation bool + // ExtensionClass defines the extension class this extension is responsible for. + ExtensionClass extensionsv1alpha1.ExtensionClass } // AddToManagerWithOptions adds a controller with the given Options to the given manager. @@ -35,6 +38,7 @@ func AddToManagerWithOptions(ctx context.Context, mgr manager.Manager, opts AddO ControllerOptions: opts.Controller, Predicates: backupentry.DefaultPredicates(opts.IgnoreOperationAnnotation), Type: ironcore.Type, + ExtensionClass: opts.ExtensionClass, }) } diff --git a/pkg/controller/bastion/add.go b/pkg/controller/bastion/add.go index e879e795..ef25a93e 100644 --- a/pkg/controller/bastion/add.go +++ b/pkg/controller/bastion/add.go @@ -7,6 +7,7 @@ import ( "context" "github.com/gardener/gardener/extensions/pkg/controller/bastion" + extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1" "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/manager" @@ -28,6 +29,8 @@ type AddOptions struct { IgnoreOperationAnnotation bool // BastionConfig contains config for the Bastion config. BastionConfig controllerconfig.BastionConfig + // ExtensionClass defines the extension class this extension is responsible for. + ExtensionClass extensionsv1alpha1.ExtensionClass } // AddToManagerWithOptions adds a controller with the given AddOptions to the given manager. @@ -39,6 +42,7 @@ func AddToManagerWithOptions(mgr manager.Manager, opts AddOptions) error { ControllerOptions: opts.Controller, Predicates: bastion.DefaultPredicates(opts.IgnoreOperationAnnotation), Type: ironcore.Type, + ExtensionClass: opts.ExtensionClass, }) } diff --git a/pkg/controller/infrastructure/add.go b/pkg/controller/infrastructure/add.go index c47097d1..8f3c9409 100644 --- a/pkg/controller/infrastructure/add.go +++ b/pkg/controller/infrastructure/add.go @@ -7,6 +7,7 @@ import ( "context" "github.com/gardener/gardener/extensions/pkg/controller/infrastructure" + extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1" "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/manager" @@ -25,6 +26,8 @@ type AddOptions struct { Controller controller.Options // IgnoreOperationAnnotation specifies whether to ignore the operation annotation or not. IgnoreOperationAnnotation bool + // ExtensionClass defines the extension class this extension is responsible for. + ExtensionClass extensionsv1alpha1.ExtensionClass } // AddToManagerWithOptions adds a controller with the given AddOptions to the given manager. @@ -36,6 +39,7 @@ func AddToManagerWithOptions(ctx context.Context, mgr manager.Manager, opts AddO ControllerOptions: opts.Controller, Predicates: infrastructure.DefaultPredicates(ctx, mgr, opts.IgnoreOperationAnnotation), Type: ironcore.Type, + ExtensionClass: opts.ExtensionClass, }) } diff --git a/pkg/controller/worker/add.go b/pkg/controller/worker/add.go index 197d2a49..8fa92f42 100644 --- a/pkg/controller/worker/add.go +++ b/pkg/controller/worker/add.go @@ -7,6 +7,7 @@ import ( "context" "github.com/gardener/gardener/extensions/pkg/controller/worker" + extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1" machinev1alpha1 "github.com/gardener/machine-controller-manager/pkg/apis/machine/v1alpha1" apiextensionsscheme "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme" "k8s.io/utils/ptr" @@ -33,6 +34,8 @@ type AddOptions struct { // IgnoreOperationAnnotation specifies whether to ignore the operation annotation or not. IgnoreOperationAnnotation bool RecoverPanic *bool + // ExtensionClass defines the extension class this extension is responsible for. + ExtensionClass extensionsv1alpha1.ExtensionClass } // AddToManagerWithOptions adds a controller with the given Options to the given manager. @@ -51,6 +54,7 @@ func AddToManagerWithOptions(ctx context.Context, mgr manager.Manager, opts AddO ControllerOptions: opts.Controller, Predicates: worker.DefaultPredicates(ctx, mgr, opts.IgnoreOperationAnnotation), Type: ironcore.Type, + ExtensionClass: opts.ExtensionClass, }) }