Skip to content

Commit fadbfc8

Browse files
timeberttKristiyan Gostev
timebertt
authored and
Kristiyan Gostev
committed
Vendor k/* and c-r dependencies (gardener#4215)
* Upgrade to k/*@v0.21.1 in go.mod * [automated] make revendor for k/* dependencies This deletes pkg/mock/client-go/kubernetes/mocks.go to resolve the following deadlock: make revendor fails because of some dependencies of the file and make generate fails because of missing revendoring. File will be generated again in the next commit. * [automated] make generate for k/* dependencies * Upgrade to [email protected] in go.mod * [automated] make revendor for c-r dependency `make revendor` results in `hack/setup-envtest.sh` being broken, so reset the file after running `make revendor`. Adaption to breaking changes in the upstream file will be done in a later commit. * manager.NewClientBuilder was removed in favor of cluster.DefaultNewClient ref kubernetes-sigs/controller-runtime#1409 * client.*MergeFrom* now take client.Object instead of runtime.Object ref kubernetes-sigs/controller-runtime#1395 * [automated] make generate for c-r dependency * Adapt to changes in labels.NewRequirement ref kubernetes/kubernetes#97538 * Adapt to new setup-envtest tool Makes use of the new setup-envtest tool (kubernetes-sigs/controller-runtime#1488) in hack/setup-envtest.sh instead of vendoring hack/setup-envtest.sh and fetching binaries with that. * [automated] make revendor for setup-envtest tool * Adapt pkg/envtest to upstream changes - Make use of the new Users concept in envtest to provision a dedicated user for gardener-apiserver and a valid kubeconfig - Make use of the new way to configure API server args to easily configure kube-aggregator flags - Also generate certs for aggregation layer on our own instead of reusing the API server ca/certs (which is semantically correct), which allows us to drop our fork including kubernetes-sigs/controller-runtime#1449 * Styling nits
1 parent dabbbf7 commit fadbfc8

File tree

1,756 files changed

+120460
-14526
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,756 files changed

+120460
-14526
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ install-requirements:
156156
@go install -mod=vendor github.com/onsi/ginkgo/ginkgo
157157
@go install -mod=vendor github.com/ahmetb/gen-crd-api-reference-docs
158158
@go install -mod=vendor github.com/golang/mock/mockgen
159+
@go install -mod=vendor sigs.k8s.io/controller-runtime/tools/setup-envtest
159160
@go install -mod=vendor sigs.k8s.io/controller-tools/cmd/controller-gen
160161
@./hack/install-promtool.sh
161162
@./hack/install-requirements.sh
@@ -164,7 +165,6 @@ install-requirements:
164165
revendor:
165166
@GO111MODULE=on go mod vendor
166167
@GO111MODULE=on go mod tidy
167-
@curl -sSLo hack/setup-envtest.sh https://raw.githubusercontent.com/kubernetes-sigs/controller-runtime/$(CR_VERSION)/hack/setup-envtest.sh
168168

169169
.PHONY: clean
170170
clean:

‎extensions/pkg/controller/reconciler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func (o *operationAnnotationWrapper) Reconcile(ctx context.Context, request reco
6565
}
6666

6767
if annotations[v1beta1constants.GardenerOperation] == v1beta1constants.GardenerOperationReconcile {
68-
withOpAnnotation := obj.DeepCopyObject()
68+
withOpAnnotation := obj.DeepCopyObject().(client.Object)
6969
delete(annotations, v1beta1constants.GardenerOperation)
7070
obj.SetAnnotations(annotations)
7171
if err := o.client.Patch(ctx, obj, client.MergeFrom(withOpAnnotation)); err != nil {

‎extensions/pkg/controller/utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ func GetVerticalPodAutoscalerObject() *unstructured.Unstructured {
184184

185185
// RemoveAnnotation removes an annotation key passed as annotation
186186
func RemoveAnnotation(ctx context.Context, c client.Client, obj client.Object, annotation string) error {
187-
withAnnotation := obj.DeepCopyObject()
187+
withAnnotation := obj.DeepCopyObject().(client.Object)
188188

189189
annotations := obj.GetAnnotations()
190190
delete(annotations, annotation)

‎extensions/pkg/terraformer/terraform_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@ var _ = Describe("terraformer", func() {
628628
return nil
629629
}),
630630
c.EXPECT().
631-
Patch(gomock.Any(), gomock.AssignableToTypeOf(secret.DeepCopyObject()), gomock.AssignableToTypeOf(client.MergeFromWithOptions(secret.DeepCopyObject(), client.MergeFromWithOptimisticLock{}))),
631+
Patch(gomock.Any(), gomock.AssignableToTypeOf(secret.DeepCopy()), gomock.AssignableToTypeOf(client.MergeFromWithOptions(secret.DeepCopy(), client.MergeFromWithOptimisticLock{}))),
632632

633633
c.EXPECT().
634634
Get(gomock.Any(), kutil.Key(namespace, stateName), gomock.AssignableToTypeOf(&corev1.ConfigMap{})).
@@ -637,7 +637,7 @@ var _ = Describe("terraformer", func() {
637637
return nil
638638
}),
639639
c.EXPECT().
640-
Patch(gomock.Any(), gomock.AssignableToTypeOf(config.DeepCopyObject()), gomock.AssignableToTypeOf(client.MergeFromWithOptions(config.DeepCopyObject(), client.MergeFromWithOptimisticLock{}))),
640+
Patch(gomock.Any(), gomock.AssignableToTypeOf(config.DeepCopy()), gomock.AssignableToTypeOf(client.MergeFromWithOptions(config.DeepCopy(), client.MergeFromWithOptimisticLock{}))),
641641

642642
c.EXPECT().
643643
Get(gomock.Any(), kutil.Key(namespace, configName), gomock.AssignableToTypeOf(&corev1.ConfigMap{})).
@@ -646,7 +646,7 @@ var _ = Describe("terraformer", func() {
646646
return nil
647647
}),
648648
c.EXPECT().
649-
Patch(gomock.Any(), gomock.AssignableToTypeOf(state.DeepCopyObject()), gomock.AssignableToTypeOf(client.MergeFromWithOptions(state.DeepCopyObject(), client.MergeFromWithOptimisticLock{}))),
649+
Patch(gomock.Any(), gomock.AssignableToTypeOf(state.DeepCopy()), gomock.AssignableToTypeOf(client.MergeFromWithOptions(state.DeepCopy(), client.MergeFromWithOptimisticLock{}))),
650650
)
651651

652652
Expect(t.RemoveTerraformerFinalizerFromConfig(ctx)).NotTo(HaveOccurred())

‎go.mod

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -16,53 +16,54 @@ require (
1616
github.com/gardener/landscaper/apis v0.7.0
1717
github.com/gardener/machine-controller-manager v0.33.0
1818
github.com/ghodss/yaml v1.0.0
19-
github.com/go-logr/logr v0.3.0
20-
github.com/go-openapi/spec v0.19.3
19+
github.com/go-logr/logr v0.4.0
20+
github.com/go-openapi/spec v0.19.5
2121
github.com/gogo/protobuf v1.3.2
2222
github.com/golang/mock v1.6.0
23-
github.com/googleapis/gnostic v0.5.1
23+
github.com/googleapis/gnostic v0.5.5
2424
github.com/hashicorp/go-multierror v1.1.0
2525
github.com/huandu/xstrings v1.3.2
26-
github.com/json-iterator/go v1.1.10
26+
github.com/json-iterator/go v1.1.11
2727
github.com/mholt/archiver v3.1.1+incompatible
28-
github.com/onsi/ginkgo v1.14.2
29-
github.com/onsi/gomega v1.10.5
28+
github.com/onsi/ginkgo v1.16.4
29+
github.com/onsi/gomega v1.13.0
3030
github.com/pkg/errors v0.9.1
31-
github.com/prometheus/client_golang v1.7.1
31+
github.com/prometheus/client_golang v1.11.0
3232
github.com/robfig/cron v1.2.0
33-
github.com/sirupsen/logrus v1.6.0
33+
github.com/sirupsen/logrus v1.7.0
3434
github.com/spf13/cobra v1.1.1
3535
github.com/spf13/pflag v1.0.5
3636
github.com/spf13/viper v1.7.0
3737
github.com/texttheater/golang-levenshtein v0.0.0-20191208221605-eb6844b05fc6
38-
go.uber.org/zap v1.15.0
39-
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0
38+
go.uber.org/zap v1.17.0
39+
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
4040
golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5
41-
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
42-
gomodules.xyz/jsonpatch/v2 v2.1.0
41+
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
42+
gomodules.xyz/jsonpatch/v2 v2.2.0
4343
gonum.org/v1/gonum v0.8.2
44-
gopkg.in/yaml.v2 v2.3.0
44+
gopkg.in/yaml.v2 v2.4.0
4545
istio.io/api v0.0.0-20201123152548-197f11e4ea09
4646
istio.io/client-go v1.8.1
47-
k8s.io/api v0.20.7
48-
k8s.io/apiextensions-apiserver v0.20.7
49-
k8s.io/apimachinery v0.20.7
50-
k8s.io/apiserver v0.20.7
47+
k8s.io/api v0.21.1
48+
k8s.io/apiextensions-apiserver v0.21.1
49+
k8s.io/apimachinery v0.21.1
50+
k8s.io/apiserver v0.21.1
5151
k8s.io/autoscaler v0.0.0-20190805135949-100e91ba756e
5252
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
53-
k8s.io/cluster-bootstrap v0.20.7
54-
k8s.io/code-generator v0.20.7
55-
k8s.io/component-base v0.20.7
56-
k8s.io/gengo v0.0.0-20201113003025-83324d819ded
53+
k8s.io/cluster-bootstrap v0.21.1
54+
k8s.io/code-generator v0.21.1
55+
k8s.io/component-base v0.21.1
56+
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027
5757
k8s.io/helm v2.16.1+incompatible
5858
k8s.io/klog v1.0.0
59-
k8s.io/klog/v2 v2.4.0
60-
k8s.io/kube-aggregator v0.20.7
61-
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd // keep this value in sync with k8s.io/apiserver
62-
k8s.io/kubelet v0.20.7
63-
k8s.io/metrics v0.20.7
64-
k8s.io/utils v0.0.0-20210111153108-fddb29f9d009
65-
sigs.k8s.io/controller-runtime v0.8.3
59+
k8s.io/klog/v2 v2.9.0
60+
k8s.io/kube-aggregator v0.21.1
61+
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 // keep this value in sync with k8s.io/apiserver
62+
k8s.io/kubelet v0.21.1
63+
k8s.io/metrics v0.21.1
64+
k8s.io/utils v0.0.0-20210527160623-6fdb442a123b
65+
sigs.k8s.io/controller-runtime v0.9.0
66+
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20210609022947-fbf50b04fe17
6667
sigs.k8s.io/controller-tools v0.4.1
6768
sigs.k8s.io/yaml v1.2.0
6869
)
@@ -71,17 +72,16 @@ replace (
7172
github.com/emicklei/go-restful => github.com/emicklei/go-restful v2.9.5+incompatible // keep this value in sync with k8s.io/apiserver
7273
github.com/envoyproxy/go-control-plane => github.com/envoyproxy/go-control-plane v0.9.4
7374
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.4.1
74-
github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.7.1 // keep this value in sync with sigs.k8s.io/controller-runtime
75-
google.golang.org/grpc => google.golang.org/grpc v1.27.0 // keep this value in sync with k8s.io/apiserver
76-
k8s.io/api => k8s.io/api v0.20.7
77-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.7
78-
k8s.io/apimachinery => k8s.io/apimachinery v0.20.7
79-
k8s.io/apiserver => k8s.io/apiserver v0.20.7
80-
k8s.io/client-go => k8s.io/client-go v0.20.7
81-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.20.7
82-
k8s.io/code-generator => k8s.io/code-generator v0.20.7
83-
k8s.io/component-base => k8s.io/component-base v0.20.7
75+
github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.11.0 // keep this value in sync with sigs.k8s.io/controller-runtime
76+
google.golang.org/grpc => google.golang.org/grpc v1.27.1 // keep this value in sync with k8s.io/apiserver
77+
k8s.io/api => k8s.io/api v0.21.1
78+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.1
79+
k8s.io/apimachinery => k8s.io/apimachinery v0.21.1
80+
k8s.io/apiserver => k8s.io/apiserver v0.21.1
81+
k8s.io/client-go => k8s.io/client-go v0.21.1
82+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.21.1
83+
k8s.io/code-generator => k8s.io/code-generator v0.21.1
84+
k8s.io/component-base => k8s.io/component-base v0.21.1
8485
k8s.io/helm => k8s.io/helm v2.13.1+incompatible
85-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.20.7
86-
sigs.k8s.io/controller-runtime => github.com/gardener/controller-runtime v0.8.3-gardener.1
86+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.21.1
8787
)

0 commit comments

Comments
 (0)