File tree 6 files changed +35
-35
lines changed
6 files changed +35
-35
lines changed Original file line number Diff line number Diff line change 36
36
- uses : actions/setup-go@v5
37
37
with :
38
38
go-version-file : go.mod
39
- - uses : aquaproj/aqua-installer@4551ec64e21bf0f557c2525135ff0bd2cba40ec7 # v3.0.0
39
+ - uses : aquaproj/aqua-installer@6ce1f8848ec8e61f14d57bd5d7597057a6dd187c # v3.0.1
40
40
with :
41
- aqua_version : v2.27.3
41
+ aqua_version : v2.34.0
42
42
env :
43
43
GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
44
44
- run : make setup E2ETEST_K8S_VERSION=${{ matrix.k8s-version }}
Original file line number Diff line number Diff line change 9
9
runs-on : ubuntu-22.04
10
10
steps :
11
11
- uses : actions/checkout@v4
12
- - uses : docker/setup-buildx-action@v2
12
+ - uses : docker/setup-buildx-action@v3
13
13
- run : make docker-build
14
14
- name : Login to ghcr.io
15
- uses : docker/login-action@v2
15
+ uses : docker/login-action@v3
16
16
with :
17
17
registry : ghcr.io
18
18
username : ${{ github.repository_owner }}
Original file line number Diff line number Diff line change 1
1
# 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
3
3
4
4
WORKDIR /workspace
5
5
# Copy the Go Modules manifests
@@ -20,7 +20,7 @@ COPY pkg/ pkg/
20
20
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o manager cmd/nyamber-controller/main.go
21
21
22
22
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
24
24
25
25
WORKDIR /
26
26
COPY --from=builder /workspace/manager .
Original file line number Diff line number Diff line change 1
1
# 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
3
3
4
4
WORKDIR /workspace
5
5
# Copy the Go Modules manifests
@@ -19,10 +19,10 @@ RUN --mount=type=cache,target=/go/pkg/mod \
19
19
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o entrypoint cmd/entrypoint/main.go
20
20
21
21
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
23
23
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
26
26
27
27
ENV HOME=/home/nyamber
28
28
ENV GOPATH=${HOME}/go
@@ -37,36 +37,36 @@ COPY include-bird /etc/dpkg/dpkg.cfg.d/
37
37
38
38
RUN apt-get update \
39
39
&& apt-get -y install --no-install-recommends \
40
- git \
40
+ bash-completion \
41
+ bird2 \
41
42
build-essential \
43
+ cloud-utils \
44
+ dbus \
45
+ dnsmasq \
46
+ fakeroot \
47
+ freeipmi-tools \
48
+ git \
49
+ iproute2 \
50
+ iptables \
51
+ jq \
52
+ kmod \
42
53
less \
43
- wget \
44
- systemd-container \
54
+ libgpgme11 \
45
55
lldpd \
56
+ lsb-release \
46
57
qemu \
47
58
qemu-kvm \
48
- socat \
59
+ openssh-client \
49
60
picocom \
50
- swtpm \
51
- cloud-utils \
52
- bird2 \
61
+ socat \
53
62
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 \
68
63
sudo \
69
- lsb-release \
64
+ swtpm \
65
+ systemd-container \
66
+ time \
67
+ unzip \
68
+ wget \
69
+ xauth \
70
70
&& rm -rf /var/lib/apt/lists/* \
71
71
&& curl -sSLf https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz | tar -C /usr/local -xzf - \
72
72
&& curl -sfL https://github.com/cybozu-go/placemat/releases/download/v${PLACEMAT_VERSION}/placemat2_${PLACEMAT_VERSION}_amd64.deb -o placemat2_${PLACEMAT_VERSION}_amd64.deb \
Original file line number Diff line number Diff line change @@ -24,14 +24,14 @@ STATICCHECK = $(LOCALBIN)/staticcheck
24
24
CRD_TO_MARKDOWN ?= $(LOCALBIN ) /crd-to-markdown
25
25
26
26
# # Tool Versions
27
- CONTROLLER_TOOLS_VERSION ?= v0.15.0
27
+ CONTROLLER_TOOLS_VERSION ?= v0.16.3
28
28
29
29
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
30
30
# the kubebuilder version of the ready-to-use can get by "./bin/setup-envtest list" command.
31
31
ENVTEST_K8S_VERSION = 1.30.3
32
32
33
33
# 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
35
35
36
36
# Setting SHELL to bash allows bash commands to be executed by recipes.
37
37
# This is a requirement for 'setup-envtest.sh' in the test target.
Original file line number Diff line number Diff line change 1
1
# NOTE: kind version is specified at aqua.yaml
2
2
E2ETEST_K8S_VERSION := 1.30.4
3
- CERT_MANAGER_VERSION := 1.15.0
3
+ CERT_MANAGER_VERSION := 1.15.3
4
4
5
5
PROJECT_DIR := $(CURDIR ) /../
6
6
BIN_DIR := $(PROJECT_DIR ) /bin
You can’t perform that action at this time.
0 commit comments