Skip to content

Commit 4d507c7

Browse files
Bump tool versions
1 parent e219938 commit 4d507c7

File tree

6 files changed

+35
-35
lines changed

6 files changed

+35
-35
lines changed

.github/workflows/ci.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ jobs:
3636
- uses: actions/setup-go@v5
3737
with:
3838
go-version-file: go.mod
39-
- uses: aquaproj/aqua-installer@4551ec64e21bf0f557c2525135ff0bd2cba40ec7 # v3.0.0
39+
- uses: aquaproj/aqua-installer@6ce1f8848ec8e61f14d57bd5d7597057a6dd187c # v3.0.1
4040
with:
41-
aqua_version: v2.27.3
41+
aqua_version: v2.34.0
4242
env:
4343
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4444
- run: make setup E2ETEST_K8S_VERSION=${{ matrix.k8s-version }}

.github/workflows/release.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ jobs:
99
runs-on: ubuntu-22.04
1010
steps:
1111
- uses: actions/checkout@v4
12-
- uses: docker/setup-buildx-action@v2
12+
- uses: docker/setup-buildx-action@v3
1313
- run: make docker-build
1414
- name: Login to ghcr.io
15-
uses: docker/login-action@v2
15+
uses: docker/login-action@v3
1616
with:
1717
registry: ghcr.io
1818
username: ${{ github.repository_owner }}

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM ghcr.io/cybozu/golang:1.22-jammy as builder
2+
FROM ghcr.io/cybozu/golang:1.23-jammy as builder
33

44
WORKDIR /workspace
55
# Copy the Go Modules manifests
@@ -20,7 +20,7 @@ COPY pkg/ pkg/
2020
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o manager cmd/nyamber-controller/main.go
2121

2222
FROM ghcr.io/cybozu/ubuntu:22.04
23-
LABEL org.opencontainers.image.source https://github.com/cybozu-go/nyamber
23+
LABEL org.opencontainers.image.source=https://github.com/cybozu-go/nyamber
2424

2525
WORKDIR /
2626
COPY --from=builder /workspace/manager .

Dockerfile.runner

+26-26
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM ghcr.io/cybozu/golang:1.22-jammy as builder
2+
FROM ghcr.io/cybozu/golang:1.23-jammy as builder
33

44
WORKDIR /workspace
55
# Copy the Go Modules manifests
@@ -19,10 +19,10 @@ RUN --mount=type=cache,target=/go/pkg/mod \
1919
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o entrypoint cmd/entrypoint/main.go
2020

2121
FROM ghcr.io/cybozu/ubuntu:22.04
22-
LABEL org.opencontainers.image.source https://github.com/cybozu-go/nyamber
22+
LABEL org.opencontainers.image.source=https://github.com/cybozu-go/nyamber
2323

24-
ENV GO_VERSION=1.22.3
25-
ENV PLACEMAT_VERSION=2.4.5
24+
ENV GO_VERSION=1.23.1
25+
ENV PLACEMAT_VERSION=2.4.6
2626

2727
ENV HOME=/home/nyamber
2828
ENV GOPATH=${HOME}/go
@@ -37,36 +37,36 @@ COPY include-bird /etc/dpkg/dpkg.cfg.d/
3737

3838
RUN apt-get update \
3939
&& apt-get -y install --no-install-recommends \
40-
git \
40+
bash-completion \
41+
bird2 \
4142
build-essential \
43+
cloud-utils \
44+
dbus \
45+
dnsmasq \
46+
fakeroot \
47+
freeipmi-tools \
48+
git \
49+
iproute2 \
50+
iptables \
51+
jq \
52+
kmod \
4253
less \
43-
wget \
44-
systemd-container \
54+
libgpgme11 \
4555
lldpd \
56+
lsb-release \
4657
qemu \
4758
qemu-kvm \
48-
socat \
59+
openssh-client \
4960
picocom \
50-
swtpm \
51-
cloud-utils \
52-
bird2 \
61+
socat \
5362
squid \
54-
dnsmasq \
55-
xauth \
56-
bash-completion \
57-
dbus \
58-
jq \
59-
libgpgme11 \
60-
freeipmi-tools \
61-
unzip \
62-
fakeroot \
63-
time \
64-
kmod \
65-
iptables \
66-
iproute2 \
67-
openssh-client \
6863
sudo \
69-
lsb-release \
64+
swtpm \
65+
systemd-container \
66+
time \
67+
unzip \
68+
wget \
69+
xauth \
7070
&& rm -rf /var/lib/apt/lists/* \
7171
&& curl -sSLf https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz | tar -C /usr/local -xzf - \
7272
&& curl -sfL https://github.com/cybozu-go/placemat/releases/download/v${PLACEMAT_VERSION}/placemat2_${PLACEMAT_VERSION}_amd64.deb -o placemat2_${PLACEMAT_VERSION}_amd64.deb \

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ STATICCHECK = $(LOCALBIN)/staticcheck
2424
CRD_TO_MARKDOWN ?= $(LOCALBIN)/crd-to-markdown
2525

2626
## Tool Versions
27-
CONTROLLER_TOOLS_VERSION ?= v0.15.0
27+
CONTROLLER_TOOLS_VERSION ?= v0.16.3
2828

2929
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
3030
# the kubebuilder version of the ready-to-use can get by "./bin/setup-envtest list" command.
3131
ENVTEST_K8S_VERSION = 1.30.3
3232

3333
# KUSTOMIZE_VERSION can be found at https://github.com/kubernetes-sigs/kustomize/releases
34-
KUSTOMIZE_VERSION ?= v5.4.2
34+
KUSTOMIZE_VERSION ?= v5.4.3
3535

3636
# Setting SHELL to bash allows bash commands to be executed by recipes.
3737
# This is a requirement for 'setup-envtest.sh' in the test target.

e2e/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# NOTE: kind version is specified at aqua.yaml
22
E2ETEST_K8S_VERSION := 1.30.4
3-
CERT_MANAGER_VERSION := 1.15.0
3+
CERT_MANAGER_VERSION := 1.15.3
44

55
PROJECT_DIR := $(CURDIR)/../
66
BIN_DIR := $(PROJECT_DIR)/bin

0 commit comments

Comments
 (0)