From 209813eed9212e92e65f9fec34e8f2a67160212f Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong(cubxxw)" <3293172751nss@gmail.com> Date: Mon, 3 Apr 2023 11:13:12 +0800 Subject: [PATCH] Remove some irrelevant directories Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> --- Makefile | 3 --- scripts/make-rules/ca.mk | 26 ------------------------ scripts/make-rules/deploy.mk | 37 ----------------------------------- scripts/make-rules/release.mk | 33 ------------------------------- scripts/make-rules/swagger.mk | 26 ------------------------ 5 files changed, 125 deletions(-) delete mode 100644 scripts/make-rules/ca.mk delete mode 100644 scripts/make-rules/deploy.mk delete mode 100644 scripts/make-rules/release.mk delete mode 100644 scripts/make-rules/swagger.mk diff --git a/Makefile b/Makefile index 36cb5bf50b0..1e260029b8a 100644 --- a/Makefile +++ b/Makefile @@ -42,9 +42,6 @@ include scripts/make-rules/golang.mk include scripts/make-rules/image.mk include scripts/make-rules/copyright.mk include scripts/make-rules/gen.mk -include scripts/make-rules/ca.mk -include scripts/make-rules/release.mk -include scripts/make-rules/swagger.mk include scripts/make-rules/dependencies.mk include scripts/make-rules/tools.mk diff --git a/scripts/make-rules/ca.mk b/scripts/make-rules/ca.mk deleted file mode 100644 index fc355e4524b..00000000000 --- a/scripts/make-rules/ca.mk +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright © 2022 Alibaba Group Holding Ltd. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# ============================================================================== -# Makefile helper functions for create CA files -# - -.PHONY: ca.gen.% -ca.gen.%: - $(eval CA := $(word 1,$(subst ., ,$*))) - @echo "===========> Generating CA files for $(CA)" - @${ROOT_DIR}/scripts/gencerts.sh generate-iam-cert $(OUTPUT_DIR)/cert $(CA) - -.PHONY: ca.gen -ca.gen: $(addprefix ca.gen., $(CERTIFICATES)) diff --git a/scripts/make-rules/deploy.mk b/scripts/make-rules/deploy.mk deleted file mode 100644 index b8b97c78979..00000000000 --- a/scripts/make-rules/deploy.mk +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright © 2022 Alibaba Group Holding Ltd. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# ============================================================================== -# Makefile helper functions for deploy to developer env -# - -KUBECTL := kubectl -NAMESPACE ?= iam -CONTEXT ?= marmotedu.dev - -DEPLOYS=iam-apiserver iam-authz-server iam-pump iam-watcher - -.PHONY: deploy.run.all -deploy.run.all: - @echo "===========> Deploying all" - @$(MAKE) deploy.run - -.PHONY: deploy.run -deploy.run: $(addprefix deploy.run., $(DEPLOYS)) - -.PHONY: deploy.run.% -deploy.run.%: - $(eval ARCH := $(word 2,$(subst _, ,$(PLATFORM)))) - @echo "===========> Deploying $* $(VERSION)-$(ARCH)" - echo @$(KUBECTL) -n $(NAMESPACE) --context=$(CONTEXT) set image deployment/$* $*=$(REGISTRY_PREFIX)/$*-$(ARCH):$(VERSION) diff --git a/scripts/make-rules/release.mk b/scripts/make-rules/release.mk deleted file mode 100644 index 4ffe9e7b05d..00000000000 --- a/scripts/make-rules/release.mk +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright © 2022 Alibaba Group Holding Ltd. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# ============================================================================== -# Makefile helper functions for release -# -# - -.PHONY: release.run -release.run: release.verify release.ensure-tag - @scripts/release.sh - -.PHONY: release.verify -release.verify: tools.verify.git-chglog tools.verify.github-release tools.verify.coscmd - -.PHONY: release.tag -release.tag: tools.verify.gsemver release.ensure-tag - @git push origin `git describe --tags --abbrev=0` - -.PHONY: release.ensure-tag -release.ensure-tag: tools.verify.gsemver - @scripts/ensure_tag.sh diff --git a/scripts/make-rules/swagger.mk b/scripts/make-rules/swagger.mk deleted file mode 100644 index 8e33059ae72..00000000000 --- a/scripts/make-rules/swagger.mk +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright © 2022 Alibaba Group Holding Ltd. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# ============================================================================== -# Makefile helper functions for swagger -# - -.PHONY: swagger.run -swagger.run: tools.verify.swagger - @echo "===========> Generating swagger API docs" - @swagger generate spec --scan-models -w $(ROOT_DIR)/cmd/genswaggertypedocs -o $(ROOT_DIR)/api/swagger/swagger.yaml - -.PHONY: swagger.serve -swagger.serve: tools.verify.swagger - @swagger serve -F=redoc --no-open --port 36666 $(ROOT_DIR)/api/swagger/swagger.yaml