diff --git a/dependencies.yaml b/dependencies.yaml index 986982c7dfe..8a80cf89832 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -8,7 +8,7 @@ dependencies: # zeitgeist - name: "zeitgeist" - version: 0.4.4 + version: 0.5.3 refPaths: - path: hack/verify-dependencies.sh match: VERSION=(?P0|[1-9]\d*)\.(?P0|[1-9]\d*)\.(?P0|[1-9]\d*)(?:-(?P(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))? @@ -22,7 +22,7 @@ dependencies: # Golang - name: "golang" - version: 1.22.2 + version: 1.22.3 refPaths: - path: images/build/cross/Makefile match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)? @@ -96,7 +96,7 @@ dependencies: # - v1.100.0-go1.17-bullseye.0 satisfies SemVer regex, while: # - v1.100-go1.17-bullseye.0 does not - name: "Kubernetes version (stable.0)" - version: v1.30.0 + version: v1.31.0 refPaths: - path: images/build/cross/Makefile match: KUBERNETES_VERSION\ \?=\ v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?) @@ -104,7 +104,7 @@ dependencies: match: "KUBERNETES_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'" - name: "Kubernetes version (next candidate.0)" - version: v1.30.0 + version: v1.31.0 refPaths: - path: images/build/cross/variants.yaml match: "KUBERNETES_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'" @@ -117,7 +117,7 @@ dependencies: # go-runner - name: "registry.k8s.io/build-image/go-runner (go1.22-bookworm)" - version: v2.3.1-go1.22.2-bookworm.0 + version: v2.3.1-go1.22.3-bookworm.0 refPaths: - path: images/build/go-runner/variants.yaml match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?) @@ -131,7 +131,7 @@ dependencies: match: REVISION:\ '\d+' - name: "registry.k8s.io/build-image/go-runner (go1.21-bookworm)" - version: v2.3.1-go1.21.9-bookworm.0 + version: v2.3.1-go1.21.10-bookworm.0 refPaths: - path: images/build/go-runner/variants.yaml match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?) @@ -145,8 +145,29 @@ dependencies: match: REVISION:\ '\d+' # kube-cross + - name: "registry.k8s.io/build-image/kube-cross (v1.31-go1.22)" + version: v1.31.0-go1.22.3-bullseye.0 + refPaths: + - path: images/build/cross/variants.yaml + match: "IMAGE_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'" + + - name: "registry.k8s.io/build-image/kube-cross: config variant (v1.31-go1.22)" + version: go1.22-bullseye + refPaths: + - path: images/build/cross/variants.yaml + match: "CONFIG: 'go\\d+.\\d+-bullseye'" + + - name: "registry.k8s.io/build-image/kube-cross: image revision (v1.31-go1.22)" + version: 0 + refPaths: + - path: images/build/cross/Makefile + match: REVISION \?= \d+ + - path: images/build/cross/variants.yaml + match: REVISION:\ '\d+' + + - name: "registry.k8s.io/build-image/kube-cross (v1.30-go1.22)" - version: v1.30.0-go1.22.2-bullseye.0 + version: v1.30.0-go1.22.3-bullseye.0 refPaths: - path: images/build/cross/variants.yaml match: "IMAGE_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'" @@ -166,7 +187,7 @@ dependencies: match: REVISION:\ '\d+' - name: "registry.k8s.io/build-image/kube-cross (v1.29-go1.21)" - version: v1.29.0-go1.21.9-bullseye.0 + version: v1.29.0-go1.21.10-bullseye.0 refPaths: - path: images/build/cross/variants.yaml match: "IMAGE_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'" @@ -186,7 +207,7 @@ dependencies: match: REVISION:\ '\d+' - name: "registry.k8s.io/build-image/kube-cross (v1.28-go1.21)" - version: v1.28.0-go1.21.9-bullseye.0 + version: v1.28.0-go1.21.10-bullseye.0 refPaths: - path: images/build/cross/variants.yaml match: "IMAGE_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'" @@ -206,7 +227,7 @@ dependencies: match: REVISION:\ '\d+' - name: "registry.k8s.io/build-image/kube-cross (v1.27-go1.21)" - version: v1.27.0-go1.21.9-bullseye.0 + version: v1.27.0-go1.21.10-bullseye.0 refPaths: - path: images/build/cross/variants.yaml match: "IMAGE_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'" @@ -281,9 +302,26 @@ dependencies: - path: images/build/cross/variants.yaml match: "CONFIG: 'go\\d+.\\d+-bullseye'" + # Golang (previous release branches: 1.30) + - name: "golang (previous release branches: 1.30)" + version: 1.22.3 + refPaths: + - path: images/build/cross/variants.yaml + match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? + - path: images/build/go-runner/variants.yaml + match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? + - path: images/releng/ci/variants.yaml + match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? + + - name: "golang: after kubernetes/kubernetes update (previous release branches: 1.30)" + version: 1.22.2 + refPaths: + - path: images/releng/k8s-ci-builder/variants.yaml + match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? + # Golang (previous release branches: 1.29) - name: "golang (previous release branches: 1.29)" - version: 1.21.9 + version: 1.21.10 refPaths: - path: images/build/cross/variants.yaml match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? @@ -300,7 +338,7 @@ dependencies: # Golang (previous release branches: 1.28) - name: "golang (previous release branches: 1.28)" - version: 1.21.9 + version: 1.21.10 refPaths: - path: images/build/cross/variants.yaml match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? @@ -323,7 +361,7 @@ dependencies: # Golang (previous release branches: 1.27) - name: "golang (previous release branches: 1.27)" - version: 1.21.9 + version: 1.21.10 refPaths: - path: images/build/cross/variants.yaml match: \d+.\d+(alpha|beta|rc)?\.?(\d+)? diff --git a/hack/verify-dependencies.sh b/hack/verify-dependencies.sh index 1db72061c08..53366c8817e 100755 --- a/hack/verify-dependencies.sh +++ b/hack/verify-dependencies.sh @@ -18,16 +18,30 @@ set -o errexit set -o nounset set -o pipefail -VERSION=0.4.4 +VERSION=0.5.3 REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. BIN_PATH="$REPO_ROOT/bin" ZEITGEIST_BIN="$BIN_PATH/zeitgeist" +# Get the architecture +arch=$(uname -m | tr '[:upper:]' '[:lower:]') +# Convert x86_64 to amd64 +if [ "$arch" = "x86_64" ]; then + arch="amd64" +fi + +# Get the platform +platform=$(uname -s | tr '[:upper:]' '[:lower:]') + +echo "Architecture: $arch" +echo "Platform: $platform" + if [[ ! -f "$ZEITGEIST_BIN" ]]; then + echo "Installing zeitgeist" mkdir -p "$BIN_PATH" curl -sSfL -o "$ZEITGEIST_BIN" \ - https://github.com/kubernetes-sigs/zeitgeist/releases/download/v$VERSION/zeitgeist-amd64-linux + https://github.com/kubernetes-sigs/zeitgeist/releases/download/v$VERSION/zeitgeist-"$arch"-"$platform" chmod +x "$ZEITGEIST_BIN" fi diff --git a/images/build/cross/Makefile b/images/build/cross/Makefile index c442a5e9081..af285eabeb8 100644 --- a/images/build/cross/Makefile +++ b/images/build/cross/Makefile @@ -27,8 +27,8 @@ IMGNAME = kube-cross # Example: # - v1.100.0-go1.17-bullseye.0 satisfies SemVer regex, while: # - v1.100-go1.17-bullseye.0 does not -KUBERNETES_VERSION ?= v1.30.0 -GO_VERSION ?= 1.22.2 +KUBERNETES_VERSION ?= v1.31.0 +GO_VERSION ?= 1.22.3 GO_MAJOR_VERSION ?= 1.22 OS_CODENAME ?= bullseye REVISION ?= 0 diff --git a/images/build/cross/variants.yaml b/images/build/cross/variants.yaml index 07d26fe56ff..06c108bac1b 100644 --- a/images/build/cross/variants.yaml +++ b/images/build/cross/variants.yaml @@ -1,37 +1,46 @@ variants: + v1.31-go1.22-bullseye: + CONFIG: 'go1.22-bullseye' + TYPE: 'default' + IMAGE_VERSION: 'v1.31.0-go1.22.3-bullseye.0' + KUBERNETES_VERSION: 'v1.31.0' + GO_VERSION: '1.22.3' + GO_MAJOR_VERSION: '1.22' + OS_CODENAME: 'bullseye' + REVISION: '0' v1.30-go1.22-bullseye: CONFIG: 'go1.22-bullseye' TYPE: 'default' - IMAGE_VERSION: 'v1.30.0-go1.22.2-bullseye.0' + IMAGE_VERSION: 'v1.30.0-go1.22.3-bullseye.0' KUBERNETES_VERSION: 'v1.30.0' - GO_VERSION: '1.22.2' + GO_VERSION: '1.22.3' GO_MAJOR_VERSION: '1.22' OS_CODENAME: 'bullseye' REVISION: '0' v1.29-go1.21-bullseye: CONFIG: 'go1.21-bullseye' TYPE: 'default' - IMAGE_VERSION: 'v1.29.0-go1.21.9-bullseye.0' + IMAGE_VERSION: 'v1.29.0-go1.21.10-bullseye.0' KUBERNETES_VERSION: 'v1.29.0' - GO_VERSION: '1.21.9' + GO_VERSION: '1.21.10' GO_MAJOR_VERSION: '1.21' OS_CODENAME: 'bullseye' REVISION: '0' v1.28-go1.21-bullseye: CONFIG: 'go1.21-bullseye' TYPE: 'default' - IMAGE_VERSION: 'v1.28.0-go1.21.9-bullseye.0' + IMAGE_VERSION: 'v1.28.0-go1.21.10-bullseye.0' KUBERNETES_VERSION: 'v1.28.0' - GO_VERSION: '1.21.9' + GO_VERSION: '1.21.10' GO_MAJOR_VERSION: '1.21' OS_CODENAME: 'bullseye' REVISION: '0' v1.27-go1.21-bullseye: CONFIG: 'go1.21-bullseye' TYPE: 'default' - IMAGE_VERSION: 'v1.27.0-go1.21.9-bullseye.0' + IMAGE_VERSION: 'v1.27.0-go1.21.10-bullseye.0' KUBERNETES_VERSION: 'v1.27.0' - GO_VERSION: '1.21.9' + GO_VERSION: '1.21.10' GO_MAJOR_VERSION: '1.21' OS_CODENAME: 'bullseye' REVISION: '0' diff --git a/images/build/go-runner/Makefile b/images/build/go-runner/Makefile index 8820a93e0cb..8f50c705ad3 100644 --- a/images/build/go-runner/Makefile +++ b/images/build/go-runner/Makefile @@ -19,7 +19,7 @@ IMGNAME = go-runner APP_VERSION = $(shell cat VERSION) GO_MAJOR_VERSION ?= 1.22 REVISION ?= 0 -GO_VERSION ?= 1.22.2 +GO_VERSION ?= 1.22.3 OS_CODENAME ?= bookworm # Build args diff --git a/images/build/go-runner/variants.yaml b/images/build/go-runner/variants.yaml index 1c364b29f8c..28cf721675b 100644 --- a/images/build/go-runner/variants.yaml +++ b/images/build/go-runner/variants.yaml @@ -1,25 +1,25 @@ variants: go1.22-bookworm: CONFIG: 'go1.22-bookworm' - IMAGE_VERSION: 'v2.3.1-go1.22.2-bookworm.0' + IMAGE_VERSION: 'v2.3.1-go1.22.3-bookworm.0' GO_MAJOR_VERSION: '1.22' OS_CODENAME: 'bookworm' REVISION: '0' - GO_VERSION: '1.22.2' + GO_VERSION: '1.22.3' DISTROLESS_IMAGE: 'static-debian12' go1.21-bookworm: CONFIG: 'go1.21-bookworm' - IMAGE_VERSION: 'v2.3.1-go1.21.9-bookworm.0' + IMAGE_VERSION: 'v2.3.1-go1.21.10-bookworm.0' GO_MAJOR_VERSION: '1.21' OS_CODENAME: 'bookworm' REVISION: '0' - GO_VERSION: '1.21.9' + GO_VERSION: '1.21.10' DISTROLESS_IMAGE: 'static-debian12' go1.21-bullseye: CONFIG: 'go1.21-bullseye' - IMAGE_VERSION: 'v2.3.1-go1.21.9-bullseye.0' + IMAGE_VERSION: 'v2.3.1-go1.21.10-bullseye.0' GO_MAJOR_VERSION: '1.21' OS_CODENAME: 'bullseye' REVISION: '0' - GO_VERSION: '1.21.9' + GO_VERSION: '1.21.10' DISTROLESS_IMAGE: 'static-debian11' diff --git a/images/releng/ci/variants.yaml b/images/releng/ci/variants.yaml index 06dbd2da072..b3cb0609a8a 100644 --- a/images/releng/ci/variants.yaml +++ b/images/releng/ci/variants.yaml @@ -1,11 +1,11 @@ variants: go1.22-bookworm: CONFIG: 'go1.22-bookworm' - GO_VERSION: '1.22.2' + GO_VERSION: '1.22.3' OS_CODENAME: 'bookworm' REVISION: '0' go1.21-bookworm: CONFIG: 'go1.21-bookworm' - GO_VERSION: '1.21.9' + GO_VERSION: '1.21.10' OS_CODENAME: 'bookworm' REVISION: '0'