From 10f43afd9c40b67be312917f464147b9869350cb Mon Sep 17 00:00:00 2001 From: 1gtm <1gtm@appscode.com> Date: Sat, 10 Oct 2026 18:44:09 +0000 Subject: [PATCH] Use Go 1.27, k8s 1.37 & debian:13 Signed-off-by: 1gtm <1gtm@appscode.com> --- .github/workflows/ci.yml | 10 +++++----- .github/workflows/update-crds.yml | 4 ++-- Makefile | 6 +++--- apis/appcatalog/v1alpha1/register.go | 6 ++++-- apis/metrics/v1alpha1/register.go | 6 ++++-- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 41780096a..677541ee8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,17 +18,17 @@ jobs: name: Build runs-on: ubuntu-24.04 steps: - - name: Set up Go 1.25 + - name: Set up Go 1.27 uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5.6.0 with: - go-version: '1.25' + go-version: '1.27' id: go - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1 - name: Prepare Host run: | - curl -LO https://dl.k8s.io/release/v1.32.1/bin/linux/amd64/kubectl + curl -LO https://dl.k8s.io/release/v1.37.0/bin/linux/amd64/kubectl chmod +x ./kubectl sudo mv ./kubectl /usr/local/bin/kubectl @@ -42,7 +42,7 @@ jobs: needs: build strategy: matrix: - k8s: [v1.29.14, v1.31.14, v1.33.7, v1.35.0] + k8s: [v1.31.14, v1.33.12, v1.35.8, v1.37.0] steps: - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1 @@ -50,7 +50,7 @@ jobs: id: kind uses: helm/kind-action@ef37e7f390d99f746eb8b610417061a60e82a6cc # v1.14.0 with: - version: v0.31.0 + version: v0.33.0 node_image: kindest/node:${{ matrix.k8s }} - name: Test crds diff --git a/.github/workflows/update-crds.yml b/.github/workflows/update-crds.yml index 586fb0283..a20d11f51 100644 --- a/.github/workflows/update-crds.yml +++ b/.github/workflows/update-crds.yml @@ -10,10 +10,10 @@ jobs: name: Build runs-on: ubuntu-24.04 steps: - - name: Set up Go 1.25 + - name: Set up Go 1.27 uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5.6.0 with: - go-version: '1.25' + go-version: '1.27' id: go - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1 diff --git a/Makefile b/Makefile index 95ff72dae..5414786ae 100644 --- a/Makefile +++ b/Makefile @@ -58,10 +58,10 @@ BIN_PLATFORMS := $(DOCKER_PLATFORMS) OS := $(if $(GOOS),$(GOOS),$(shell go env GOOS)) ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH)) -BASEIMAGE_PROD ?= gcr.io/distroless/static-debian12 -BASEIMAGE_DBG ?= debian:12 +BASEIMAGE_PROD ?= gcr.io/distroless/static-debian13 +BASEIMAGE_DBG ?= debian:13 -GO_VERSION ?= 1.25 +GO_VERSION ?= 1.27 BUILD_IMAGE ?= ghcr.io/appscode/golang-dev:$(GO_VERSION) OUTBIN = bin/$(OS)_$(ARCH)/$(BIN) diff --git a/apis/appcatalog/v1alpha1/register.go b/apis/appcatalog/v1alpha1/register.go index 82e3a26ba..88a021885 100644 --- a/apis/appcatalog/v1alpha1/register.go +++ b/apis/appcatalog/v1alpha1/register.go @@ -53,13 +53,15 @@ func Resource(resource string) schema.GroupResource { // Adds the list of known types to api.Scheme. func addKnownTypes(scheme *runtime.Scheme) error { - scheme.AddKnownTypes(SchemeGroupVersion, + scheme.AddKnownTypes( + SchemeGroupVersion, &AppBinding{}, &AppBindingList{}, &StashAddon{}, ) - scheme.AddKnownTypes(SchemeGroupVersion, + scheme.AddKnownTypes( + SchemeGroupVersion, &metav1.Status{}, ) metav1.AddToGroupVersion(scheme, SchemeGroupVersion) diff --git a/apis/metrics/v1alpha1/register.go b/apis/metrics/v1alpha1/register.go index 5cd3a2fa4..09c2d16f2 100644 --- a/apis/metrics/v1alpha1/register.go +++ b/apis/metrics/v1alpha1/register.go @@ -53,12 +53,14 @@ func Resource(resource string) schema.GroupResource { // Adds the list of known types to api.Scheme. func addKnownTypes(scheme *runtime.Scheme) error { - scheme.AddKnownTypes(SchemeGroupVersion, + scheme.AddKnownTypes( + SchemeGroupVersion, &MetricsConfiguration{}, &MetricsConfigurationList{}, ) - scheme.AddKnownTypes(SchemeGroupVersion, + scheme.AddKnownTypes( + SchemeGroupVersion, &metav1.Status{}, ) metav1.AddToGroupVersion(scheme, SchemeGroupVersion)