From 3760ed232569b907726a0abda4470a5cea35d118 Mon Sep 17 00:00:00 2001 From: anhoder Date: Fri, 26 Nov 2021 13:56:54 +0800 Subject: [PATCH 1/2] fix: generate manifests --- Makefile | 14 ++++---------- hack/generate_manifests.sh | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 10 deletions(-) create mode 100755 hack/generate_manifests.sh diff --git a/Makefile b/Makefile index dfc608fb9..932a2795a 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,7 @@ CRD_OPTIONS ?= "crd:trivialVersions=true" GV="network:v1alpha1 servicemesh:v1alpha2 tenant:v1alpha1 tenant:v1alpha2 devops:v1alpha1 iam:v1alpha2 devops:v1alpha3 cluster:v1alpha1 storage:v1alpha1 auditing:v1alpha1 types:v1beta1 quota:v1alpha2 application:v1alpha1 notification:v2beta1" +MANIFESTS="application/* cluster/* devops/* iam/* network/v1alpha1 quota/* storage/* tenant/*" # App Version APP_VERSION = v3.2.0 @@ -55,7 +56,7 @@ binary: | ks-apiserver ks-controller-manager; $(info $(M)...Build all of binary. # Build ks-apiserver binary ks-apiserver: ; $(info $(M)...Begin to build ks-apiserver binary.) @ ## Build ks-apiserver. - hack/gobuild.sh cmd/ks-apiserver; + hack/gobuild.sh cmd/ks-apiserver; # Build ks-controller-manager binary ks-controller-manager: ; $(info $(M)...Begin to build ks-controller-manager binary.) @ ## Build ks-controller-manager. @@ -72,7 +73,7 @@ e2e: ;$(info $(M)...Begin to build e2e binary.) @ ## Build e2e binary. kind-e2e: ;$(info $(M)...Run e2e test.) @ ## Run e2e test in kind. hack/kind_e2e.sh -# Run go fmt against code +# Run go fmt against code fmt: ;$(info $(M)...Begin to run go fmt against code.) @ ## Run go fmt against code. gofmt -w ./pkg ./cmd ./tools ./api @@ -86,14 +87,7 @@ vet: ;$(info $(M)...Begin to run go vet against code.) @ ## Run go vet against # Generate manifests e.g. CRD, RBAC etc. manifests: ;$(info $(M)...Begin to generate manifests e.g. CRD, RBAC etc..) @ ## Generate manifests e.g. CRD, RBAC etc. - go run ./vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go object:headerFile=./hack/boilerplate.go.txt paths=kubesphere.io/api/application/... rbac:roleName=controller-perms ${CRD_OPTIONS} output:crd:artifacts:config=config/crds - go run ./vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go object:headerFile=./hack/boilerplate.go.txt paths=kubesphere.io/api/cluster/... rbac:roleName=controller-perms ${CRD_OPTIONS} output:crd:artifacts:config=config/crds - go run ./vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go object:headerFile=./hack/boilerplate.go.txt paths=kubesphere.io/api/devops/... rbac:roleName=controller-perms ${CRD_OPTIONS} output:crd:artifacts:config=config/crds - go run ./vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go object:headerFile=./hack/boilerplate.go.txt paths=kubesphere.io/api/iam/... rbac:roleName=controller-perms ${CRD_OPTIONS} output:crd:artifacts:config=config/crds - go run ./vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go object:headerFile=./hack/boilerplate.go.txt paths=kubesphere.io/api/network/v1alpha1/... rbac:roleName=controller-perms ${CRD_OPTIONS} output:crd:artifacts:config=config/crds - go run ./vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go object:headerFile=./hack/boilerplate.go.txt paths=kubesphere.io/api/quota/... rbac:roleName=controller-perms ${CRD_OPTIONS} output:crd:artifacts:config=config/crds - go run ./vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go object:headerFile=./hack/boilerplate.go.txt paths=kubesphere.io/api/storage/... rbac:roleName=controller-perms ${CRD_OPTIONS} output:crd:artifacts:config=config/crds - go run ./vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go object:headerFile=./hack/boilerplate.go.txt paths=kubesphere.io/api/tenant/... rbac:roleName=controller-perms ${CRD_OPTIONS} output:crd:artifacts:config=config/crds + hack/generate_manifests.sh ${CRD_OPTIONS} ${MANIFESTS} deploy: manifests ;$(info $(M)...Begin to deploy.) @ ## Deploy. kubectl apply -f config/crds diff --git a/hack/generate_manifests.sh b/hack/generate_manifests.sh new file mode 100755 index 000000000..9fbf4c9ab --- /dev/null +++ b/hack/generate_manifests.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +set -ex + +CRD_OPTIONS="$1" +PKGS="$2" +IFS=" " read -r -a PKGS <<< "${PKGS}" + +KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. +cd "${KUBE_ROOT}" || exit + +for PKG in "${PKGS[@]}"; do + echo "Generating manifests for ${PKG}" + if [[ "$PKG" =~ /\*$ ]]; then + PKG=${PKG%??} + DIR=$(go list -e -test=false -export=false -deps=false -find=false -tags ignore_autogenerated -f "{{.Dir}}" "kubesphere.io/api/${PKG}") + # shellcheck disable=SC2010 + ls -1 -F "${DIR}" | grep '/$' | xargs -n 1 -I{} go run ./vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go object:headerFile=./hack/boilerplate.go.txt paths=kubesphere.io/api/"${PKG}"/{} rbac:roleName=controller-perms "${CRD_OPTIONS}" output:crd:artifacts:config=config/crds + else + go run ./vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go object:headerFile=./hack/boilerplate.go.txt paths=kubesphere.io/api/"${PKG}" rbac:roleName=controller-perms "${CRD_OPTIONS}" output:crd:artifacts:config=config/crds + fi +done From f6c1261900839f797c143f996e8938c254b2585a Mon Sep 17 00:00:00 2001 From: anhoder Date: Mon, 29 Nov 2021 18:16:45 +0800 Subject: [PATCH 2/2] rm: devops --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 932a2795a..4211d4e3a 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ CRD_OPTIONS ?= "crd:trivialVersions=true" GV="network:v1alpha1 servicemesh:v1alpha2 tenant:v1alpha1 tenant:v1alpha2 devops:v1alpha1 iam:v1alpha2 devops:v1alpha3 cluster:v1alpha1 storage:v1alpha1 auditing:v1alpha1 types:v1beta1 quota:v1alpha2 application:v1alpha1 notification:v2beta1" -MANIFESTS="application/* cluster/* devops/* iam/* network/v1alpha1 quota/* storage/* tenant/*" +MANIFESTS="application/* cluster/* iam/* network/v1alpha1 quota/* storage/* tenant/*" # App Version APP_VERSION = v3.2.0