Skip to content

Commit

Permalink
Vendor k/*@v0.23 and controller-runtime@v0.11 (gardener#5421)
Browse files Browse the repository at this point in the history 
* Bump k8s.io/* to v0.23.3 in go.mod

* [automated] make revendor

* [automated] make generate

* Bump c-r to v0.11.0 in go.mod

* [automated] make revendor

* Bump controller-tools to v0.8.0 in go.mod

* [automated] make revendor

* Adapt change for Logger changed to Struct

From v1.0.0 log.Logger has been changed to struct from Interface. Logger struct has field `LogSink` interface which is same as old `Logger` interface

* Adapt changes fo NullLogger

* Adapt chnage in Handler API

ref kubernetes/kubernetes#105979

* Adapt ResolverConfig field changed from a string to *string

ref kubernetes/kunernetes#104624

* Adapt changes for, In kubelet, log verbosity and flush frequency can also be configured via the configuration

ref kubernetes/kubernetes#106090

* [automated] make generate

* Avoid shallow copies of webhook

ref kubernetes-sigs/controller-runtime#1667

* Add back apiserver logging flags

* Rebase

Co-authored-by: Tim Ebert <timebertt@gmail.com>
  • Loading branch information
@acumino @timebertt
2 people authored and Kristiyan Gostev committed Apr 21, 2022
1 parent dea648a commit 4d630e3
Show file tree
Hide file tree
Showing 1,175 changed files with 76,801 additions and 15,899 deletions.
11 changes: 11 additions & 0 deletions cmd/gardener-apiserver/app/gardener_apiserver.go
View file
Expand Up @@ -21,6 +21,8 @@ import (
"fmt"
"time"

"k8s.io/component-base/logs"

"github.com/gardener/gardener/pkg/api"
gardencore "github.com/gardener/gardener/pkg/apis/core"
gardencorev1alpha1 "github.com/gardener/gardener/pkg/apis/core/v1alpha1"
Expand Down Expand Up @@ -120,6 +122,8 @@ type Options struct {
KubeInformerFactory kubeinformers.SharedInformerFactory
SeedManagementInformerFactory seedmanagementinformer.SharedInformerFactory
SettingsInformerFactory settingsinformer.SharedInformerFactory

Logs *logs.Options
}

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

// Validate validates all the required options.
Expand All @@ -169,6 +175,11 @@ func (o *Options) Validate() error {
errs = append(errs, errors.New("must specify both --tls-cert-file and --tls-private-key-file"))
}

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

return utilerrors.NewAggregate(errs)
}

Expand Down
5 changes: 1 addition & 4 deletions cmd/gardener-apiserver/main.go
View file
Expand Up @@ -17,7 +17,7 @@ package main
import (
"os"

"k8s.io/component-base/logs"
_ "k8s.io/component-base/logs/json/register" // for JSON log format registration
"sigs.k8s.io/controller-runtime/pkg/manager/signals"

"github.com/gardener/gardener/cmd/gardener-apiserver/app"
Expand All @@ -29,9 +29,6 @@ func main() {
utils.DeduplicateWarnings()
features.RegisterFeatureGates()

logs.InitLogs()
defer logs.FlushLogs()

ctx := signals.SetupSignalHandler()
if err := app.NewCommandStartGardenerAPIServer().ExecuteContext(ctx); err != nil {
os.Exit(1)
Expand Down
3 changes: 1 addition & 2 deletions example/resource-manager/10-crd-resources.gardener.cloud_managedresources.yaml
View file
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
name: managedresources.resources.gardener.cloud
spec:
Expand Down
3 changes: 1 addition & 2 deletions example/seed-crds/10-crd-druid.gardener.cloud_etcdcopybackupstasks.yaml
View file
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
name: etcdcopybackupstasks.druid.gardener.cloud
spec:
Expand Down
3 changes: 1 addition & 2 deletions example/seed-crds/10-crd-druid.gardener.cloud_etcds.yaml
View file
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
name: etcds.druid.gardener.cloud
spec:
Expand Down
3 changes: 1 addition & 2 deletions example/seed-crds/10-crd-extensions.gardener.cloud_backupbuckets.yaml
View file
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
name: backupbuckets.extensions.gardener.cloud
spec:
Expand Down
3 changes: 1 addition & 2 deletions example/seed-crds/10-crd-extensions.gardener.cloud_backupentries.yaml
View file
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
name: backupentries.extensions.gardener.cloud
spec:
Expand Down
9 changes: 4 additions & 5 deletions example/seed-crds/10-crd-extensions.gardener.cloud_bastions.yaml
View file
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
name: bastions.extensions.gardener.cloud
spec:
Expand Down Expand Up @@ -168,10 +167,10 @@ spec:
description: 'Error is to record the problem with the service
port The format of the error shall comply with the following
rules: - built-in error values shall be specified in this
file and those shall use CamelCase names - cloud provider
file and those shall use CamelCase names - cloud provider
specific error values must have names that comply with
the format foo.example.com/CamelCase. --- The regex
it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)'
the format foo.example.com/CamelCase. --- The regex it
matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)'
maxLength: 316
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
Expand Down
3 changes: 1 addition & 2 deletions example/seed-crds/10-crd-extensions.gardener.cloud_clusters.yaml
View file
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
name: clusters.extensions.gardener.cloud
spec:
Expand Down
3 changes: 1 addition & 2 deletions example/seed-crds/10-crd-extensions.gardener.cloud_containerruntimes.yaml
View file
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
name: containerruntimes.extensions.gardener.cloud
spec:
Expand Down
3 changes: 1 addition & 2 deletions example/seed-crds/10-crd-extensions.gardener.cloud_controlplanes.yaml
View file
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
name: controlplanes.extensions.gardener.cloud
spec:
Expand Down
3 changes: 1 addition & 2 deletions example/seed-crds/10-crd-extensions.gardener.cloud_dnsrecords.yaml
View file
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
name: dnsrecords.extensions.gardener.cloud
spec:
Expand Down
3 changes: 1 addition & 2 deletions example/seed-crds/10-crd-extensions.gardener.cloud_extensions.yaml
View file
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
name: extensions.extensions.gardener.cloud
spec:
Expand Down
3 changes: 1 addition & 2 deletions example/seed-crds/10-crd-extensions.gardener.cloud_infrastructures.yaml
View file
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
name: infrastructures.extensions.gardener.cloud
spec:
Expand Down
3 changes: 1 addition & 2 deletions example/seed-crds/10-crd-extensions.gardener.cloud_networks.yaml
View file
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
name: networks.extensions.gardener.cloud
spec:
Expand Down
3 changes: 1 addition & 2 deletions example/seed-crds/10-crd-extensions.gardener.cloud_operatingsystemconfigs.yaml
View file
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
name: operatingsystemconfigs.extensions.gardener.cloud
spec:
Expand Down
3 changes: 1 addition & 2 deletions example/seed-crds/10-crd-extensions.gardener.cloud_workers.yaml
View file
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
name: workers.extensions.gardener.cloud
spec:
Expand Down
3 changes: 1 addition & 2 deletions example/seed-crds/10-crd-resources.gardener.cloud_managedresources.yaml
View file
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
name: managedresources.resources.gardener.cloud
spec:
Expand Down
69 changes: 35 additions & 34 deletions go.mod
View file
Expand Up @@ -9,7 +9,7 @@ require (
github.com/ahmetb/gen-crd-api-reference-docs v0.2.0
github.com/bronze1man/yaml2json v0.0.0-20201022121239-82e774ec909d
github.com/coreos/go-systemd/v22 v22.3.2
github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d
github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021
github.com/frankban/quicktest v1.13.1 // indirect
github.com/gardener/component-spec/bindings-go v0.0.33
github.com/gardener/dependency-watchdog v0.6.1-0.20210623112844-96f73d5dc311
Expand All @@ -19,7 +19,7 @@ require (
github.com/gardener/landscaper/apis v0.7.0
github.com/gardener/machine-controller-manager v0.41.0
github.com/ghodss/yaml v1.0.0
github.com/go-logr/logr v0.4.0
github.com/go-logr/logr v1.2.0
github.com/gogo/protobuf v1.3.2
github.com/golang/mock v1.6.0
github.com/golang/snappy v0.0.4 // indirect
Expand All @@ -41,56 +41,57 @@ require (
github.com/texttheater/golang-levenshtein v0.0.0-20191208221605-eb6844b05fc6
github.com/ulikunitz/xz v0.5.10 // indirect
go.uber.org/automaxprocs v1.4.0
go.uber.org/goleak v1.1.10
go.uber.org/zap v1.19.0
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b
go.uber.org/goleak v1.1.12
go.uber.org/zap v1.19.1
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
golang.org/x/tools v0.1.7
gomodules.xyz/jsonpatch/v2 v2.2.0
gonum.org/v1/gonum v0.8.2
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
istio.io/api v0.0.0-20211118170605-3f0f902cdfd1
istio.io/client-go v1.12.0
k8s.io/api v0.22.2
k8s.io/apiextensions-apiserver v0.22.2
k8s.io/apimachinery v0.22.2
k8s.io/apiserver v0.22.2
k8s.io/api v0.23.3
k8s.io/apiextensions-apiserver v0.23.3
k8s.io/apimachinery v0.23.3
k8s.io/apiserver v0.23.3
k8s.io/autoscaler v0.0.0-20190805135949-100e91ba756e
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
k8s.io/cluster-bootstrap v0.22.2
k8s.io/code-generator v0.22.2
k8s.io/component-base v0.22.2
k8s.io/cluster-bootstrap v0.23.3
k8s.io/code-generator v0.23.3
k8s.io/component-base v0.23.3
k8s.io/helm v2.16.1+incompatible
k8s.io/klog v1.0.0
k8s.io/klog/v2 v2.9.0
k8s.io/kube-aggregator v0.22.2
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e
k8s.io/kube-proxy v0.22.2
k8s.io/kubelet v0.22.2
k8s.io/metrics v0.22.2
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a
sigs.k8s.io/controller-runtime v0.10.2
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211005045149-78ce10e2ebad // v0.10.2
sigs.k8s.io/controller-tools v0.7.0
sigs.k8s.io/yaml v1.2.0
k8s.io/klog/v2 v2.30.0
k8s.io/kube-aggregator v0.23.3
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65
k8s.io/kube-proxy v0.23.3
k8s.io/kubelet v0.23.3
k8s.io/metrics v0.23.3
k8s.io/utils v0.0.0-20211116205334-6203023598ed
sigs.k8s.io/controller-runtime v0.11.0
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211208212546-f236f0345ad2 // v0.11.0
sigs.k8s.io/controller-tools v0.8.0
sigs.k8s.io/yaml v1.3.0
)

replace (
github.com/emicklei/go-restful => github.com/emicklei/go-restful v2.9.5+incompatible // keep this value in sync with k8s.io/apiserver
github.com/envoyproxy/go-control-plane => github.com/envoyproxy/go-control-plane v0.9.4
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5 // keep this value in sync with k8s.io/apiserver
github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.11.0 // keep this value in sync with sigs.k8s.io/controller-runtime
google.golang.org/grpc => google.golang.org/grpc v1.38.0 // keep this value in sync with k8s.io/apiserver
k8s.io/api => k8s.io/api v0.22.2
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.22.2
k8s.io/apimachinery => k8s.io/apimachinery v0.22.2
k8s.io/apiserver => k8s.io/apiserver v0.22.2
k8s.io/client-go => k8s.io/client-go v0.22.2
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.22.2
k8s.io/code-generator => k8s.io/code-generator v0.22.2
k8s.io/component-base => k8s.io/component-base v0.22.2
google.golang.org/grpc => google.golang.org/grpc v1.40.0 // keep this value in sync with k8s.io/apiserver
k8s.io/api => k8s.io/api v0.23.3
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.3
k8s.io/apimachinery => k8s.io/apimachinery v0.23.3
k8s.io/apiserver => k8s.io/apiserver v0.23.3
k8s.io/client-go => k8s.io/client-go v0.23.3
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.23.3
k8s.io/code-generator => k8s.io/code-generator v0.23.3
k8s.io/component-base => k8s.io/component-base v0.23.3
k8s.io/helm => k8s.io/helm v2.13.1+incompatible
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.22.2
k8s.io/kube-proxy => k8s.io/kube-proxy v0.22.2
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.23.3
k8s.io/kube-proxy => k8s.io/kube-proxy v0.23.3
)

0 comments on commit 4d630e3

Please sign in to comment.