Merge remote-tracking branch 'origin/main' into renovate/sigs.k8s.io-…

…controller-runtime-0.x
elastic · Sep 26, 2023 · 8ec36fb · 8ec36fb
2 parents 14df6e5 + 3fd0ea8
commit 8ec36fb
Show file tree

Hide file tree

Showing 35 changed files with 249 additions and 252 deletions.
diff --git a/.buildkite/e2e/nightly-main-matrix.yaml b/.buildkite/e2e/nightly-main-matrix.yaml
@@ -21,14 +21,14 @@
   fixed:
     E2E_PROVIDER: kind
   mixed:
-    - DEPLOYER_KIND_NODE_IMAGE: kindest/node:v1.21.14@sha256:9d9eb5fb26b4fbc0c6d95fa8c790414f9750dd583f5d7cee45d92e8c26670aa1
-    - DEPLOYER_KIND_NODE_IMAGE: kindest/node:v1.22.15@sha256:7d9708c4b0873f0fe2e171e2b1b7f45ae89482617778c1c875f1053d4cef2e41
-    - DEPLOYER_KIND_NODE_IMAGE: kindest/node:v1.23.13@sha256:ef453bb7c79f0e3caba88d2067d4196f427794086a7d0df8df4f019d5e336b61 
-    - DEPLOYER_KIND_NODE_IMAGE: kindest/node:v1.24.7@sha256:577c630ce8e509131eab1aea12c022190978dd2f745aac5eb1fe65c0807eb315
-    - DEPLOYER_KIND_NODE_IMAGE: kindest/node:v1.25.3@sha256:f52781bc0d7a19fb6c405c2af83abfeb311f130707a0e219175677e366cc45d1
-    - DEPLOYER_KIND_NODE_IMAGE: kindest/node:v1.26.3@sha256:61b92f38dff6ccc29969e7aa154d34e38b89443af1a2c14e6cfbd2df6419c66f
-    - DEPLOYER_KIND_NODE_IMAGE: kindest/node:v1.27.1@sha256:c44686bf1f422942a21434e5b4070fc47f3c190305be2974f91444cd34909f1b
-    - DEPLOYER_KIND_NODE_IMAGE: kindest/node:v1.27.1@sha256:c44686bf1f422942a21434e5b4070fc47f3c190305be2974f91444cd34909f1b
+    - DEPLOYER_KIND_NODE_IMAGE: kindest/node:v1.22.17@sha256:f5b2e5698c6c9d6d0adc419c0deae21a425c07d81bbf3b6a6834042f25d4fba2
+    - DEPLOYER_KIND_NODE_IMAGE: kindest/node:v1.23.17@sha256:59c989ff8a517a93127d4a536e7014d28e235fb3529d9fba91b3951d461edfdb
+    - DEPLOYER_KIND_NODE_IMAGE: kindest/node:v1.24.15@sha256:7db4f8bea3e14b82d12e044e25e34bd53754b7f2b0e9d56df21774e6f66a70ab
+    - DEPLOYER_KIND_NODE_IMAGE: kindest/node:v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8
+    - DEPLOYER_KIND_NODE_IMAGE: kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb
+    - DEPLOYER_KIND_NODE_IMAGE: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
+    - DEPLOYER_KIND_NODE_IMAGE: kindest/node:v1.28.0@sha256:b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31
+    - DEPLOYER_KIND_NODE_IMAGE: kindest/node:v1.28.0@sha256:b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31
       DEPLOYER_KIND_IP_FAMILY: ipv6
 
 - label: gke

diff --git a/.buildkite/e2e/pipeline-gen/pipeline.tpl.yaml b/.buildkite/e2e/pipeline-gen/pipeline.tpl.yaml
@@ -29,7 +29,7 @@ steps:
     agents:
       {{- if $test.Dind }}
       provider: "gcp"
-      image: "family/elastic-buildkite-agent-ubuntu-2004-lts"
+      image: "family/core-ubuntu-2004"
       {{- if eq $test.Provider "kind" }}
       machineType: "{{ .KindAgentsMachineType }}"
       {{- end }}
@@ -80,7 +80,7 @@ steps:
     agents:
       {{- if $test.Dind }}
       provider: "gcp"
-      image: "family/elastic-buildkite-agent-ubuntu-2004-lts"
+      image: "family/core-ubuntu-2004"
       {{- if eq $test.Provider "kind" }}
       machineType: "{{ $.KindAgentsMachineType }}"
       {{- end }}
@@ -128,7 +128,7 @@ steps:
           - make -C .buildkite TARGET="run-deployer" ci
         agents:
           provider: "gcp"
-          image: "family/elastic-buildkite-agent-ubuntu-2004-lts"
+          image: "family/core-ubuntu-2004"
         {{- end }}
         retry:
           automatic:

diff --git a/.buildkite/pipeline-e2e-clusters-cleanup.yml b/.buildkite/pipeline-e2e-clusters-cleanup.yml
@@ -40,7 +40,7 @@ steps:
       - make -C .buildkite TARGET="run-deployer-cleanup" ci
     agents:
       provider: "gcp"
-      image: "family/elastic-buildkite-agent-ubuntu-2004-lts"
+      image: "family/core-ubuntu-2004"
 
   - label: ":broom: e2e test cluster cleanup eks"
     depends_on:
@@ -85,7 +85,7 @@ steps:
       - make -C .buildkite TARGET="run-deployer-cleanup" ci
     agents:
       provider: "gcp"
-      image: "family/elastic-buildkite-agent-ubuntu-2004-lts"
+      image: "family/core-ubuntu-2004"
 
   - label: ":broom: e2e test cluster cleanup tanzu"
     # this does not depend on building deployer as the make target handles the building.
@@ -98,4 +98,4 @@ steps:
       - make -C .buildkite TARGET="run-deployer-cleanup" ci
     agents:
       provider: "gcp"
-      image: "family/elastic-buildkite-agent-ubuntu-2004-lts"
+      image: "family/core-ubuntu-2004"
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -23,6 +23,7 @@ steps:
       - label: ":go: checks"
         commands:
           - "make check-license-header check-predicates shellcheck reattach-pv"
+          - "make -C hack/helm/release build"
         agents:
           image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:bfddf2b3
           cpu: "4"

diff --git a/NOTICE.txt b/NOTICE.txt
@@ -1700,11 +1700,11 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
 
 --------------------------------------------------------------------------------
 Module  : github.com/hashicorp/vault/api
-Version : v1.9.2
-Time    : 2023-05-26T00:31:45Z
+Version : v1.10.0
+Time    : 2023-09-05T15:27:46Z
 Licence : MPL-2.0
 
-Contents of probable licence file $GOMODCACHE/github.com/hashicorp/vault/api@v1.9.2/LICENSE:
+Contents of probable licence file $GOMODCACHE/github.com/hashicorp/vault/api@v1.10.0/LICENSE:
 
 Copyright (c) 2015 HashiCorp, Inc.
 
@@ -3815,11 +3815,11 @@ THE SOFTWARE.
 
 --------------------------------------------------------------------------------
 Module  : golang.org/x/crypto
-Version : v0.12.0
-Time    : 2023-08-04T16:57:07Z
+Version : v0.13.0
+Time    : 2023-09-05T14:51:56Z
 Licence : BSD-3-Clause
 
-Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.12.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.13.0/LICENSE:
 
 Copyright (c) 2009 The Go Authors. All rights reserved.
 
@@ -3912,11 +3912,11 @@ limitations under the License.
 
 --------------------------------------------------------------------------------
 Module  : k8s.io/api
-Version : v0.28.1
-Time    : 2023-08-24T14:32:25Z
+Version : v0.28.2
+Time    : 2023-09-13T18:28:59Z
 Licence : Apache-2.0
 
-Contents of probable licence file $GOMODCACHE/k8s.io/api@v0.28.1/LICENSE:
+Contents of probable licence file $GOMODCACHE/k8s.io/api@v0.28.2/LICENSE:
 
 
                                  Apache License
@@ -4124,11 +4124,11 @@ Contents of probable licence file $GOMODCACHE/k8s.io/api@v0.28.1/LICENSE:
 
 --------------------------------------------------------------------------------
 Module  : k8s.io/apimachinery
-Version : v0.28.1
-Time    : 2023-08-07T20:18:34Z
+Version : v0.28.2
+Time    : 2023-09-04T10:28:23Z
 Licence : Apache-2.0
 
-Contents of probable licence file $GOMODCACHE/k8s.io/apimachinery@v0.28.1/LICENSE:
+Contents of probable licence file $GOMODCACHE/k8s.io/apimachinery@v0.28.2/LICENSE:
 
 
                                  Apache License
@@ -4336,11 +4336,11 @@ Contents of probable licence file $GOMODCACHE/k8s.io/apimachinery@v0.28.1/LICENS
 
 --------------------------------------------------------------------------------
 Module  : k8s.io/client-go
-Version : v0.28.1
-Time    : 2023-08-24T14:43:46Z
+Version : v0.28.2
+Time    : 2023-09-13T18:39:14Z
 Licence : Apache-2.0
 
-Contents of probable licence file $GOMODCACHE/k8s.io/client-go@v0.28.1/LICENSE:
+Contents of probable licence file $GOMODCACHE/k8s.io/client-go@v0.28.2/LICENSE:
 
 
                                  Apache License
@@ -20146,11 +20146,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 --------------------------------------------------------------------------------
 Module  : golang.org/x/sys
-Version : v0.11.0
-Time    : 2023-07-26T11:14:25Z
+Version : v0.12.0
+Time    : 2023-08-25T20:53:44Z
 Licence : BSD-3-Clause
 
-Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.11.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.12.0/LICENSE:
 
 Copyright (c) 2009 The Go Authors. All rights reserved.
 
@@ -20183,11 +20183,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 --------------------------------------------------------------------------------
 Module  : golang.org/x/term
-Version : v0.11.0
-Time    : 2023-08-04T15:09:51Z
+Version : v0.12.0
+Time    : 2023-09-03T13:08:59Z
 Licence : BSD-3-Clause
 
-Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.11.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.12.0/LICENSE:
 
 Copyright (c) 2009 The Go Authors. All rights reserved.
 
@@ -20220,11 +20220,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 --------------------------------------------------------------------------------
 Module  : golang.org/x/text
-Version : v0.12.0
-Time    : 2023-07-21T21:34:41Z
+Version : v0.13.0
+Time    : 2023-08-28T17:26:32Z
 Licence : BSD-3-Clause
 
-Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.12.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.13.0/LICENSE:
 
 Copyright (c) 2009 The Go Authors. All rights reserved.
 

diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ Current features:
 
 Supported versions:
 
-*  Kubernetes 1.24-1.27
+*  Kubernetes 1.24-1.28
 *  OpenShift 4.9-4.13
 *  Elasticsearch, Kibana, APM Server: 6.8+, 7.1+, 8+
 *  Enterprise Search: 7.7+, 8+

diff --git a/build/Dockerfile b/build/Dockerfile
@@ -1,5 +1,5 @@
 # Build the operator binary
-FROM docker.io/library/golang:1.21.0 as builder
+FROM docker.io/library/golang:1.21.1 as builder
 
 ARG VERSION
 ARG SHA1

diff --git a/build/Dockerfile-ubi b/build/Dockerfile-ubi
@@ -1,5 +1,5 @@
 # Build the operator binary
-FROM docker.io/library/golang:1.21.0 as builder
+FROM docker.io/library/golang:1.21.1 as builder
 
 ARG VERSION
 ARG SHA1
@@ -27,7 +27,7 @@ RUN --mount=type=cache,mode=0755,target=/go/pkg/mod \
 
 # ---------------------------------------------
 # Copy the operator binary into a lighter image
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1037
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1072
 
 # Update the base image packages to the latest versions
 RUN microdnf update --setopt=tsflags=nodocs && microdnf clean all

diff --git a/deploy/eck-operator/values.yaml b/deploy/eck-operator/values.yaml
@@ -244,11 +244,11 @@ podMonitor:
 
 # Globals meant for internal use only
 global:
-  # manifestGen specifies whether the chart is running under manifest generator. 
+  # manifestGen specifies whether the chart is running under manifest generator.
   # This is used for tasks specific to generating the all-in-one.yaml file.
   manifestGen: false
   # createOperatorNamespace defines whether the operator namespace manifest should be generated when in manifestGen mode.
-  # Usually we do want that to happen (e.g. all-in-one.yaml) but, sometimes we don't (e.g. E2E tests). 
+  # Usually we do want that to happen (e.g. all-in-one.yaml) but, sometimes we don't (e.g. E2E tests).
   createOperatorNamespace: true
   # kubeVersion is the effective Kubernetes version we target when generating the all-in-one.yaml.
   kubeVersion: 1.21.0
diff --git a/deploy/eck-stack/charts/eck-elasticsearch/templates/elasticsearch.yaml b/deploy/eck-stack/charts/eck-elasticsearch/templates/elasticsearch.yaml
@@ -51,7 +51,7 @@ spec:
   {{ fail "At least one nodeSet is required" }}
   {{- end }}
   nodeSets:
-{{ toYaml .Values.nodeSets | nindent 4 }}
+    {{ toYaml .Values.nodeSets | nindent 4 }}
   {{- with .Values.image }}
   image: {{ . }}
   {{- end }}

diff --git a/docs/orchestrating-elastic-stack-applications/agent-fleet.asciidoc b/docs/orchestrating-elastic-stack-applications/agent-fleet.asciidoc
@@ -150,6 +150,18 @@ rules:
   - get
   - create
   - update
+- apiGroups: ["apps"]
+  resources:
+  - replicasets
+  verbs:
+  - list
+  - watch
+- apiGroups: ["batch"]
+  resources:
+  - jobs
+  verbs:
+  - list
+  - watch
 ---
 apiVersion: v1
 kind: ServiceAccount

diff --git a/docs/orchestrating-elastic-stack-applications/beat.asciidoc b/docs/orchestrating-elastic-stack-applications/beat.asciidoc
@@ -396,6 +396,20 @@ rules:
   - get
   - list
   - watch
+- apiGroups: ["apps"]
+  resources:
+  - replicasets
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups: ["batch"]
+  resources:
+  - jobs
+  verbs:
+  - get
+  - list
+  - watch
 ----
 
 [id="{p}-beat-deploying-beats-in-secured-clusters"]

diff --git a/docs/reference/dependencies.asciidoc b/docs/reference/dependencies.asciidoc
@@ -33,7 +33,7 @@ This page lists the third-party dependencies used to build {n}.
 | link:https://github.com/google/uuid[$$github.com/google/uuid$$] | v1.3.1 | BSD-3-Clause
 | link:https://github.com/hashicorp/go-multierror[$$github.com/hashicorp/go-multierror$$] | v1.1.1 | MPL-2.0
 | link:https://github.com/hashicorp/golang-lru[$$github.com/hashicorp/golang-lru/v2$$] | v2.0.6 | MPL-2.0
-| link:https://github.com/hashicorp/vault[$$github.com/hashicorp/vault/api$$] | v1.9.2 | MPL-2.0
+| link:https://github.com/hashicorp/vault[$$github.com/hashicorp/vault/api$$] | v1.10.0 | MPL-2.0
 | link:https://github.com/magiconair/properties[$$github.com/magiconair/properties$$] | v1.8.7 | BSD-2-Clause
 | link:https://github.com/pkg/errors[$$github.com/pkg/errors$$] | v0.9.1 | BSD-2-Clause
 | link:https://github.com/pmezard/go-difflib[$$github.com/pmezard/go-difflib$$] | v1.0.0 | BSD-3-Clause
@@ -50,11 +50,11 @@ This page lists the third-party dependencies used to build {n}.
 | link:https://go.elastic.co/apm/v2[$$go.elastic.co/apm/v2$$] | v2.4.4 | Apache-2.0
 | link:https://go.uber.org/automaxprocs[$$go.uber.org/automaxprocs$$] | v1.5.3 | MIT
 | link:https://go.uber.org/zap[$$go.uber.org/zap$$] | v1.25.0 | MIT
-| link:https://golang.org/x/crypto[$$golang.org/x/crypto$$] | v0.12.0 | BSD-3-Clause
+| link:https://golang.org/x/crypto[$$golang.org/x/crypto$$] | v0.13.0 | BSD-3-Clause
 | link:https://gopkg.in/yaml.v3[$$gopkg.in/yaml.v3$$] | v3.0.1 | MIT
-| link:https://github.com/kubernetes/api[$$k8s.io/api$$] | v0.28.1 | Apache-2.0
-| link:https://github.com/kubernetes/apimachinery[$$k8s.io/apimachinery$$] | v0.28.1 | Apache-2.0
-| link:https://github.com/kubernetes/client-go[$$k8s.io/client-go$$] | v0.28.1 | Apache-2.0
+| link:https://github.com/kubernetes/api[$$k8s.io/api$$] | v0.28.2 | Apache-2.0
+| link:https://github.com/kubernetes/apimachinery[$$k8s.io/apimachinery$$] | v0.28.2 | Apache-2.0
+| link:https://github.com/kubernetes/client-go[$$k8s.io/client-go$$] | v0.28.2 | Apache-2.0
 | link:https://github.com/kubernetes/klog[$$k8s.io/klog/v2$$] | v2.100.1 | Apache-2.0
 | link:https://github.com/kubernetes/utils[$$k8s.io/utils$$] | v0.0.0-20230406110748-d93618cff8a2 | Apache-2.0
 | link:https://sigs.k8s.io/controller-runtime[$$sigs.k8s.io/controller-runtime$$] | v0.16.0 | Apache-2.0
@@ -186,9 +186,9 @@ This page lists the third-party dependencies used to build {n}.
 | link:https://golang.org/x/net[$$golang.org/x/net$$] | v0.14.0 | BSD-3-Clause
 | link:https://golang.org/x/oauth2[$$golang.org/x/oauth2$$] | v0.8.0 | BSD-3-Clause
 | link:https://golang.org/x/sync[$$golang.org/x/sync$$] | v0.3.0 | BSD-3-Clause
-| link:https://golang.org/x/sys[$$golang.org/x/sys$$] | v0.11.0 | BSD-3-Clause
-| link:https://golang.org/x/term[$$golang.org/x/term$$] | v0.11.0 | BSD-3-Clause
-| link:https://golang.org/x/text[$$golang.org/x/text$$] | v0.12.0 | BSD-3-Clause
+| link:https://golang.org/x/sys[$$golang.org/x/sys$$] | v0.12.0 | BSD-3-Clause
+| link:https://golang.org/x/term[$$golang.org/x/term$$] | v0.12.0 | BSD-3-Clause
+| link:https://golang.org/x/text[$$golang.org/x/text$$] | v0.13.0 | BSD-3-Clause
 | link:https://golang.org/x/time[$$golang.org/x/time$$] | v0.3.0 | BSD-3-Clause
 | link:https://golang.org/x/tools[$$golang.org/x/tools$$] | v0.12.0 | BSD-3-Clause
 | link:https://gomodules.xyz/jsonpatch/v2[$$gomodules.xyz/jsonpatch/v2$$] | v2.4.0 | Apache-2.0

diff --git a/docs/supported-versions.asciidoc b/docs/supported-versions.asciidoc
@@ -1,4 +1,4 @@
-* Kubernetes 1.24-1.27
+* Kubernetes 1.24-1.28
 * OpenShift 4.9-4.13
 * Google Kubernetes Engine (GKE), Azure Kubernetes Service (AKS), and Amazon Elastic Kubernetes Service (EKS)
 * Helm: 3.2.0+

diff --git a/go.mod b/go.mod
@@ -17,7 +17,7 @@ require (
 	github.com/google/uuid v1.3.1
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/hashicorp/golang-lru/v2 v2.0.6
-	github.com/hashicorp/vault/api v1.9.2
+	github.com/hashicorp/vault/api v1.10.0
 	github.com/magiconair/properties v1.8.7
 	github.com/pkg/errors v0.9.1
 	github.com/pmezard/go-difflib v1.0.0
@@ -34,11 +34,11 @@ require (
 	go.elastic.co/apm/v2 v2.4.4
 	go.uber.org/automaxprocs v1.5.3
 	go.uber.org/zap v1.25.0
-	golang.org/x/crypto v0.12.0
+	golang.org/x/crypto v0.13.0
 	gopkg.in/yaml.v3 v3.0.1
-	k8s.io/api v0.28.1
-	k8s.io/apimachinery v0.28.1
-	k8s.io/client-go v0.28.1
+	k8s.io/api v0.28.2
+	k8s.io/apimachinery v0.28.2
+	k8s.io/client-go v0.28.2
 	k8s.io/klog/v2 v2.100.1
 	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
 	sigs.k8s.io/controller-runtime v0.16.0
@@ -121,9 +121,9 @@ require (
 	golang.org/x/net v0.14.0 // indirect
 	golang.org/x/oauth2 v0.8.0 // indirect
 	golang.org/x/sync v0.3.0 // indirect
-	golang.org/x/sys v0.11.0 // indirect
-	golang.org/x/term v0.11.0 // indirect
-	golang.org/x/text v0.12.0 // indirect
+	golang.org/x/sys v0.12.0 // indirect
+	golang.org/x/term v0.12.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	golang.org/x/tools v0.12.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect