Update module sigs.k8s.io/controller-runtime to v0.12.0 (elastic#5662)

* Update module sigs.k8s.io/controller-runtime to v0.12.0 * Run generate * Update Agent template hash in TestReconcileAgent_Reconcile * Use configmapsleases for leader election * RBAC permissions for coordination.v1/lease
fantapsody · Jan 3, 2023 · 3b07f6e · 3b07f6e
1 parent 79f3d7e
commit 3b07f6e
Show file tree

Hide file tree

Showing 16 changed files with 9,130 additions and 7,590 deletions.
diff --git a/NOTICE.txt b/NOTICE.txt
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -474,7 +474,7 @@ func startOperator(ctx context.Context) error {
 		Scheme:                     clientgoscheme.Scheme,
 		CertDir:                    viper.GetString(operator.WebhookCertDirFlag),
 		LeaderElection:             viper.GetBool(operator.EnableLeaderElection),
-		LeaderElectionResourceLock: resourcelock.ConfigMapsResourceLock, // TODO: Revert to ConfigMapsLeases when support for 1.13 is dropped
+		LeaderElectionResourceLock: resourcelock.ConfigMapsLeasesResourceLock, // TODO: use 'lease' after operator is released with 'configmapsleases'
 		LeaderElectionID:           LeaderElectionConfigMapName,
 		LeaderElectionNamespace:    operatorNamespace,
 		Logger:                     log.WithName("eck-operator"),

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/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/deploy/eck-operator/templates/_helpers.tpl b/deploy/eck-operator/templates/_helpers.tpl
@@ -126,6 +126,22 @@ updating docs/operating-eck/eck-permissions.asciidoc file.
   - subjectaccessreviews
   verbs:
   - create
+- apiGroups:
+  - coordination.k8s.io
+  resources:
+  - leases
+  verbs:
+  - create
+- apiGroups:
+  - coordination.k8s.io
+  resources:
+  - leases
+  resourceNames:
+  - elastic-operator-leader
+  verbs:
+  - get
+  - watch
+  - update
 - apiGroups:
   - ""
   resources:

diff --git a/docs/reference/dependencies.asciidoc b/docs/reference/dependencies.asciidoc
@@ -52,12 +52,12 @@ This page lists the third-party dependencies used to build {n}.
 | link:https://golang.org/x/text[$$golang.org/x/text$$] | v0.3.7 | 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.23.6 | Apache-2.0
-| link:https://github.com/kubernetes/apimachinery[$$k8s.io/apimachinery$$] | v0.23.6 | Apache-2.0
-| link:https://github.com/kubernetes/client-go[$$k8s.io/client-go$$] | v0.23.6 | Apache-2.0
+| link:https://github.com/kubernetes/api[$$k8s.io/api$$] | v0.24.0 | Apache-2.0
+| link:https://github.com/kubernetes/apimachinery[$$k8s.io/apimachinery$$] | v0.24.0 | Apache-2.0
+| link:https://github.com/kubernetes/client-go[$$k8s.io/client-go$$] | v0.24.0 | Apache-2.0
 | link:https://github.com/kubernetes/klog[$$k8s.io/klog/v2$$] | v2.60.1 | Apache-2.0
 | link:https://github.com/kubernetes/utils[$$k8s.io/utils$$] | v0.0.0-20220210201930-3a6ce19ff2f9 | Apache-2.0
-| link:https://sigs.k8s.io/controller-runtime[$$sigs.k8s.io/controller-runtime$$] | v0.11.2 | Apache-2.0
+| link:https://sigs.k8s.io/controller-runtime[$$sigs.k8s.io/controller-runtime$$] | v0.12.0 | Apache-2.0
 | link:https://sigs.k8s.io/controller-tools[$$sigs.k8s.io/controller-tools$$] | v0.8.0 | Apache-2.0
 |===
 
@@ -73,8 +73,11 @@ This page lists the third-party dependencies used to build {n}.
 | link:https://cloud.google.com/go/compute[$$cloud.google.com/go/compute$$] | v1.5.0 | Apache-2.0
 | link:https://github.com/Masterminds/goutils[$$github.com/Masterminds/goutils$$] | v1.1.1 | Apache-2.0
 | link:https://github.com/Masterminds/semver[$$github.com/Masterminds/semver/v3$$] | v3.1.1 | MIT
+| link:https://github.com/PuerkitoBio/purell[$$github.com/PuerkitoBio/purell$$] | v1.1.1 | BSD-3-Clause
+| link:https://github.com/PuerkitoBio/urlesc[$$github.com/PuerkitoBio/urlesc$$] | v0.0.0-20170810143723-de5bf2ad4578 | BSD-3-Clause
 | link:https://github.com/armon/go-metrics[$$github.com/armon/go-metrics$$] | v0.3.10 | MIT
 | link:https://github.com/armon/go-radix[$$github.com/armon/go-radix$$] | v1.0.0 | MIT
+| link:https://github.com/armon/go-socks5[$$github.com/armon/go-socks5$$] | v0.0.0-20160902184237-e75332964ef5 | MIT
 | link:https://github.com/benbjohnson/clock[$$github.com/benbjohnson/clock$$] | v1.1.0 | MIT
 | link:https://github.com/beorn7/perks[$$github.com/beorn7/perks$$] | v1.0.1 | MIT
 | link:https://github.com/bmizerany/perks[$$github.com/bmizerany/perks$$] | v0.0.0-20141205001514-d9a9656a3a4b | MIT
@@ -90,18 +93,22 @@ This page lists the third-party dependencies used to build {n}.
 | link:https://github.com/elastic/go-sysinfo[$$github.com/elastic/go-sysinfo$$] | v1.1.1 | Apache-2.0
 | link:https://github.com/elastic/go-windows[$$github.com/elastic/go-windows$$] | v1.0.0 | Apache-2.0
 | link:https://github.com/elazarl/goproxy[$$github.com/elazarl/goproxy$$] | v0.0.0-20190711103511-473e67f1d7d2 | BSD-3-Clause
+| link:https://github.com/emicklei/go-restful[$$github.com/emicklei/go-restful$$] | v2.9.5+incompatible | MIT
 | link:https://github.com/evanphx/json-patch[$$github.com/evanphx/json-patch$$] | v4.12.0+incompatible | BSD-3-Clause
 | link:https://github.com/fatih/color[$$github.com/fatih/color$$] | v1.13.0 | MIT
 | link:https://github.com/fatih/structs[$$github.com/fatih/structs$$] | v1.1.0 | MIT
 | link:https://github.com/frankban/quicktest[$$github.com/frankban/quicktest$$] | v1.13.0 | MIT
 | link:https://github.com/fsnotify/fsnotify[$$github.com/fsnotify/fsnotify$$] | v1.5.1 | BSD-3-Clause
 | link:https://github.com/go-logr/zapr[$$github.com/go-logr/zapr$$] | v1.2.0 | Apache-2.0
+| link:https://github.com/go-openapi/jsonpointer[$$github.com/go-openapi/jsonpointer$$] | v0.19.5 | Apache-2.0
+| link:https://github.com/go-openapi/jsonreference[$$github.com/go-openapi/jsonreference$$] | v0.19.5 | Apache-2.0
+| link:https://github.com/go-openapi/swag[$$github.com/go-openapi/swag$$] | v0.19.14 | 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-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.4 | BSD-3-Clause
+| link:https://github.com/google/gnostic[$$github.com/google/gnostic$$] | v0.5.7-v3refs | Apache-2.0
 | link:https://github.com/google/gofuzz[$$github.com/google/gofuzz$$] | v1.2.0 | Apache-2.0
-| link:https://github.com/googleapis/gnostic[$$github.com/googleapis/gnostic$$] | v0.5.5 | Apache-2.0
 | link:https://github.com/hashicorp/errwrap[$$github.com/hashicorp/errwrap$$] | v1.1.0 | MPL-2.0
 | link:https://github.com/hashicorp/go-cleanhttp[$$github.com/hashicorp/go-cleanhttp$$] | v0.5.2 | MPL-2.0
 | link:https://github.com/hashicorp/go-hclog[$$github.com/hashicorp/go-hclog$$] | v1.2.0 | MIT
@@ -142,11 +149,12 @@ This page lists the third-party dependencies used to build {n}.
 | link:https://github.com/moby/spdystream[$$github.com/moby/spdystream$$] | v0.2.0 | Apache-2.0
 | link:https://github.com/modern-go/concurrent[$$github.com/modern-go/concurrent$$] | v0.0.0-20180306012644-bacd9c7ef1dd | Apache-2.0
 | link:https://github.com/modern-go/reflect2[$$github.com/modern-go/reflect2$$] | v1.0.2 | Apache-2.0
+| link:https://github.com/munnerz/goautoneg[$$github.com/munnerz/goautoneg$$] | v0.0.0-20191010083416-a7dc8b61c822 | BSD-3-Clause
 | 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/oklog/run[$$github.com/oklog/run$$] | v1.0.0 | Apache-2.0
 | link:https://github.com/onsi/ginkgo[$$github.com/onsi/ginkgo$$] | v1.16.5 | MIT
-| link:https://github.com/onsi/gomega[$$github.com/onsi/gomega$$] | v1.17.0 | MIT
+| link:https://github.com/onsi/gomega[$$github.com/onsi/gomega$$] | v1.18.1 | MIT
 | link:https://github.com/opencontainers/go-digest[$$github.com/opencontainers/go-digest$$] | v1.0.0 | Apache-2.0
 | link:https://github.com/opencontainers/image-spec[$$github.com/opencontainers/image-spec$$] | v1.0.2 | Apache-2.0
 | link:https://github.com/pascaldekloe/goe[$$github.com/pascaldekloe/goe$$] | v0.1.0 | Public Domain
@@ -180,7 +188,7 @@ This page lists the third-party dependencies used to build {n}.
 | link:https://golang.org/x/sync[$$golang.org/x/sync$$] | v0.0.0-20210220032951-036812b2e83c | BSD-3-Clause
 | link:https://golang.org/x/sys[$$golang.org/x/sys$$] | v0.0.0-20220412211240-33da011f77ad | BSD-3-Clause
 | link:https://golang.org/x/term[$$golang.org/x/term$$] | v0.0.0-20210927222741-03fcf44c2211 | BSD-3-Clause
-| link:https://golang.org/x/time[$$golang.org/x/time$$] | v0.0.0-20210723032227-1f47c861a9ac | BSD-3-Clause
+| link:https://golang.org/x/time[$$golang.org/x/time$$] | v0.0.0-20220210224613-90d013bbcef8 | BSD-3-Clause
 | link:https://golang.org/x/tools[$$golang.org/x/tools$$] | v0.1.10 | BSD-3-Clause
 | link:https://golang.org/x/xerrors[$$golang.org/x/xerrors$$] | v0.0.0-20220411194840-2f41105eb62f | BSD-3-Clause
 | link:https://gomodules.xyz/jsonpatch/v2[$$gomodules.xyz/jsonpatch/v2$$] | v2.2.0 | Apache-2.0
@@ -196,10 +204,10 @@ This page lists the third-party dependencies used to build {n}.
 | link:https://gopkg.in/tomb.v1[$$gopkg.in/tomb.v1$$] | v1.0.0-20141024135613-dd632973f1e7 | BSD-3-Clause
 | link:https://gotest.tools/v3[$$gotest.tools/v3$$] | v3.0.3 | Apache-2.0
 | 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.23.5 | Apache-2.0
-| link:https://github.com/kubernetes/component-base[$$k8s.io/component-base$$] | v0.23.5 | Apache-2.0
-| link:https://github.com/kubernetes/kube-openapi[$$k8s.io/kube-openapi$$] | v0.0.0-20211115234752-e816edb12b65 | Apache-2.0
-| link:https://sigs.k8s.io/json[$$sigs.k8s.io/json$$] | v0.0.0-20211020170558-c049b76a60c6 | Apache-2.0
+| link:https://github.com/kubernetes/apiextensions-apiserver[$$k8s.io/apiextensions-apiserver$$] | v0.24.0 | Apache-2.0
+| link:https://github.com/kubernetes/component-base[$$k8s.io/component-base$$] | v0.24.0 | Apache-2.0
+| link:https://github.com/kubernetes/kube-openapi[$$k8s.io/kube-openapi$$] | v0.0.0-20220328201542-3ee0da9b0b42 | Apache-2.0
+| link:https://sigs.k8s.io/json[$$sigs.k8s.io/json$$] | v0.0.0-20211208200746-9f7c6b3444d2 | Apache-2.0
 | link:https://sigs.k8s.io/structured-merge-diff/v4[$$sigs.k8s.io/structured-merge-diff/v4$$] | v4.2.1 | Apache-2.0
 | link:https://sigs.k8s.io/yaml[$$sigs.k8s.io/yaml$$] | v1.3.0 | MIT
 |===

diff --git a/go.mod b/go.mod
@@ -39,19 +39,21 @@ require (
 	golang.org/x/text v0.3.7
 	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
-	k8s.io/api v0.23.6
-	k8s.io/apimachinery v0.23.6
-	k8s.io/client-go v0.23.6
+	k8s.io/api v0.24.0
+	k8s.io/apimachinery v0.24.0
+	k8s.io/client-go v0.24.0
 	k8s.io/klog/v2 v2.60.1
 	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
-	sigs.k8s.io/controller-runtime v0.11.2
+	sigs.k8s.io/controller-runtime v0.12.0
 	sigs.k8s.io/controller-tools v0.8.0
 )
 
 require (
 	cloud.google.com/go/compute v1.5.0 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver/v3 v3.1.1 // indirect
+	github.com/PuerkitoBio/purell v1.1.1 // indirect
+	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
 	github.com/armon/go-metrics v0.3.10 // indirect
 	github.com/armon/go-radix v1.0.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
@@ -68,16 +70,20 @@ require (
 	github.com/elastic/go-sysinfo v1.1.1 // indirect
 	github.com/elastic/go-windows v1.0.0 // indirect
 	github.com/elazarl/goproxy v0.0.0-20190711103511-473e67f1d7d2 // indirect
+	github.com/emicklei/go-restful v2.9.5+incompatible // indirect
 	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
 	github.com/fatih/color v1.13.0 // indirect
 	github.com/fsnotify/fsnotify v1.5.1 // indirect
 	github.com/go-logr/zapr v1.2.0 // indirect
+	github.com/go-openapi/jsonpointer v0.19.5 // indirect
+	github.com/go-openapi/jsonreference v0.19.5 // indirect
+	github.com/go-openapi/swag v0.19.14 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
+	github.com/google/gnostic v0.5.7-v3refs // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/googleapis/gnostic v0.5.5 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-hclog v1.2.0 // indirect
@@ -115,6 +121,7 @@ require (
 	github.com/moby/spdystream v0.2.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/oklog/run v1.0.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.0.2 // indirect
@@ -144,7 +151,7 @@ require (
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
 	golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
-	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
+	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
 	golang.org/x/tools v0.1.10 // indirect
 	golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
@@ -156,10 +163,10 @@ require (
 	gopkg.in/ini.v1 v1.66.4 // indirect
 	gopkg.in/square/go-jose.v2 v2.5.1 // indirect
 	howett.net/plist v0.0.0-20181124034731-591f970eefbb // indirect
-	k8s.io/apiextensions-apiserver v0.23.5 // indirect
-	k8s.io/component-base v0.23.5 // indirect
-	k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
-	sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
+	k8s.io/apiextensions-apiserver v0.24.0 // indirect
+	k8s.io/component-base v0.24.0 // indirect
+	k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
+	sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )