Merge pull request #16 from cybozu-go/update-versions

update dependencies
cybozu-go · Sep 30, 2022 · 6634059 · 6634059
2 parents 8315333 + ceb6f4a
commit 6634059
Show file tree

Hide file tree

Showing 25 changed files with 410 additions and 239 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -11,68 +11,70 @@ jobs:
     name: Build
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Setup go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
-          go-version: 1.17
+          go-version: 1.19
       - name: Test
         run: make build
   lint:
     name: Lint
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
       - name: Setup go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
-          go-version: 1.17
+          go-version: 1.19
       - name: Lint
         run: make lint
   check-goreleaser-config:
     name: Check goreleaser.yml
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Setup go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
-          go-version: 1.17
-      - uses: goreleaser/goreleaser-action@v2
+          go-version: 1.19
+      - uses: goreleaser/goreleaser-action@ff11ca24a9b39f2d36796d1fbd7a4e39c182630a # v3.1.0
         with:
-          version: latest
+          version: v1.11.4
           args: check -f .goreleaser.yml
   test:
     name: Test
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Setup go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
-          go-version: 1.17
+          go-version: 1.19
       - name: Test
         run: make test
   e2e:
     name: End-to-End Tests
     strategy:
       matrix:
-        k8s-version: ["1.20.7", "1.21.2", "1.22.4"]
+        k8s-version: ["1.22.15", "1.23.12", "1.24.6"]
     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: 1.17
+        go-version: 1.19
     - run: make start KUBERNETES_VERSION=${{ matrix.k8s-version }}
       working-directory: e2e
     - run: make test
       working-directory: e2e
     - 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
@@ -82,22 +84,22 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - uses: docker/setup-qemu-action@v1
-      - uses: docker/setup-buildx-action@v1
+      - uses: docker/setup-qemu-action@v2
+      - uses: docker/setup-buildx-action@v2
       - name: Setup go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
-          go-version: 1.17
+          go-version: 1.19
       - name: Setup tag for goreleaser
         run: |
           echo "GORELEASER_CURRENT_TAG=$(git describe --tags --abbrev=0 --match "v*" || echo v0.0.0)" >> $GITHUB_ENV
       - name: GoReleaser
-        uses: goreleaser/goreleaser-action@v2
+        uses: goreleaser/goreleaser-action@ff11ca24a9b39f2d36796d1fbd7a4e39c182630a # v3.1.0
         with:
-          version: latest
+          version: v1.11.4
           args: --snapshot --skip-publish --rm-dist
       - name: Test built containers
         run: make container-structure-test
diff --git a/.github/workflows/helm-release.yml b/.github/workflows/helm-release.yml
@@ -10,14 +10,14 @@ 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
+          version: v3.10.0
 
       - name: Check chart version
         run: |
@@ -30,7 +30,7 @@ jobs:
       - name: Packaging the chart
         run: helm package ./charts/tenet/
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: helm-charts
           path: ./tenet-*.tgz
@@ -41,16 +41,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
+          version: v3.10.0
 
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: helm-charts
 

diff --git a/.github/workflows/helm.yml b/.github/workflows/helm.yml
@@ -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
+          python-version: "3.10"
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.0.1
+        uses: helm/chart-testing-action@v2.3.0
 
       - name: Run chart-testing (list-changed)
         id: list-changed
@@ -34,10 +34,10 @@ jobs:
         run: ct lint --config ct.yaml
 
       - name: Create kind cluster
-        uses: helm/kind-action@v1.2.0
+        uses: helm/kind-action@v1.4.0
         if: steps.list-changed.outputs.changed == 'true'
         with:
-          node_image: kindest/node:v1.22.4
+          node_image: kindest/node:v1.23.12@sha256:9402cf1330bbd3a0d097d2033fa489b2abe40d479cc5ef47d0b6a6960613148a
 
       - name: Apply cert-manager
         run: |

diff --git a/.github/workflows/mdbook.yaml b/.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
     # do not remove helm chart related files if present
     - run: ls | grep -v -E "index.yaml|.*\.tgz" | xargs rm -rf
-    - uses: actions/download-artifact@v2
+    - uses: actions/download-artifact@v3
       with:
         name: book
     - run: git add .

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,25 +8,25 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - uses: docker/setup-qemu-action@v1
-      - uses: docker/setup-buildx-action@v1
+      - uses: docker/setup-qemu-action@v2
+      - uses: docker/setup-buildx-action@v2
       - name: GHCR Login
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Setup go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
-          go-version: 1.17
+          go-version: 1.19
       - name: GoReleaser
-        uses: goreleaser/goreleaser-action@v2
+        uses: goreleaser/goreleaser-action@ff11ca24a9b39f2d36796d1fbd7a4e39c182630a # v3.1.0
         with:
-          version: latest
+          version: v1.11.4
           args: release --rm-dist
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,11 +1,11 @@
 default_stages: [commit]
 repos:
   - repo: https://github.com/golangci/golangci-lint
-    rev: v1.43.0
+    rev: v1.49.0
     hooks:
       - id: golangci-lint
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v4.3.0
     hooks:
       - id: check-merge-conflict
       - id: check-toml

diff --git a/Makefile b/Makefile
@@ -73,7 +73,7 @@ crds:
 .PHONY: test
 test: manifests generate fmt vet crds setup-envtest ## Run tests.
 	source <($(SETUP_ENVTEST) use -p env); \
-		go test -v -count 1 -race ./controllers -ginkgo.progress -ginkgo.v -ginkgo.failFast -coverprofile controllers-cover.out
+		go test -v -count 1 -race ./controllers -ginkgo.progress -ginkgo.v -ginkgo.fail-fast -coverprofile controllers-cover.out
 	source <($(SETUP_ENVTEST) use -p env); \
 		go test -v -count 1 -race ./hooks -ginkgo.progress -ginkgo.v -coverprofile hooks-cover.out
 
@@ -149,7 +149,7 @@ TMP_DIR=$$(mktemp -d) ;\
 cd $$TMP_DIR ;\
 go mod init tmp ;\
 echo "Downloading $(2)" ;\
-GOBIN=$(PROJECT_DIR)/bin go get $(2) ;\
+GOBIN=$(PROJECT_DIR)/bin go install $(2) ;\
 rm -rf $$TMP_DIR ;\
 }
 endef

diff --git a/Makefile.versions b/Makefile.versions
@@ -1,9 +1,9 @@
-CILIUM_VERSION = v1.11.0
-CERT_MANAGER_VERSION = 1.6.1
-CST_VERSION = 1.10.0
-CTRL_TOOLS_VERSION=0.7.0
-HELM_VERSION = 3.7.1
-KIND_VERSION = 0.11.1
-KUBERNETES_VERSION = 1.22.4
-KUSTOMIZE_VERSION = 4.4.1
-MDBOOK_VERSION = 0.4.10
+CILIUM_VERSION = v1.12.1
+CERT_MANAGER_VERSION = 1.9.1
+CST_VERSION = 1.11.0
+CTRL_TOOLS_VERSION=0.10.0
+HELM_VERSION = 3.10.0
+KIND_VERSION = 0.16.0
+KUBERNETES_VERSION = 1.24.6
+KUSTOMIZE_VERSION = 4.5.7
+MDBOOK_VERSION = 0.4.21
diff --git a/api/v1beta2/groupversion_info.go b/api/v1beta2/groupversion_info.go
@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 // Package v1beta1 contains API Schema definitions for the tenet v1beta1 API group
-//+kubebuilder:object:generate=true
-//+groupName=tenet.cybozu.io
+// +kubebuilder:object:generate=true
+// +groupName=tenet.cybozu.io
 package v1beta2
 
 import (

diff --git a/api/v1beta2/networkpolicytemplate_types.go b/api/v1beta2/networkpolicytemplate_types.go
@@ -21,7 +21,7 @@ import (
 )
 
 // NetworkPolicyTemplateStatus defines the observed state of NetworkPolicyTemplate
-//+kubebuilder:validation:Enum=ok;invalid
+// +kubebuilder:validation:Enum=ok;invalid
 type NetworkPolicyTemplateStatus string
 
 const (

diff --git a/charts/tenet/templates/generated/crds/tenet.cybozu.io_crds.yaml b/charts/tenet/templates/generated/crds/tenet.cybozu.io_crds.yaml
@@ -4,7 +4,7 @@ metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ template "tenet.fullname"
       . }}-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.7.0
+    controller-gen.kubebuilder.io/version: v0.10.0
   labels:
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
     app.kubernetes.io/name: '{{ include "tenet.name" . }}'
@@ -119,20 +119,14 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ template "tenet.fullname"
       . }}-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.7.0
+    controller-gen.kubebuilder.io/version: v0.10.0
   labels:
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'
     app.kubernetes.io/name: '{{ include "tenet.name" . }}'
@@ -203,9 +197,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
diff --git a/config/crd/bases/tenet.cybozu.io_networkpolicyadmissionrules.yaml b/config/crd/bases/tenet.cybozu.io_networkpolicyadmissionrules.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.10.0
   creationTimestamp: null
   name: networkpolicyadmissionrules.tenet.cybozu.io
 spec:
@@ -105,9 +104,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []