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

Update supported Kubernetes to v1.29 #57

Merged
merged 8 commits into from
Jun 19, 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
18 changes: 9 additions & 9 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Release
on:
on:
push:
tags:
- 'v*'
Expand All @@ -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
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.runner
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
17 changes: 7 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
16 changes: 8 additions & 8 deletions aqua.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/tilt@v0.33.6
- name: tilt-dev/ctlptl@v0.8.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/tilt@v0.33.17
- name: tilt-dev/ctlptl@v0.8.29
- name: mikefarah/yq@v4.44.2
- name: clamoriniere/crd-to-markdown@v0.0.3
registry: local
2 changes: 1 addition & 1 deletion cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading