From cc1e1c815775acd1240723f20ed73efcd2690e81 Mon Sep 17 00:00:00 2001 From: "elastic-renovate-prod[bot]" <174716857+elastic-renovate-prod[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 05:28:08 +0000 Subject: [PATCH 1/3] chore(deps): update wolfi (versioned) --- build/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index cb99dc5ef0..50286eeed8 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,5 +1,5 @@ # Build the operator binary -FROM docker.elastic.co/wolfi/go:1.23.1@sha256:aa8c568a6b32f804777fe751d805ddba19e4f83057600aab7b32b0b08ea09462 as builder +FROM docker.elastic.co/wolfi/go:1.23.2@sha256:f338e203c90f7e084b2eb146c91cd1118fa2a79ea1729bf24d793fe5c01987ce 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 docker.elastic.co/wolfi/static:latest@sha256:d2a76860057c1260ea5dc8ae4e18beff5ccfb1b67004295c9ab6951833e93de7 +FROM docker.elastic.co/wolfi/static:latest@sha256:f0444e0c32aa0d22cca6de79e160306e9f24140fea0ac97c41789ee59814aa87 ARG VERSION From 36eb65d5be44e6291923044ecc892425e23554b0 Mon Sep 17 00:00:00 2001 From: Thibault Richard Date: Wed, 9 Oct 2024 14:19:52 +0200 Subject: [PATCH 2/3] Replace docker.io/library/golang:1.23.2 by docker.elastic.co/wolfi/go:1.23.2 for consistency --- build/Dockerfile-ubi | 2 +- hack/manifest-gen/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Dockerfile-ubi b/build/Dockerfile-ubi index 955495e9e6..5e08b6d30a 100644 --- a/build/Dockerfile-ubi +++ b/build/Dockerfile-ubi @@ -1,5 +1,5 @@ # Build the operator binary -FROM docker.io/library/golang:1.23.2 as builder +FROM docker.elastic.co/wolfi/go:1.23.2@sha256:f338e203c90f7e084b2eb146c91cd1118fa2a79ea1729bf24d793fe5c01987ce as builder ARG VERSION ARG SHA1 diff --git a/hack/manifest-gen/Dockerfile b/hack/manifest-gen/Dockerfile index 029b144cde..b4c7085e16 100644 --- a/hack/manifest-gen/Dockerfile +++ b/hack/manifest-gen/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/library/golang:1.23.2 as builder +FROM docker.elastic.co/wolfi/go:1.23.2@sha256:f338e203c90f7e084b2eb146c91cd1118fa2a79ea1729bf24d793fe5c01987ce as builder ADD . /manifest-gen WORKDIR /manifest-gen ENV GO111MODULE=on CGO_ENABLED=0 GOOS=linux From eee59ebf8758d14373a7479a5d66f2c411792263 Mon Sep 17 00:00:00 2001 From: Thibault Richard Date: Wed, 9 Oct 2024 14:21:18 +0200 Subject: [PATCH 3/3] Update buildkite-agent to e808dbe5 (go 1.23.2) --- .buildkite/Makefile | 2 +- .buildkite/e2e/pipeline-gen/pipeline.tpl.yaml | 8 +++---- .../templates/notify-failures.tpl.yml | 4 ++-- .buildkite/pipeline-e2e-clusters-cleanup.yml | 8 +++---- .buildkite/pipeline-e2e-tests.yml | 6 ++--- .buildkite/pipeline-release-helm.yml | 10 ++++----- .buildkite/pipeline-release-redhat.yml | 10 ++++----- .buildkite/pipeline-release.yml | 2 +- .buildkite/pipeline.yml | 22 +++++++++---------- 9 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.buildkite/Makefile b/.buildkite/Makefile index c36aa7b8f3..ae690c9832 100644 --- a/.buildkite/Makefile +++ b/.buildkite/Makefile @@ -4,7 +4,7 @@ # This Makefile is used to run the buildkite agent in virtual machines when Docker access is required. -CI_IMAGE ?= docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d +CI_IMAGE ?= docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 ROOT_DIR := $(CURDIR)/.. GO_MOUNT_PATH ?= /go/src/github.com/elastic/cloud-on-k8s export VAULT_ROOT_PATH = secret/ci/elastic-cloud-on-k8s diff --git a/.buildkite/e2e/pipeline-gen/pipeline.tpl.yaml b/.buildkite/e2e/pipeline-gen/pipeline.tpl.yaml index fa28e338f1..8455ad6a7b 100644 --- a/.buildkite/e2e/pipeline-gen/pipeline.tpl.yaml +++ b/.buildkite/e2e/pipeline-gen/pipeline.tpl.yaml @@ -34,7 +34,7 @@ steps: machineType: "{{ .KindAgentsMachineType }}" {{- end }} {{- else }} - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 memory: "4G" {{- end }} @@ -85,7 +85,7 @@ steps: machineType: "{{ $.KindAgentsMachineType }}" {{- end }} {{- else }} - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 memory: "4G" {{- end }} @@ -121,7 +121,7 @@ steps: {{- if not $test.Dind }} - make run-deployer agents: - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 memory: "4G" {{- else }} - make -C .buildkite TARGET="run-deployer" ci @@ -144,5 +144,5 @@ steps: - ".buildkite/e2e/reporter/*.md" - ".buildkite/e2e/reporter/*.yml" agents: - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 memory: "2G" diff --git a/.buildkite/e2e/reporter/templates/notify-failures.tpl.yml b/.buildkite/e2e/reporter/templates/notify-failures.tpl.yml index e3ae8969b0..af5cb2cbb9 100644 --- a/.buildkite/e2e/reporter/templates/notify-failures.tpl.yml +++ b/.buildkite/e2e/reporter/templates/notify-failures.tpl.yml @@ -4,7 +4,7 @@ steps: - label: "{{ .ShortFailuresCount }} failure(s)" command: exit {{ .ShortFailuresCount }} agents: - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 memory: "2G" # notify e2e tests failures for the main branch and tags @@ -13,7 +13,7 @@ steps: if: build.branch == "main" || build.tag != null command: echo "notify" agents: - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 memory: "2G" notify: diff --git a/.buildkite/pipeline-e2e-clusters-cleanup.yml b/.buildkite/pipeline-e2e-clusters-cleanup.yml index b696d7b819..078c83f58e 100644 --- a/.buildkite/pipeline-e2e-clusters-cleanup.yml +++ b/.buildkite/pipeline-e2e-clusters-cleanup.yml @@ -10,7 +10,7 @@ steps: - make build-deployer - buildkite-agent artifact upload hack/deployer/deployer agents: - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 memory: 2G - label: ":broom: e2e test cluster cleanup gke" @@ -26,7 +26,7 @@ steps: - chmod u+x /usr/local/hack/deployer/deployer - /usr/local/hack/deployer/deployer cleanup --plans-file hack/deployer/config/plans.yml --cluster-prefix $${E2E_TEST_CLUSTER_PREFIX} --config-file deployer-config.yml agents: - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 memory: 2G - label: ":broom: e2e test cluster cleanup aks" @@ -55,7 +55,7 @@ steps: - chmod u+x /usr/local/hack/deployer/deployer - /usr/local/hack/deployer/deployer cleanup --plans-file hack/deployer/config/plans.yml --cluster-prefix $${E2E_TEST_CLUSTER_PREFIX} --config-file deployer-config.yml agents: - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 memory: 2G - label: ":broom: e2e test cluster cleanup eks-arm" @@ -71,7 +71,7 @@ steps: - chmod u+x /usr/local/hack/deployer/deployer - /usr/local/hack/deployer/deployer cleanup --plans-file hack/deployer/config/plans.yml --cluster-prefix $${E2E_TEST_CLUSTER_PREFIX} --config-file deployer-config.yml agents: - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 memory: 2G - label: ":broom: e2e test cluster cleanup ocp" diff --git a/.buildkite/pipeline-e2e-tests.yml b/.buildkite/pipeline-e2e-tests.yml index 1c65bbdd7f..aea79f830c 100644 --- a/.buildkite/pipeline-e2e-tests.yml +++ b/.buildkite/pipeline-e2e-tests.yml @@ -17,7 +17,7 @@ steps: E2E_PROVIDER: gke DEF agents: - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 memory: "2G" # for nightly builds from main @@ -30,7 +30,7 @@ steps: cd .buildkite/e2e/pipeline-gen && go build -o pipeline-gen cat ../nightly-main-matrix.yaml | ./pipeline-gen | buildkite-agent pipeline upload agents: - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 memory: "2G" # for all tags @@ -41,5 +41,5 @@ steps: cd .buildkite/e2e/pipeline-gen && go build -o pipeline-gen cat ../release-branch-matrix.yaml | ./pipeline-gen | buildkite-agent pipeline upload agents: - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 memory: "2G" diff --git a/.buildkite/pipeline-release-helm.yml b/.buildkite/pipeline-release-helm.yml index de97bd8451..9e9c304d60 100644 --- a/.buildkite/pipeline-release-helm.yml +++ b/.buildkite/pipeline-release-helm.yml @@ -10,7 +10,7 @@ steps: - make build - buildkite-agent artifact upload bin/releaser agents: - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 memory: "2G" - label: "operator dev helm chart" @@ -29,7 +29,7 @@ steps: - chmod u+x /usr/local/bin/releaser - releaser --env=dev --charts-dir=deploy/eck-operator agents: - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 memory: "2G" - wait @@ -50,7 +50,7 @@ steps: - chmod u+x /usr/local/bin/releaser - releaser --env=dev --charts-dir=deploy/eck-stack agents: - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 memory: "2G" - wait @@ -68,7 +68,7 @@ steps: - chmod u+x /usr/local/bin/releaser - releaser --env=prod --charts-dir=deploy/eck-operator agents: - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 memory: "2G" - wait @@ -86,5 +86,5 @@ steps: - chmod u+x /usr/local/bin/releaser - releaser --env=prod --charts-dir=deploy/eck-stack agents: - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 memory: "2G" diff --git a/.buildkite/pipeline-release-redhat.yml b/.buildkite/pipeline-release-redhat.yml index 99d25dcc02..c8023d8772 100644 --- a/.buildkite/pipeline-release-redhat.yml +++ b/.buildkite/pipeline-release-redhat.yml @@ -7,7 +7,7 @@ steps: - make build - buildkite-agent artifact upload bin/operatorhub agents: - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 memory: "2G" - label: ":docker: push container" @@ -20,7 +20,7 @@ steps: cd hack/operatorhub operatorhub container push agents: - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 memory: "2G" - label: ":docker: preflight container check" @@ -32,7 +32,7 @@ steps: commands: - .buildkite/scripts/release/redhat-preflight.sh agents: - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 memory: "2G" - label: ":docker: publish container" @@ -47,7 +47,7 @@ steps: cd hack/operatorhub operatorhub container publish agents: - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 memory: "2G" - label: ":redhat: generate and create-pr" @@ -62,5 +62,5 @@ steps: operatorhub generate-manifests operatorhub bundle create-pr agents: - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 memory: "2G" diff --git a/.buildkite/pipeline-release.yml b/.buildkite/pipeline-release.yml index 7f1bddd8b6..52c471ddf9 100644 --- a/.buildkite/pipeline-release.yml +++ b/.buildkite/pipeline-release.yml @@ -10,7 +10,7 @@ steps: commands: - .buildkite/scripts/release/k8s-manifests.sh agents: - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 memory: "2G" - label: "copy images to dockerhub" diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 78cfec3647..c847f3b5d0 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -9,14 +9,14 @@ steps: - label: ":go: lint" command: "make lint check-local-changes" agents: - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 cpu: "6" memory: "7G" - label: ":go: generate" command: "make generate check-local-changes" agents: - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 cpu: "4" memory: "2G" @@ -25,7 +25,7 @@ steps: - "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:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 cpu: "4" memory: "4G" @@ -35,28 +35,28 @@ steps: - label: ":go: unit-tests" command: "make unit-xml" agents: - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 cpu: "4" memory: "4G" - label: ":go: integration-tests" command: "make integration-xml" agents: - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 cpu: "4" memory: "4G" - label: ":go: manifest-gen-tests" command: "make manifest-gen-test" agents: - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 cpu: "4" memory: "2G" - label: ":go: helm-tests" command: "make helm-test" agents: - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 cpu: "4" memory: "2G" @@ -111,7 +111,7 @@ steps: E2E_SKIP_CLEANUP: true DEF agents: - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 memory: "2G" # for PR comment @@ -124,14 +124,14 @@ steps: $$(echo ./pipeline-gen $$GITHUB_PR_COMMENT_VAR_ARGS) \ | buildkite-agent pipeline upload agents: - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 memory: "2G" # for the main branch (merge and nightly) and tags - label: ":buildkite:" command: buildkite-agent pipeline upload .buildkite/pipeline-e2e-tests.yml agents: - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 memory: "2G" # ---------- @@ -141,5 +141,5 @@ steps: - "operator-image-build" command: buildkite-agent pipeline upload .buildkite/pipeline-release.yml agents: - image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:16a56a1d + image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:e808dbe5 memory: "2G"