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

Support Kubernetes 1.24

.github/workflows/ci.yaml

@@ -5,24 +5,24 @@ on:
     branches:
     - 'main'
 env:
-  go-version: 1.17
+  go-version: 1.18
   cache-version: 1
 jobs:
   build:
     name: Build binaries
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-go@v2
+    - uses: actions/checkout@v3
+    - uses: actions/setup-go@v3
       with:
         go-version: ${{ env.go-version }}
     - run: make release-build
   test:
     name: Small tests
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-go@v2
+    - uses: actions/checkout@v3
+    - uses: actions/setup-go@v3
       with:
         go-version: ${{ env.go-version }}
     - run: make test
@@ -32,11 +32,11 @@ jobs:
     name: End-to-End Tests
     strategy:
       matrix:
-        k8s-version: ["1.20.7", "1.21.2", "1.22.4"]
+        k8s-version: ["1.22.9", "1.23.6", "1.24.0"]
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-go@v2
+    - uses: actions/checkout@v3
+    - uses: actions/setup-go@v3
       with:
         go-version: ${{ env.go-version }}
     - run: make start KUBERNETES_VERSION=${{ matrix.k8s-version }}
@@ -46,7 +46,7 @@ jobs:
     - run: make logs
       working-directory: e2e
       if: always()
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       if: always()
       with:
         name: logs-${{ matrix.k8s-version }}.tar.gz

.github/workflows/helm-release.yaml

@@ -10,12 +10,12 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Set up Helm
-        uses: azure/setup-helm@v1
+        uses: azure/setup-helm@v3
         with:
           version: v3.6.3
 
@@ -32,7 +32,7 @@ jobs:
       - name: Packaging the chart
         run: helm package ./charts/accurate/
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: helm-charts
           path: ./accurate-*.tgz
@@ -43,16 +43,16 @@ jobs:
     runs-on: ubuntu-20.04
     needs: build
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: gh-pages
 
       - name: Set up Helm
-        uses: azure/setup-helm@v1
+        uses: azure/setup-helm@v3
         with:
           version: v3.6.3
 
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: helm-charts
 

.github/workflows/helm.yaml

@@ -12,16 +12,16 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
         with:
           python-version: 3.7
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.0.1
+        uses: helm/chart-testing-action@v2.2.1
 
       - name: Run chart-testing (list-changed)
         id: list-changed
@@ -35,7 +35,7 @@ jobs:
         run: ct lint --config ct.yaml
 
       - name: Create kind cluster
-        uses: helm/kind-action@v1.2.0
+        uses: helm/kind-action@v1.3.0
         if: steps.list-changed.outputs.changed == 'true'
         with:
           node_image: kindest/node:v1.21.2

.github/workflows/mdbook.yaml

@@ -9,9 +9,9 @@ jobs:
     name: Build book
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - run: make book
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: book
         path: docs/book
@@ -21,12 +21,12 @@ jobs:
     runs-on: ubuntu-20.04
     needs: build
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         ref: gh-pages
     # ignore helm chart index file and chart archive file.
     - run: ls | grep -v -E 'index.yaml|accurate-.*\.tgz' | xargs rm -rf
-    - uses: actions/download-artifact@v2
+    - uses: actions/download-artifact@v3
       with:
         name: book
     - run: git add .

.github/workflows/release.yaml

@@ -4,13 +4,13 @@ on:
     tags:
     - 'v*'
 env:
-  go-version: 1.17
+  go-version: 1.18
 jobs:
   image:
     name: Push Container Image
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Build images
       run: |
         docker build -t accurate:dev .
@@ -26,18 +26,19 @@ jobs:
     needs: image
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-go@v2
+    - uses: actions/checkout@v3
+    - uses: actions/setup-go@v3
       with:
         go-version: ${{ env.go-version }}
     - name: GoReleaser
-      uses: goreleaser/goreleaser-action@v2
+      # v3.0.0 https://github.com/goreleaser/goreleaser-action/releases/tag/v3.0.0
+      uses: goreleaser/goreleaser-action@68acf3b1adf004ac9c2f0a4259e85c5f66e99bef
       with:
         distribution: goreleaser
         version: v0.180.3
         args: release --rm-dist
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     - name: Update new version in krew-index
-      # v0.0.40 https://github.com/rajatjindal/krew-release-bot/releases/tag/v0.0.40
-      uses: rajatjindal/krew-release-bot@56925b62bacc2c652114d66a8256faaf0bf89fa9
+      # v0.0.43 https://github.com/rajatjindal/krew-release-bot/releases/tag/v0.0.43
+      uses: rajatjindal/krew-release-bot@92da038bbf995803124a8e50ebd438b2f37bbbb0

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM quay.io/cybozu/golang:1.17-focal as builder
+FROM quay.io/cybozu/golang:1.18-focal as builder
 
 COPY ./ .
 RUN CGO_ENABLED=0 go build -ldflags="-w -s" -o accurate-controller ./cmd/accurate-controller

Makefile

@@ -1,17 +1,16 @@
 # Tool versions
-CTRL_TOOLS_VERSION=0.7.0
+CTRL_TOOLS_VERSION=0.9.2
 CTRL_RUNTIME_VERSION := $(shell awk '/sigs.k8s.io\/controller-runtime/ {print substr($$2, 2)}' go.mod)
-KUSTOMIZE_VERSION = 4.4.1
-YQ_VERSION = 4.17.2
-HELM_VERSION = 3.7.1
+KUSTOMIZE_VERSION = 4.5.5
+YQ_VERSION = 4.26.1
+HELM_VERSION = 3.9.1
 CRD_TO_MARKDOWN_VERSION = 0.0.3
-MDBOOK_VERSION = 0.4.14
-GORELEASER_VERSION = 1.1.0
+MDBOOK_VERSION = 0.4.20
+GORELEASER_VERSION = 1.10.2
 
 # Test tools
 BIN_DIR := $(shell pwd)/bin
 STATICCHECK := $(BIN_DIR)/staticcheck
-NILERR := $(BIN_DIR)/nilerr
 SUDO = sudo
 
 # Set the shell used to bash for better error handling.
@@ -74,9 +73,9 @@ check-generate:
 .PHONY: envtest
 envtest: setup-envtest
 	source <($(SETUP_ENVTEST) use -p env); \
-		TEST_CONFIG=1 go test -v -count 1 -race ./pkg/config -ginkgo.progress -ginkgo.v -ginkgo.failFast
+		TEST_CONFIG=1 go test -v -count 1 -race ./pkg/config -ginkgo.progress -ginkgo.v -ginkgo.fail-fast
 	source <($(SETUP_ENVTEST) use -p env); \
-		go test -v -count 1 -race ./controllers -ginkgo.progress -ginkgo.v -ginkgo.failFast
+		go test -v -count 1 -race ./controllers -ginkgo.progress -ginkgo.v -ginkgo.fail-fast
 	source <($(SETUP_ENVTEST) use -p env); \
 		go test -v -count 1 -race ./hooks -ginkgo.progress -ginkgo.v
 
@@ -87,7 +86,6 @@ test: test-tools
 	go vet ./...
 	test -z $$(gofmt -s -l . | tee /dev/stderr)
 	$(STATICCHECK) ./...
-	$(NILERR) ./...
 
 ##@ Build
 
@@ -171,12 +169,8 @@ GOBIN=$(PROJECT_DIR)/bin go install $(2) ;\
 endef
 
 .PHONY: test-tools
-test-tools: $(STATICCHECK) $(NILERR)
+test-tools: $(STATICCHECK)
 
 $(STATICCHECK):
 	mkdir -p $(BIN_DIR)
 	GOBIN=$(BIN_DIR) go install honnef.co/go/tools/cmd/staticcheck@latest
-
-$(NILERR):
-	mkdir -p $(BIN_DIR)
-	GOBIN=$(BIN_DIR) go install github.com/gostaticanalysis/nilerr/cmd/nilerr@latest

charts/accurate/crds/accurate.cybozu.com_subnamespaces.yaml

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.7.0
+    controller-gen.kubebuilder.io/version: v0.9.2
   labels:
     app.kubernetes.io/name: accurate
   name: subnamespaces.accurate.cybozu.com

config/crd/bases/accurate.cybozu.com_subnamespaces.yaml

@@ -1,10 +1,9 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.7.0
+    controller-gen.kubebuilder.io/version: v0.9.2
   creationTimestamp: null
   name: subnamespaces.accurate.cybozu.com
 spec:
@@ -57,9 +56,3 @@ spec:
         type: object
     served: true
     storage: true
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

config/rbac/role.yaml

@@ -1,4 +1,3 @@
-
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

config/webhook/manifests.yaml

@@ -1,4 +1,3 @@
-
 ---
 apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
@@ -26,7 +25,6 @@ webhooks:
     resources:
     - subnamespaces
   sideEffects: None
-
 ---
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration

controllers/namespace_controller_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/cybozu-go/accurate/pkg/cluster"
 	"github.com/cybozu-go/accurate/pkg/constants"
 	"github.com/cybozu-go/accurate/pkg/indexing"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"

controllers/propagate_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/cybozu-go/accurate/pkg/constants"
 	"github.com/cybozu-go/accurate/pkg/indexing"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"

controllers/subnamespace_controller_test.go

@@ -6,7 +6,7 @@ import (
 
 	accuratev1 "github.com/cybozu-go/accurate/api/v1"
 	"github.com/cybozu-go/accurate/pkg/constants"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"

controllers/suite_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"go.uber.org/zap/zapcore"
 	corev1 "k8s.io/api/core/v1"
@@ -109,7 +109,7 @@ var _ = BeforeSuite(func() {
 	err = k8sClient.Create(context.Background(), ns)
 	Expect(err).NotTo(HaveOccurred())
 
-}, 60)
+})
 
 var _ = AfterSuite(func() {
 	By("tearing down the test environment")

e2e/Makefile

@@ -1,7 +1,7 @@
-KIND_VERSION = 0.11.1
-KUBERNETES_VERSION = 1.22.4
-CERT_MANAGER_VERSION = 1.6.1
-SEALED_SECRETS_VERSION = 0.17.2
+KIND_VERSION = 0.14.0
+KUBERNETES_VERSION = 1.24.0
+CERT_MANAGER_VERSION = 1.8.2
+SEALED_SECRETS_VERSION = 0.18.1
 
 KIND := $(dir $(shell pwd))/bin/kind
 KUBECTL := $(dir $(shell pwd))/bin/kubectl
@@ -43,7 +43,7 @@ start: $(KIND) $(KUBECTL) $(HELM) $(KUBESEAL) $(KUBECTL_ACCURATE)
 .PHONY: test
 test:
 	env PATH=$$(pwd)/../bin:$$PATH RUN_E2E=1 \
-		go test -v -race . -ginkgo.progress -ginkgo.v -ginkgo.failFast
+		go test -v -race . -ginkgo.progress -ginkgo.v -ginkgo.fail-fast
 
 .PHONY: logs
 logs: