Skip to content
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

Jump to bottom

Upgrade k8s.io/* to v0.25, sigs.k8s.io/controller-runtime to v0.13 #6668

Merged
merged 14 commits into from
Sep 13, 2022
Merged

Upgrade k8s.io/* to v0.25, sigs.k8s.io/controller-runtime to v0.13 #6668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4bea67e
Upgrade `k8s.io/*` to `0.25.0`
shafeeqes Sep 12, 2022
09a6cc3
Upgrade `controller-runtime` to `v0.13.0`
shafeeqes Sep 12, 2022
9193412
Drop `kutil.IgnoreAlreadyExists` in favour of
shafeeqes Sep 12, 2022
2f311ef
Implement Destroy() fn for REST storage
shafeeqes Sep 12, 2022
525f10c
Adapt `component-base/logs` v1
shafeeqes Sep 12, 2022
192582e
Run `make generate`
shafeeqes Sep 12, 2022
3e33fbe
Handle v1 config for PodSecurity config
shafeeqes Sep 12, 2022
bf86074
Adapt client Get call with client.GetOption
shafeeqes Sep 12, 2022
fce0318
Adapt doc string for unprivileged e2e test
shafeeqes Sep 13, 2022
489f4ce
Set `RecoverPanic` to true for webhooks
shafeeqes Sep 13, 2022
a4f62c1
Address PR review feedback and Run `make generate`
shafeeqes Sep 13, 2022
7d7bc63
Address PR review feedback: Set RecoverPanic to true for Gardener web…
shafeeqes Sep 13, 2022
aee1247
Address PR review feedback: Set RecoverPanic to true for Gardener web…
shafeeqes Sep 13, 2022
c9fc180
Bump google/gnostic
shafeeqes Sep 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 6 additions & 6 deletions cmd/gardener-admission-controller/app/gardener_admission_controller.go
View file
Open in desktop
Expand Up @@ -187,12 +187,12 @@ func (o *options) run(ctx context.Context) error {

logSeedAuth := webhookLogger.WithName(seedauthorizer.AuthorizerName)
server.Register(seedauthorizer.WebhookPath, seedauthorizer.NewHandler(logSeedAuth, seedauthorizer.NewAuthorizer(logSeedAuth, graph)))
server.Register(seedrestriction.WebhookPath, &webhook.Admission{Handler: seedRestrictionHandler})
server.Register(namespacedeletion.WebhookPath, &webhook.Admission{Handler: namespaceValidationHandler})
server.Register(kubeconfigsecret.WebhookPath, &webhook.Admission{Handler: kubeconfigsecret.New(webhookLogger.WithName(kubeconfigsecret.HandlerName))})
server.Register(resourcesize.WebhookPath, &webhook.Admission{Handler: resourcesize.New(webhookLogger.WithName(resourcesize.HandlerName), o.config.Server.ResourceAdmissionConfiguration)})
server.Register(auditpolicy.WebhookPath, &webhook.Admission{Handler: auditpolicy.New(webhookLogger.WithName(auditpolicy.HandlerName))})
server.Register(internaldomainsecret.WebhookPath, &webhook.Admission{Handler: internaldomainsecret.New(webhookLogger.WithName(internaldomainsecret.HandlerName))})
server.Register(seedrestriction.WebhookPath, &webhook.Admission{Handler: seedRestrictionHandler, RecoverPanic: true})
server.Register(namespacedeletion.WebhookPath, &webhook.Admission{Handler: namespaceValidationHandler, RecoverPanic: true})
server.Register(kubeconfigsecret.WebhookPath, &webhook.Admission{Handler: kubeconfigsecret.New(webhookLogger.WithName(kubeconfigsecret.HandlerName)), RecoverPanic: true})
server.Register(resourcesize.WebhookPath, &webhook.Admission{Handler: resourcesize.New(webhookLogger.WithName(resourcesize.HandlerName), o.config.Server.ResourceAdmissionConfiguration), RecoverPanic: true})
server.Register(auditpolicy.WebhookPath, &webhook.Admission{Handler: auditpolicy.New(webhookLogger.WithName(auditpolicy.HandlerName)), RecoverPanic: true})
server.Register(internaldomainsecret.WebhookPath, &webhook.Admission{Handler: internaldomainsecret.New(webhookLogger.WithName(internaldomainsecret.HandlerName)), RecoverPanic: true})

if pointer.BoolDeref(o.config.Server.EnableDebugHandlers, false) {
log.Info("Registering debug handlers")
Expand Down
10 changes: 5 additions & 5 deletions cmd/gardener-apiserver/app/gardener_apiserver.go
View file
Open in desktop
Expand Up @@ -65,7 +65,7 @@ import (
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
"k8s.io/component-base/logs"
logsv1 "k8s.io/component-base/logs/api/v1"
"k8s.io/component-base/version"
"k8s.io/component-base/version/verflag"
"k8s.io/klog/v2"
Expand Down Expand Up @@ -120,7 +120,7 @@ type Options struct {
SeedManagementInformerFactory seedmanagementinformer.SharedInformerFactory
SettingsInformerFactory settingsinformer.SharedInformerFactory

Logs *logs.Options
Logs *logsv1.LoggingConfiguration
}

// NewOptions returns a new Options object.
Expand All @@ -137,7 +137,7 @@ func NewOptions() *Options {
),
ServerRunOptions: genericoptions.NewServerRunOptions(),
ExtraOptions: &apiserver.ExtraOptions{},
Logs: logs.NewOptions(),
Logs: logsv1.NewLoggingConfiguration(),
}
o.Recommended.Etcd.StorageConfig.EncodeVersioner = runtime.NewMultiGroupVersioner(
gardencorev1beta1.SchemeGroupVersion,
Expand All @@ -156,7 +156,7 @@ func (o *Options) AddFlags(flags *pflag.FlagSet) {
o.Recommended.AddFlags(flags)
o.ServerRunOptions.AddUniversalFlags(flags)
o.ExtraOptions.AddFlags(flags)
o.Logs.AddFlags(flags)
logsv1.AddFlags(o.Logs, flags)
}

// Validate validates all the required options.
Expand All @@ -173,7 +173,7 @@ func (o *Options) Validate() error {
}

// Activate logging as soon as possible
if err := o.Logs.ValidateAndApply(nil); err != nil {
if err := logsv1.ValidateAndApply(o.Logs, nil); err != nil {
return err
}

Expand Down
4 changes: 2 additions & 2 deletions cmd/gardener-seed-admission-controller/app/gardener_seed_admission_controller.go
View file
Open in desktop
Expand Up @@ -183,8 +183,8 @@ func (o *Options) Run(ctx context.Context) error {
if err := extensionresources.AddWebhooks(mgr); err != nil {
return err
}
server.Register(extensioncrds.WebhookPath, &webhook.Admission{Handler: extensioncrds.New(webhookLogger.WithName(extensioncrds.HandlerName))})
server.Register(podschedulername.WebhookPath, &webhook.Admission{Handler: admission.HandlerFunc(podschedulername.DefaultShootControlPlanePodsSchedulerName)})
server.Register(extensioncrds.WebhookPath, &webhook.Admission{Handler: extensioncrds.New(webhookLogger.WithName(extensioncrds.HandlerName)), RecoverPanic: true})
server.Register(podschedulername.WebhookPath, &webhook.Admission{Handler: admission.HandlerFunc(podschedulername.DefaultShootControlPlanePodsSchedulerName), RecoverPanic: true})

log.Info("Starting manager")
return mgr.Start(ctx)
Expand Down
4 changes: 3 additions & 1 deletion example/resource-manager/10-crd-resources.gardener.cloud_managedresources.yaml
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.9.0
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: managedresources.resources.gardener.cloud
spec:
Expand Down Expand Up @@ -119,6 +119,7 @@ spec:
TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
type: object
x-kubernetes-map-type: atomic
type: array
required:
- secretRefs
Expand Down Expand Up @@ -224,6 +225,7 @@ spec:
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
type: string
type: object
x-kubernetes-map-type: atomic
type: array
secretsDataChecksum:
description: SecretsDataChecksum is the checksum of referenced secrets
Expand Down
7 changes: 6 additions & 1 deletion example/seed-crds/10-crd-autoscaling.k8s.io_hvpas.yaml
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
api-approved.kubernetes.io: unapproved, temporarily squatting
controller-gen.kubebuilder.io/version: v0.9.0
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: hvpas.autoscaling.k8s.io
spec:
Expand Down Expand Up @@ -210,6 +210,7 @@ spec:
"value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
template:
description: Template is the object that describes the HPA that
will be created.
Expand Down Expand Up @@ -350,6 +351,7 @@ spec:
only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
targetAverageValue:
anyOf:
- type: integer
Expand Down Expand Up @@ -446,6 +448,7 @@ spec:
only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
target:
description: target is the described Kubernetes
object.
Expand Down Expand Up @@ -546,6 +549,7 @@ spec:
only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
targetAverageValue:
anyOf:
- type: integer
Expand Down Expand Up @@ -869,6 +873,7 @@ spec:
"value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
template:
description: Template is the object that describes the VPA that
will be created.
Expand Down
4 changes: 3 additions & 1 deletion example/seed-crds/10-crd-druid.gardener.cloud_etcdcopybackupstasks.yaml
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.9.0
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: etcdcopybackupstasks.druid.gardener.cloud
spec:
Expand Down Expand Up @@ -79,6 +79,7 @@ spec:
secret name must be unique.
type: string
type: object
x-kubernetes-map-type: atomic
required:
- prefix
type: object
Expand Down Expand Up @@ -109,6 +110,7 @@ spec:
secret name must be unique.
type: string
type: object
x-kubernetes-map-type: atomic
required:
- prefix
type: object
Expand Down