Update module sigs.k8s.io/controller-runtime to v0.10.0 (#4805)

* Update module sigs.k8s.io/controller-runtime to v0.10.0 * Set a default resource version in tests * Use v1 CRDs in integration tests
elastic · Sep 8, 2021 · 9136264 · 9136264
1 parent 1c8a9c9
commit 9136264
Show file tree

Hide file tree

Showing 25 changed files with 6,911 additions and 4,425 deletions.
diff --git a/NOTICE.txt b/NOTICE.txt
diff --git a/config/crds/v1/all-crds.yaml b/config/crds/v1/all-crds.yaml
diff --git a/config/crds/v1/bases/agent.k8s.elastic.co_agents.yaml b/config/crds/v1/bases/agent.k8s.elastic.co_agents.yaml
diff --git a/config/crds/v1/bases/apm.k8s.elastic.co_apmservers.yaml b/config/crds/v1/bases/apm.k8s.elastic.co_apmservers.yaml
diff --git a/config/crds/v1/bases/beat.k8s.elastic.co_beats.yaml b/config/crds/v1/bases/beat.k8s.elastic.co_beats.yaml
diff --git a/config/crds/v1/bases/elasticsearch.k8s.elastic.co_elasticsearches.yaml b/config/crds/v1/bases/elasticsearch.k8s.elastic.co_elasticsearches.yaml
diff --git a/config/crds/v1/bases/enterprisesearch.k8s.elastic.co_enterprisesearches.yaml b/config/crds/v1/bases/enterprisesearch.k8s.elastic.co_enterprisesearches.yaml
diff --git a/config/crds/v1/bases/kibana.k8s.elastic.co_kibanas.yaml b/config/crds/v1/bases/kibana.k8s.elastic.co_kibanas.yaml
diff --git a/config/crds/v1/bases/maps.k8s.elastic.co_elasticmapsservers.yaml b/config/crds/v1/bases/maps.k8s.elastic.co_elasticmapsservers.yaml
diff --git a/config/crds/v1beta1/all-crds.yaml b/config/crds/v1beta1/all-crds.yaml
diff --git a/config/crds/v1beta1/bases/agent.k8s.elastic.co_agents.yaml b/config/crds/v1beta1/bases/agent.k8s.elastic.co_agents.yaml
diff --git a/config/crds/v1beta1/bases/apm.k8s.elastic.co_apmservers.yaml b/config/crds/v1beta1/bases/apm.k8s.elastic.co_apmservers.yaml
diff --git a/config/crds/v1beta1/bases/beat.k8s.elastic.co_beats.yaml b/config/crds/v1beta1/bases/beat.k8s.elastic.co_beats.yaml
diff --git a/config/crds/v1beta1/bases/elasticsearch.k8s.elastic.co_elasticsearches.yaml b/config/crds/v1beta1/bases/elasticsearch.k8s.elastic.co_elasticsearches.yaml
diff --git a/config/crds/v1beta1/bases/enterprisesearch.k8s.elastic.co_enterprisesearches.yaml b/config/crds/v1beta1/bases/enterprisesearch.k8s.elastic.co_enterprisesearches.yaml
diff --git a/config/crds/v1beta1/bases/kibana.k8s.elastic.co_kibanas.yaml b/config/crds/v1beta1/bases/kibana.k8s.elastic.co_kibanas.yaml
diff --git a/config/crds/v1beta1/bases/maps.k8s.elastic.co_elasticmapsservers.yaml b/config/crds/v1beta1/bases/maps.k8s.elastic.co_elasticmapsservers.yaml
diff --git a/deploy/eck-operator/charts/eck-operator-crds/templates/all-crds-legacy.yaml b/deploy/eck-operator/charts/eck-operator-crds/templates/all-crds-legacy.yaml
diff --git a/deploy/eck-operator/charts/eck-operator-crds/templates/all-crds.yaml b/deploy/eck-operator/charts/eck-operator-crds/templates/all-crds.yaml
diff --git a/docs/reference/dependencies.asciidoc b/docs/reference/dependencies.asciidoc
@@ -50,12 +50,12 @@ This page lists the third-party dependencies used to build {n}.
 | link:https://golang.org/x/crypto[$$golang.org/x/crypto$$] | v0.0.0-20210220033148-5ea612d1eb83 | BSD-3-Clause
 | link:https://gopkg.in/yaml.v2[$$gopkg.in/yaml.v2$$] | v2.4.0 | Apache-2.0
 | link:https://gopkg.in/yaml.v3[$$gopkg.in/yaml.v3$$] | v3.0.0-20210107192922-496545a6307b | MIT
-| link:https://github.com/kubernetes/api[$$k8s.io/api$$] | v0.21.3 | Apache-2.0
-| link:https://github.com/kubernetes/apimachinery[$$k8s.io/apimachinery$$] | v0.21.3 | Apache-2.0
-| link:https://github.com/kubernetes/client-go[$$k8s.io/client-go$$] | v0.21.3 | Apache-2.0
+| link:https://github.com/kubernetes/api[$$k8s.io/api$$] | v0.22.1 | Apache-2.0
+| link:https://github.com/kubernetes/apimachinery[$$k8s.io/apimachinery$$] | v0.22.1 | Apache-2.0
+| link:https://github.com/kubernetes/client-go[$$k8s.io/client-go$$] | v0.22.1 | Apache-2.0
 | link:https://github.com/kubernetes/klog[$$k8s.io/klog/v2$$] | v2.10.0 | Apache-2.0
-| link:https://github.com/kubernetes/utils[$$k8s.io/utils$$] | v0.0.0-20210722164352-7f3ee0f31471 | Apache-2.0
-| link:https://sigs.k8s.io/controller-runtime[$$sigs.k8s.io/controller-runtime$$] | v0.9.6 | Apache-2.0
+| link:https://github.com/kubernetes/utils[$$k8s.io/utils$$] | v0.0.0-20210802155522-efc7438f0176 | Apache-2.0
+| link:https://sigs.k8s.io/controller-runtime[$$sigs.k8s.io/controller-runtime$$] | v0.10.0 | Apache-2.0
 | link:https://sigs.k8s.io/controller-tools[$$sigs.k8s.io/controller-tools$$] | v0.6.2 | Apache-2.0
 |===
 
@@ -87,7 +87,7 @@ This page lists the third-party dependencies used to build {n}.
 | link:https://github.com/fatih/color[$$github.com/fatih/color$$] | v1.12.0 | MIT
 | link:https://github.com/go-logr/zapr[$$github.com/go-logr/zapr$$] | v0.4.0 | Apache-2.0
 | link:https://github.com/gogo/protobuf[$$github.com/gogo/protobuf$$] | v1.3.2 | BSD-3-Clause
-| link:https://github.com/golang/groupcache[$$github.com/golang/groupcache$$] | v0.0.0-20200121045136-8c9f03a8e57e | Apache-2.0
+| link:https://github.com/golang/groupcache[$$github.com/golang/groupcache$$] | v0.0.0-20210331224755-41bb18bfe9da | Apache-2.0
 | link:https://github.com/golang/protobuf[$$github.com/golang/protobuf$$] | v1.5.2 | BSD-3-Clause
 | link:https://github.com/golang/snappy[$$github.com/golang/snappy$$] | v0.0.1 | BSD-3-Clause
 | link:https://github.com/google/gofuzz[$$github.com/google/gofuzz$$] | v1.2.0 | Apache-2.0
@@ -99,17 +99,17 @@ This page lists the third-party dependencies used to build {n}.
 | link:https://github.com/hashicorp/go-retryablehttp[$$github.com/hashicorp/go-retryablehttp$$] | v0.6.6 | MPL-2.0
 | link:https://github.com/hashicorp/go-rootcerts[$$github.com/hashicorp/go-rootcerts$$] | v1.0.2 | MPL-2.0
 | link:https://github.com/hashicorp/go-sockaddr[$$github.com/hashicorp/go-sockaddr$$] | v1.0.2 | MPL-2.0
-| link:https://github.com/hashicorp/golang-lru[$$github.com/hashicorp/golang-lru$$] | v0.5.4 | MPL-2.0
 | link:https://github.com/hashicorp/hcl[$$github.com/hashicorp/hcl$$] | v1.0.0 | MPL-2.0
 | link:https://github.com/hashicorp/vault[$$github.com/hashicorp/vault/sdk$$] | v0.1.14-0.20200519221838-e0cfd64bc267 | MPL-2.0
 | link:https://github.com/huandu/xstrings[$$github.com/huandu/xstrings$$] | v1.3.1 | MIT
 | link:https://github.com/inconshreveable/mousetrap[$$github.com/inconshreveable/mousetrap$$] | v1.0.0 | Apache-2.0
 | link:https://github.com/influxdata/tdigest[$$github.com/influxdata/tdigest$$] | v0.0.1 | Apache-2.0
 | link:https://github.com/joeshaw/multierror[$$github.com/joeshaw/multierror$$] | v0.0.0-20140124173710-69b34d4ec901 | MIT
+| link:https://github.com/josharian/intern[$$github.com/josharian/intern$$] | v1.0.0 | MIT
 | link:https://github.com/json-iterator/go[$$github.com/json-iterator/go$$] | v1.1.11 | MIT
 | link:https://github.com/jtolds/gls[$$github.com/jtolds/gls$$] | v4.20.0+incompatible | MIT
 | link:https://github.com/kr/text[$$github.com/kr/text$$] | v0.2.0 | MIT
-| link:https://github.com/mailru/easyjson[$$github.com/mailru/easyjson$$] | v0.7.0 | MIT
+| link:https://github.com/mailru/easyjson[$$github.com/mailru/easyjson$$] | v0.7.6 | MIT
 | link:https://github.com/mattn/go-colorable[$$github.com/mattn/go-colorable$$] | v0.1.8 | MIT
 | link:https://github.com/mattn/go-isatty[$$github.com/mattn/go-isatty$$] | v0.0.12 | MIT
 | link:https://github.com/matttproud/golang_protobuf_extensions[$$github.com/matttproud/golang_protobuf_extensions$$] | v1.0.2-0.20181231171920-c182affec369 | Apache-2.0
@@ -123,7 +123,7 @@ This page lists the third-party dependencies used to build {n}.
 | link:https://github.com/niemeyer/pretty[$$github.com/niemeyer/pretty$$] | v0.0.0-20200227124842-a10e7caefd8e | MIT
 | link:https://github.com/nxadm/tail[$$github.com/nxadm/tail$$] | v1.4.8 | MIT
 | link:https://github.com/onsi/ginkgo[$$github.com/onsi/ginkgo$$] | v1.16.4 | MIT
-| link:https://github.com/onsi/gomega[$$github.com/onsi/gomega$$] | v1.14.0 | MIT
+| link:https://github.com/onsi/gomega[$$github.com/onsi/gomega$$] | v1.15.0 | MIT
 | link:https://github.com/pelletier/go-toml[$$github.com/pelletier/go-toml$$] | v1.9.3 | Apache-2.0
 | link:https://github.com/pierrec/lz4[$$github.com/pierrec/lz4$$] | v2.0.5+incompatible | BSD-3-Clause
 | link:https://github.com/pmezard/go-difflib[$$github.com/pmezard/go-difflib$$] | v1.0.0 | BSD-3-Clause
@@ -147,9 +147,9 @@ This page lists the third-party dependencies used to build {n}.
 | link:https://golang.org/x/exp[$$golang.org/x/exp$$] | v0.0.0-20200224162631-6cc2880d07d6 | BSD-3-Clause
 | link:https://golang.org/x/lint[$$golang.org/x/lint$$] | v0.0.0-20210508222113-6edffad5e616 | BSD-3-Clause
 | link:https://golang.org/x/mod[$$golang.org/x/mod$$] | v0.4.2 | BSD-3-Clause
-| link:https://golang.org/x/net[$$golang.org/x/net$$] | v0.0.0-20210428140749-89ef3d95e781 | BSD-3-Clause
+| link:https://golang.org/x/net[$$golang.org/x/net$$] | v0.0.0-20210520170846-37e1c6afe023 | BSD-3-Clause
 | link:https://golang.org/x/oauth2[$$golang.org/x/oauth2$$] | v0.0.0-20210402161424-2e8d93401602 | BSD-3-Clause
-| link:https://golang.org/x/sys[$$golang.org/x/sys$$] | v0.0.0-20210630005230-0f9fa26af87c | BSD-3-Clause
+| link:https://golang.org/x/sys[$$golang.org/x/sys$$] | v0.0.0-20210817190340-bfb29a6856f2 | BSD-3-Clause
 | link:https://golang.org/x/term[$$golang.org/x/term$$] | v0.0.0-20210220032956-6a3ed077a48d | BSD-3-Clause
 | link:https://golang.org/x/text[$$golang.org/x/text$$] | v0.3.6 | BSD-3-Clause
 | link:https://golang.org/x/time[$$golang.org/x/time$$] | v0.0.0-20210723032227-1f47c861a9ac | BSD-3-Clause
@@ -165,9 +165,9 @@ This page lists the third-party dependencies used to build {n}.
 | link:https://gopkg.in/square/go-jose.v2[$$gopkg.in/square/go-jose.v2$$] | v2.5.1 | Apache-2.0
 | link:https://gopkg.in/tomb.v1[$$gopkg.in/tomb.v1$$] | v1.0.0-20141024135613-dd632973f1e7 | BSD-3-Clause
 | link:https://gitlab.howett.net/go/plist[$$howett.net/plist$$] | v0.0.0-20181124034731-591f970eefbb | BSD-2-Clause
-| link:https://github.com/kubernetes/apiextensions-apiserver[$$k8s.io/apiextensions-apiserver$$] | v0.21.3 | Apache-2.0
-| link:https://github.com/kubernetes/component-base[$$k8s.io/component-base$$] | v0.21.3 | Apache-2.0
-| link:https://github.com/kubernetes/kube-openapi[$$k8s.io/kube-openapi$$] | v0.0.0-20210305001622-591a79e4bda7 | Apache-2.0
+| link:https://github.com/kubernetes/apiextensions-apiserver[$$k8s.io/apiextensions-apiserver$$] | v0.22.1 | Apache-2.0
+| link:https://github.com/kubernetes/component-base[$$k8s.io/component-base$$] | v0.22.1 | Apache-2.0
+| link:https://github.com/kubernetes/kube-openapi[$$k8s.io/kube-openapi$$] | v0.0.0-20210421082810-95288971da7e | Apache-2.0
 | link:https://sigs.k8s.io/structured-merge-diff/v4[$$sigs.k8s.io/structured-merge-diff/v4$$] | v4.1.2 | Apache-2.0
 | link:https://sigs.k8s.io/yaml[$$sigs.k8s.io/yaml$$] | v1.2.0 | MIT
 |===

diff --git a/go.mod b/go.mod
@@ -40,12 +40,12 @@ require (
 	golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
 	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
-	k8s.io/api v0.21.3
-	k8s.io/apimachinery v0.21.3
-	k8s.io/client-go v0.21.3
+	k8s.io/api v0.22.1
+	k8s.io/apimachinery v0.22.1
+	k8s.io/client-go v0.22.1
 	k8s.io/klog/v2 v2.10.0
-	k8s.io/utils v0.0.0-20210722164352-7f3ee0f31471
-	sigs.k8s.io/controller-runtime v0.9.6
+	k8s.io/utils v0.0.0-20210802155522-efc7438f0176
+	sigs.k8s.io/controller-runtime v0.10.0
 	sigs.k8s.io/controller-tools v0.6.2
 )