Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update go to v1.23.3 #8190

Merged
merged 5 commits into from
Nov 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .buildkite/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:f1709116
CI_IMAGE ?= docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
ROOT_DIR := $(CURDIR)/..
GO_MOUNT_PATH ?= /go/src/github.com/elastic/cloud-on-k8s
export VAULT_ROOT_PATH = secret/ci/elastic-cloud-on-k8s
Expand Down
8 changes: 4 additions & 4 deletions .buildkite/e2e/pipeline-gen/pipeline.tpl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ steps:
machineType: "{{ .KindAgentsMachineType }}"
{{- end }}
{{- else }}
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
memory: "4G"
{{- end }}

Expand Down Expand Up @@ -85,7 +85,7 @@ steps:
machineType: "{{ $.KindAgentsMachineType }}"
{{- end }}
{{- else }}
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
memory: "4G"
{{- end }}

Expand Down Expand Up @@ -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:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
memory: "4G"
{{- else }}
- make -C .buildkite TARGET="run-deployer" ci
Expand All @@ -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:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
memory: "2G"
4 changes: 2 additions & 2 deletions .buildkite/e2e/reporter/templates/notify-failures.tpl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
memory: "2G"

# notify e2e tests failures for the main branch and tags
Expand All @@ -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:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
memory: "2G"

notify:
Expand Down
8 changes: 4 additions & 4 deletions .buildkite/pipeline-e2e-clusters-cleanup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
memory: 2G

- label: ":broom: e2e test cluster cleanup gke"
Expand All @@ -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:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
memory: 2G

- label: ":broom: e2e test cluster cleanup aks"
Expand Down Expand Up @@ -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:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
memory: 2G

- label: ":broom: e2e test cluster cleanup eks-arm"
Expand All @@ -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:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
memory: 2G

- label: ":broom: e2e test cluster cleanup ocp"
Expand Down
6 changes: 3 additions & 3 deletions .buildkite/pipeline-e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ steps:
E2E_PROVIDER: gke
DEF
agents:
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
memory: "2G"

# for nightly builds from main
Expand All @@ -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:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
memory: "2G"

# for all tags
Expand All @@ -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:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
memory: "2G"
10 changes: 5 additions & 5 deletions .buildkite/pipeline-release-helm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
memory: "2G"

- label: "operator dev helm chart"
Expand All @@ -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:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
memory: "2G"

- wait
Expand All @@ -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:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
memory: "2G"

- wait
Expand All @@ -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:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
memory: "2G"

- wait
Expand All @@ -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:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
memory: "2G"
10 changes: 5 additions & 5 deletions .buildkite/pipeline-release-redhat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
memory: "2G"

- label: ":docker: push container"
Expand All @@ -20,7 +20,7 @@ steps:
cd hack/operatorhub
operatorhub container push
agents:
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
memory: "2G"

- label: ":docker: preflight container check"
Expand All @@ -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:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
memory: "2G"

- label: ":docker: publish container"
Expand All @@ -47,7 +47,7 @@ steps:
cd hack/operatorhub
operatorhub container publish
agents:
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
memory: "2G"

- label: ":redhat: generate and create-pr"
Expand All @@ -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:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
memory: "2G"
2 changes: 1 addition & 1 deletion .buildkite/pipeline-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
memory: "2G"

- label: "copy images to dockerhub"
Expand Down
22 changes: 11 additions & 11 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
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:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
cpu: "4"
memory: "2G"

Expand All @@ -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:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
cpu: "4"
memory: "4G"

Expand All @@ -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:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
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:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
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:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
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:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
cpu: "4"
memory: "2G"

Expand Down Expand Up @@ -111,7 +111,7 @@ steps:
E2E_SKIP_CLEANUP: true
DEF
agents:
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
memory: "2G"

# for PR comment
Expand All @@ -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:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
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:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
memory: "2G"

# ----------
Expand All @@ -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:f1709116
image: docker.elastic.co/ci-agent-images/cloud-k8s-operator/buildkite-agent:f5c5fd8b
memory: "2G"
4 changes: 2 additions & 2 deletions build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the operator binary
FROM docker.elastic.co/wolfi/go:1.23.2@sha256:b1f616bb7d0ab68184389e25c702e9a53118ac7c62588511ee6ed9e095f0a847 as builder
FROM docker.elastic.co/wolfi/go:1.23.3@sha256:1c3103d33ae94f5d3b7514a40ac4a804d2b3b8cab6190293abc2d262267410a3 as builder

ARG VERSION
ARG SHA1
Expand Down Expand Up @@ -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:1c785f2145250a80d2d71d2b026276f3358ef3543448500c72206d37ec4ece37
FROM docker.elastic.co/wolfi/static:latest@sha256:561b669256bd2b5a8afed34614e8cb1b98e4e2f66d42ac7a8d80d317d8c8688a

ARG VERSION

Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile-ubi
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the operator binary
FROM docker.elastic.co/wolfi/go:1.23.2@sha256:b1f616bb7d0ab68184389e25c702e9a53118ac7c62588511ee6ed9e095f0a847 as builder
FROM docker.elastic.co/wolfi/go:1.23.3@sha256:1c3103d33ae94f5d3b7514a40ac4a804d2b3b8cab6190293abc2d262267410a3 as builder

ARG VERSION
ARG SHA1
Expand Down
2 changes: 1 addition & 1 deletion hack/manifest-gen/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.elastic.co/wolfi/go:1.23.2@sha256:b1f616bb7d0ab68184389e25c702e9a53118ac7c62588511ee6ed9e095f0a847 as builder
FROM docker.elastic.co/wolfi/go:1.23.3@sha256:1c3103d33ae94f5d3b7514a40ac4a804d2b3b8cab6190293abc2d262267410a3 as builder
ADD . /manifest-gen
WORKDIR /manifest-gen
ENV GO111MODULE=on CGO_ENABLED=0 GOOS=linux
Expand Down
2 changes: 0 additions & 2 deletions hack/manifest-gen/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ module github.com/elastic/cloud-on-k8s/v2/hack/manifest-gen

go 1.22.7

toolchain go1.23.2

require (
github.com/spf13/cobra v1.8.1
helm.sh/helm/v3 v3.16.2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ func (ctx *Context) scaleHorizontally(
var nodeCount int32
for _, recommender := range ctx.Recommenders {
if recommender.HasResourceRecommendation() {
nodeCount = max(nodeCount, recommender.NodeCount(nodeCapacity))
nodeCount = max32(nodeCount, recommender.NodeCount(nodeCapacity))
}
}

Expand All @@ -151,7 +151,7 @@ func (ctx *Context) scaleHorizontally(
return nodeSetsResources
}

func max(a, b int32) int32 {
func max32(a, b int32) int32 {
if a > b {
return a
}
Expand Down
Loading