Merge pull request #57 from cybozu-go/k8s-1.29

Update supported Kubernetes to v1.29

.github/workflows/ci.yaml

@@ -10,14 +10,14 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - run: make docker-build
   test:
     name: Small tests
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-go@v4
+    - uses: actions/checkout@v4
+    - uses: actions/setup-go@v5
       with:
         go-version-file: go.mod
     - run: make setup
@@ -29,16 +29,16 @@ jobs:
     name: End-to-End Tests
     strategy:
       matrix:
-        k8s-version: ["1.25.8", "1.26.3", "1.27.3"]
+        k8s-version: ["1.27.13", "1.28.9", "1.29.4"]
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-go@v4
+    - uses: actions/checkout@v4
+    - uses: actions/setup-go@v5
       with:
         go-version-file: go.mod
-    - uses: aquaproj/aqua-installer@61e2563dfe7674cbf74fe6ec212e444198a3bb00 #v2.0.2
+    - uses: aquaproj/aqua-installer@4551ec64e21bf0f557c2525135ff0bd2cba40ec7 # v3.0.0
       with:
-        aqua_version: v1.32.3
+        aqua_version: v2.27.3
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     - run: make setup E2ETEST_K8S_VERSION=${{ matrix.k8s-version }}
@@ -50,7 +50,7 @@ jobs:
     - run: make logs
       working-directory: e2e
       if: always()
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       if: always()
       with:
         name: logs-${{ matrix.k8s-version }}.tar.gz

.github/workflows/release.yaml

@@ -1,5 +1,5 @@
 name: Release
-on: 
+on:
   push:
     tags:
       - 'v*'
@@ -8,7 +8,7 @@ jobs:
     name: Push Container image
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: docker/setup-buildx-action@v2
       - run: make docker-build
       - name: Login to ghcr.io
@@ -29,7 +29,7 @@ jobs:
     needs: image
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Create release
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM ghcr.io/cybozu/golang:1.21-jammy as builder
+FROM ghcr.io/cybozu/golang:1.22-jammy as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

Dockerfile.runner

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM ghcr.io/cybozu/golang:1.20-jammy as builder
+FROM ghcr.io/cybozu/golang:1.22-jammy as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
@@ -21,8 +21,8 @@ RUN --mount=type=cache,target=/go/pkg/mod \
 FROM ghcr.io/cybozu/ubuntu:22.04
 LABEL org.opencontainers.image.source https://github.com/cybozu-go/nyamber
 
-ENV GO_VERSION=1.21.3
-ENV PLACEMAT_VERSION=2.4.3
+ENV GO_VERSION=1.22.3
+ENV PLACEMAT_VERSION=2.4.5
 
 ENV HOME=/home/nyamber
 ENV GOPATH=${HOME}/go

Makefile

@@ -24,14 +24,14 @@ STATICCHECK = $(LOCALBIN)/staticcheck
 CRD_TO_MARKDOWN ?= $(LOCALBIN)/crd-to-markdown
 
 ## Tool Versions
-CONTROLLER_TOOLS_VERSION ?= v0.13.0
+CONTROLLER_TOOLS_VERSION ?= v0.15.0
 
-# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. 
+# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 # the kubebuilder version of the ready-to-use can get by "./bin/setup-envtest list" command.
-ENVTEST_K8S_VERSION = 1.27.1
+ENVTEST_K8S_VERSION = 1.29.5
 
 # KUSTOMIZE_VERSION can be found at https://github.com/kubernetes-sigs/kustomize/releases
-KUSTOMIZE_VERSION ?= v5.2.1
+KUSTOMIZE_VERSION ?= v5.4.2
 
 # Setting SHELL to bash allows bash commands to be executed by recipes.
 # This is a requirement for 'setup-envtest.sh' in the test target.
@@ -100,12 +100,9 @@ apidoc: $(wildcard api/*/*_types.go)
 
 ##@ Build
 .PHONY: build
-build: ## Build manager binary.
-	go build -o bin/manager main.go
-
-.PHONY: run
-run: manifests generate fmt vet ## Run a controller from your host.
-	go run ./main.go
+build: generate ## Build all binaries.
+	go build -o $(LOCALBIN)/ -trimpath ./cmd/entrypoint
+	go build -o $(LOCALBIN)/ -trimpath ./cmd/nyamber-controller
 
 .PHONY: docker-build
 docker-build: ## Build docker image with the manager.

README.md

@@ -15,7 +15,7 @@ Nyamber is a custom controller to create Neco environment
 - Create dctest pods on the specified schedule
 
 ## Supported Software
-- Kubernetes: 1.25, 1.26, 1.27
+- Kubernetes: 1.27, 1.28, 1.29
 
 ## Documentation
 

aqua.yaml

@@ -3,17 +3,17 @@
 # https://aquaproj.github.io/
 registries:
 - type: standard
-  ref: v2.28.0 # renovate: depName=aquaproj/aqua-registry
+  ref: v4.195.0 # renovate: depName=aquaproj/aqua-registry
 - type: local
   name: local
   path: registry.yaml
 packages:
-- name: kubernetes/kubectl@v1.27.7
-- name: kubernetes-sigs/kubebuilder@v3.12.0
-- name: kubernetes-sigs/kustomize@kustomize/v5.2.1
-- name: kubernetes-sigs/kind@v0.20.0
-- name: tilt-dev/[email protected].6
-- name: tilt-dev/[email protected].22
-- name: mikefarah/yq@v4.35.2
+- name: kubernetes/kubectl@v1.29.6
+- name: kubernetes-sigs/kubebuilder@v4.0.0
+- name: kubernetes-sigs/kustomize@kustomize/v5.4.2
+- name: kubernetes-sigs/kind@v0.23.0
+- name: tilt-dev/[email protected].17
+- name: tilt-dev/[email protected].29
+- name: mikefarah/yq@v4.44.2
 - name: clamoriniere/[email protected]
   registry: local

cluster.yaml

@@ -7,5 +7,5 @@ apiVersion: ctlptl.dev/v1alpha1
 kind: Cluster
 name: kind-nyamber-dev
 product: kind
-kubernetesVersion: v1.27.3
+kubernetesVersion: v1.29.4
 registry: nyamber-registry