From dd4c7539cb150274a6c5e2ea89a77ca51154e67a Mon Sep 17 00:00:00 2001 From: terashima Date: Wed, 5 Jun 2024 04:47:43 +0000 Subject: [PATCH] Update controller-tools Signed-off-by: terashima --- .github/workflows/ci.yaml | 10 ++--- .github/workflows/release.yml | 4 +- Makefile | 2 +- Makefile.versions | 8 ++-- api/v1beta2/zz_generated.deepcopy.go | 1 - .../generated/crds/tenet.cybozu.io_crds.yaml | 38 ++++++++++++------- ...cybozu.io_networkpolicyadmissionrules.yaml | 19 ++++++---- ...enet.cybozu.io_networkpolicytemplates.yaml | 19 ++++++---- 8 files changed, 60 insertions(+), 41 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7180fe0..2ac353f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -39,9 +39,9 @@ jobs: uses: actions/setup-go@v5 with: go-version-file: go.mod - - uses: goreleaser/goreleaser-action@v5.1.0 + - uses: goreleaser/goreleaser-action@v6.0.0 with: - version: v1.26.2 + version: v2.0.0 args: check -f .goreleaser.yml test: name: Test @@ -95,9 +95,9 @@ jobs: run: | echo "GORELEASER_CURRENT_TAG=$(git describe --tags --abbrev=0 --match "v*" || echo v0.0.0)" >> $GITHUB_ENV - name: GoReleaser - uses: goreleaser/goreleaser-action@v5.1.0 + uses: goreleaser/goreleaser-action@v6.0.0 with: - version: v1.26.2 - args: --snapshot --skip-publish --rm-dist + version: v2.0.0 + args: --snapshot --skip publish --clean - name: Test built containers run: make container-structure-test diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 360429e..3acc31d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,9 +24,9 @@ jobs: with: go-version-file: go.mod - name: GoReleaser - uses: goreleaser/goreleaser-action@v5.1.0 + uses: goreleaser/goreleaser-action@v6.0.0 with: - version: v1.26.2 + version: v2.0.0 args: release --rm-dist env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/Makefile b/Makefile index 3337a4e..e289847 100644 --- a/Makefile +++ b/Makefile @@ -264,7 +264,7 @@ container-structure-test: $(CONTAINER_STRUCTURE_TEST) $(CONTAINER_STRUCTURE_TEST): mkdir -p $(BIN_DIR) - curl -fsL -o $(CONTAINER_STRUCTURE_TEST) https://storage.googleapis.com/container-structure-test/v$(CST_VERSION)/container-structure-test-linux-amd64 + curl -fsL -o $(CONTAINER_STRUCTURE_TEST) https://github.com/GoogleContainerTools/container-structure-test/releases/download/v$(CST_VERSION)/container-structure-test-linux-amd64 chmod +x $(CONTAINER_STRUCTURE_TEST) # usage: get-latest-gh OWNER/REPO diff --git a/Makefile.versions b/Makefile.versions index 1d45180..920fd0f 100644 --- a/Makefile.versions +++ b/Makefile.versions @@ -4,16 +4,16 @@ ACTIONS_SETUP_GO_VERSION := 5 ACTIONS_SETUP_PYTHON_VERSION := 5 ACTIONS_UPLOAD_ARTIFACT_VERSION := 4 AZURE_SETUP_HELM_VERSION := 4 -CILIUM_VERSION := 1.13.7 +CILIUM_VERSION := 1.13.16 CERT_MANAGER_VERSION := 1.14.4 CST_VERSION := 1.18.1 -CTRL_TOOLS_VERSION := 0.11.4 +CTRL_TOOLS_VERSION := 0.14.0 DOCKER_LOGIN_VERSION := 3 DOCKER_SETUP_BUILDX_VERSION := 3 DOCKER_SETUP_QEMU_VERSION := 3 GH_VERSION := 2.34.0 -GORELEASER_VERSION := 1.26.2 -GORELEASER_ACTION_VERSION := 5.1.0 +GORELEASER_VERSION := 2.0.0 +GORELEASER_ACTION_VERSION := 6.0.0 HELM_CHART_TESTING_VESRION := 2.6.1 HELM_CHART_TESTING_HASH := e6669bcd63d7cb57cb4380c33043eebe5d111992 HELM_KIND_VERSION := 1.10.0 diff --git a/api/v1beta2/zz_generated.deepcopy.go b/api/v1beta2/zz_generated.deepcopy.go index d6ff3a7..cbb197f 100644 --- a/api/v1beta2/zz_generated.deepcopy.go +++ b/api/v1beta2/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* Copyright 2021. diff --git a/charts/tenet/templates/generated/crds/tenet.cybozu.io_crds.yaml b/charts/tenet/templates/generated/crds/tenet.cybozu.io_crds.yaml index a88f562..1a5fbf6 100644 --- 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.11.4 + controller-gen.kubebuilder.io/version: v0.14.0 labels: app.kubernetes.io/managed-by: '{{ .Release.Service }}' app.kubernetes.io/name: '{{ include "tenet.name" . }}' @@ -37,14 +37,19 @@ spec: API. properties: apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources type: string kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string metadata: type: object @@ -126,7 +131,7 @@ metadata: annotations: cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ template "tenet.fullname" . }}-serving-cert' - controller-gen.kubebuilder.io/version: v0.11.4 + controller-gen.kubebuilder.io/version: v0.14.0 labels: app.kubernetes.io/managed-by: '{{ .Release.Service }}' app.kubernetes.io/name: '{{ include "tenet.name" . }}' @@ -159,14 +164,19 @@ spec: API. properties: apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources type: string kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string metadata: type: object diff --git a/config/crd/bases/tenet.cybozu.io_networkpolicyadmissionrules.yaml b/config/crd/bases/tenet.cybozu.io_networkpolicyadmissionrules.yaml index 5c7c3d8..bdac022 100644 --- a/config/crd/bases/tenet.cybozu.io_networkpolicyadmissionrules.yaml +++ b/config/crd/bases/tenet.cybozu.io_networkpolicyadmissionrules.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.4 + controller-gen.kubebuilder.io/version: v0.14.0 name: networkpolicyadmissionrules.tenet.cybozu.io spec: group: tenet.cybozu.io @@ -21,14 +21,19 @@ spec: API. properties: apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources type: string kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string metadata: type: object diff --git a/config/crd/bases/tenet.cybozu.io_networkpolicytemplates.yaml b/config/crd/bases/tenet.cybozu.io_networkpolicytemplates.yaml index fb5152f..941037f 100644 --- a/config/crd/bases/tenet.cybozu.io_networkpolicytemplates.yaml +++ b/config/crd/bases/tenet.cybozu.io_networkpolicytemplates.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.4 + controller-gen.kubebuilder.io/version: v0.14.0 name: networkpolicytemplates.tenet.cybozu.io spec: group: tenet.cybozu.io @@ -21,14 +21,19 @@ spec: API. properties: apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources type: string kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string metadata: type: object