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.

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

Upgrade k8s.io/* to v0.24.1, sigs.k8s.io/controller-runtime to v0.12.1 #6101

Merged
merged 14 commits into from Jun 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
  •  
  •  
  •  
1 change: 1 addition & 0 deletions Dockerfile.local
Expand Up @@ -95,6 +95,7 @@ FROM builder-base AS builder-admission-controller
# manually copy the packages we need to keep the build context slim
COPY cmd cmd
COPY pkg pkg
COPY third_party third_party

COPY go.mod go.sum ./

Expand Down
2 changes: 1 addition & 1 deletion cmd/gardener-apiserver/app/gardener_apiserver.go
Expand Up @@ -176,7 +176,7 @@ func (o *Options) Validate() error {
}

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

Expand Down
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
controller-gen.kubebuilder.io/version: v0.9.0
creationTimestamp: null
name: managedresources.resources.gardener.cloud
spec:
Expand Down Expand Up @@ -231,9 +231,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
8 changes: 1 addition & 7 deletions example/seed-crds/10-crd-autoscaling.k8s.io_hvpas.yaml
Expand Up @@ -4,7 +4,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
api-approved.kubernetes.io: unapproved, temporarily squatting
controller-gen.kubebuilder.io/version: v0.8.0
controller-gen.kubebuilder.io/version: v0.9.0
creationTimestamp: null
name: hvpas.autoscaling.k8s.io
spec:
Expand Down Expand Up @@ -1341,9 +1341,3 @@ spec:
specReplicasPath: .spec.replicas
statusReplicasPath: .status.replicas
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
controller-gen.kubebuilder.io/version: v0.9.0
creationTimestamp: null
name: etcdcopybackupstasks.druid.gardener.cloud
spec:
Expand Down Expand Up @@ -71,11 +71,11 @@ spec:
to connect to the backup store.
properties:
name:
description: Name is unique within a namespace to reference
description: name is unique within a namespace to reference
a secret resource.
type: string
namespace:
description: Namespace defines the space within which the
description: namespace defines the space within which the
secret name must be unique.
type: string
type: object
Expand All @@ -101,11 +101,11 @@ spec:
to connect to the backup store.
properties:
name:
description: Name is unique within a namespace to reference
description: name is unique within a namespace to reference
a secret resource.
type: string
namespace:
description: Namespace defines the space within which the
description: namespace defines the space within which the
secret name must be unique.
type: string
type: object
Expand Down Expand Up @@ -188,9 +188,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
125 changes: 73 additions & 52 deletions example/seed-crds/10-crd-druid.gardener.cloud_etcds.yaml

Large diffs are not rendered by default.

Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
controller-gen.kubebuilder.io/version: v0.9.0
creationTimestamp: null
name: backupbuckets.extensions.gardener.cloud
spec:
Expand Down Expand Up @@ -68,11 +68,11 @@ spec:
credentials to access object store.
properties:
name:
description: Name is unique within a namespace to reference a
description: name is unique within a namespace to reference a
secret resource.
type: string
namespace:
description: Namespace defines the space within which the secret
description: namespace defines the space within which the secret
name must be unique.
type: string
type: object
Expand Down Expand Up @@ -137,11 +137,11 @@ spec:
by backup bucket, which will have object store specific credentials.
properties:
name:
description: Name is unique within a namespace to reference a
description: name is unique within a namespace to reference a
secret resource.
type: string
namespace:
description: Namespace defines the space within which the secret
description: namespace defines the space within which the secret
name must be unique.
type: string
type: object
Expand Down Expand Up @@ -253,9 +253,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
controller-gen.kubebuilder.io/version: v0.9.0
creationTimestamp: null
name: backupentries.extensions.gardener.cloud
spec:
Expand Down Expand Up @@ -82,11 +82,11 @@ spec:
credentials to access object store.
properties:
name:
description: Name is unique within a namespace to reference a
description: name is unique within a namespace to reference a
secret resource.
type: string
namespace:
description: Namespace defines the space within which the secret
description: namespace defines the space within which the secret
name must be unique.
type: string
type: object
Expand Down Expand Up @@ -255,9 +255,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
controller-gen.kubebuilder.io/version: v0.9.0
creationTimestamp: null
name: bastions.extensions.gardener.cloud
spec:
Expand Down Expand Up @@ -300,9 +300,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
controller-gen.kubebuilder.io/version: v0.9.0
creationTimestamp: null
name: clusters.extensions.gardener.cloud
spec:
Expand Down Expand Up @@ -67,9 +67,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
controller-gen.kubebuilder.io/version: v0.9.0
creationTimestamp: null
name: containerruntimes.extensions.gardener.cloud
spec:
Expand Down Expand Up @@ -282,9 +282,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
controller-gen.kubebuilder.io/version: v0.9.0
creationTimestamp: null
name: controlplanes.extensions.gardener.cloud
spec:
Expand Down Expand Up @@ -78,11 +78,11 @@ spec:
cloud provider specific credentials.
properties:
name:
description: Name is unique within a namespace to reference a
description: name is unique within a namespace to reference a
secret resource.
type: string
namespace:
description: Namespace defines the space within which the secret
description: namespace defines the space within which the secret
name must be unique.
type: string
type: object
Expand Down Expand Up @@ -250,9 +250,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
controller-gen.kubebuilder.io/version: v0.9.0
creationTimestamp: null
name: dnsrecords.extensions.gardener.cloud
spec:
Expand Down Expand Up @@ -79,11 +79,11 @@ spec:
cloud provider specific credentials.
properties:
name:
description: Name is unique within a namespace to reference a
description: name is unique within a namespace to reference a
secret resource.
type: string
namespace:
description: Namespace defines the space within which the secret
description: namespace defines the space within which the secret
name must be unique.
type: string
type: object
Expand Down Expand Up @@ -272,9 +272,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
controller-gen.kubebuilder.io/version: v0.9.0
creationTimestamp: null
name: extensions.extensions.gardener.cloud
spec:
Expand Down Expand Up @@ -217,9 +217,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
controller-gen.kubebuilder.io/version: v0.9.0
creationTimestamp: null
name: infrastructures.extensions.gardener.cloud
spec:
Expand Down Expand Up @@ -68,11 +68,11 @@ spec:
actual result of the generated cloud config.
properties:
name:
description: Name is unique within a namespace to reference a
description: name is unique within a namespace to reference a
secret resource.
type: string
namespace:
description: Namespace defines the space within which the secret
description: namespace defines the space within which the secret
name must be unique.
type: string
type: object
Expand Down Expand Up @@ -253,9 +253,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
controller-gen.kubebuilder.io/version: v0.9.0
creationTimestamp: null
name: networks.extensions.gardener.cloud
spec:
Expand Down Expand Up @@ -233,9 +233,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []