forked from openyurtio/openyurt
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'openyurtio:master' into master
- Loading branch information
Showing
162 changed files
with
8,708 additions
and
4,115 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,15 +3,16 @@ | |
| This file lists the maintainers of the OpenYurt project. The responsibilities of maintainers are listed in the [GOVERNANCE.md](GOVERNANCE.md) file. | ||
|
|
||
| ## Project Maintainers | ||
| | Name | GitHub ID | Affiliation | | ||
| | ---- | --------- | ----------- | | ||
| | [Fei Guo](mailto:[email protected]) | [Fei-Guo](https://github.com/Fei-Guo) | Alibaba | | ||
| | [Linbo He](mailto:[email protected]) | [rambohe-ch](https://github.com/rambohe-ch) | Alibaba | | ||
| | [Shida Qiu](mailto:[email protected]) | [SataQiu](https://github.com/SataQiu) | Alibaba | | ||
| | [Chao Zheng](mailto:[email protected]) | [charleszheng44](https://github.com/charleszheng44) | ByteDance | | ||
| | [Yixing Jia](mailto:[email protected]) | [yixingjia](https://github.com/yixingjia) | VMware | | ||
| | [Wuming Liu](mailto:[email protected]) | [lwmqwer](https://github.com/lwmqwer) | VMware | | ||
| | [Shaoqiang Chen](mailto:[email protected]) | [gnunu](https://github.com/gnunu) | Intel | | ||
| | [Tao Chen](mailto:[email protected]) | [qclc](https://github.com/qclc) | Zhejiang University | | ||
| | [Lifang Zhang](mailto:[email protected]) | [DrmagicE](https://github.com/DrmagicE) | China Telecom | | ||
| | [Zhengguang Zhang](mailto:[email protected]) | [zzguang](https://github.com/zzguang) | Intel | | ||
| | Name | GitHub ID | Affiliation | | ||
| |---------------------------------------------------|-----------------------------------------------------|---------------------| | ||
| | [Fei Guo](mailto:[email protected]) | [Fei-Guo](https://github.com/Fei-Guo) | Alibaba | | ||
| | [Linbo He](mailto:[email protected]) | [rambohe-ch](https://github.com/rambohe-ch) | Alibaba | | ||
| | [Shida Qiu](mailto:[email protected]) | [SataQiu](https://github.com/SataQiu) | Alibaba | | ||
| | [Chao Zheng](mailto:[email protected]) | [charleszheng44](https://github.com/charleszheng44) | ByteDance | | ||
| | [Yixing Jia](mailto:[email protected]) | [yixingjia](https://github.com/yixingjia) | VMware | | ||
| | [Wuming Liu](mailto:[email protected]) | [lwmqwer](https://github.com/lwmqwer) | VMware | | ||
| | [Shaoqiang Chen](mailto:[email protected]) | [gnunu](https://github.com/gnunu) | Intel | | ||
| | [Tao Chen](mailto:[email protected]) | [qclc](https://github.com/qclc) | Zhejiang University | | ||
| | [Lifang Zhang](mailto:[email protected]) | [DrmagicE](https://github.com/DrmagicE) | China Telecom | | ||
| | [Zhengguang Zhang](mailto:[email protected]) | [zzguang](https://github.com/zzguang) | Intel | | ||
| | [Chenglong Wang](mailto:[email protected]) | [luckymrwang](https://github.com/luckymrwang) | Inspur | | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,7 +22,7 @@ IMAGE_REPO ?= openyurt | |
| IMAGE_TAG ?= $(shell git describe --abbrev=0 --tags) | ||
| GIT_COMMIT = $(shell git rev-parse HEAD) | ||
| ENABLE_AUTONOMY_TESTS ?=true | ||
| CRD_OPTIONS ?= "crd:crdVersions=v1" | ||
| CRD_OPTIONS ?= "crd:crdVersions=v1,maxDescLen=1000" | ||
| BUILD_KUSTOMIZE ?= _output/manifest | ||
| GOPROXY ?= $(shell go env GOPROXY) | ||
|
|
||
|
|
@@ -51,6 +51,17 @@ ifneq (${https_proxy},) | |
| DOCKER_BUILD_ARGS += --build-arg https_proxy='${https_proxy}' | ||
| endif | ||
|
|
||
| LOCALBIN ?= $(shell pwd)/bin | ||
| $(LOCALBIN): | ||
| mkdir -p $(LOCALBIN) | ||
|
|
||
| KUSTOMIZE_VERSION ?= v4.5.7 | ||
| ## Tool Binaries | ||
| KUSTOMIZE ?= $(LOCALBIN)/kustomize | ||
|
|
||
| KUBECTL_VERSION ?= v1.22.3 | ||
| KUBECTL ?= $(LOCALBIN)/kubectl | ||
|
|
||
| .PHONY: clean all build test | ||
|
|
||
| all: test build | ||
|
|
@@ -68,7 +79,10 @@ clean: | |
| -rm -Rf _output | ||
|
|
||
| # verify will verify the code. | ||
| verify: verify-mod verify-license | ||
| verify: verify-mod verify-license verify_manifests | ||
|
|
||
| verify_manifests: | ||
| hack/make-rules/verify_manifests.sh | ||
|
|
||
| # verify-license will check if license has been added to files. | ||
| verify-license: | ||
|
|
@@ -155,10 +169,10 @@ generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and | |
| # hack/make-rule/generate_openapi.sh // TODO by kadisi | ||
| $(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./pkg/apis/..." | ||
|
|
||
| manifests: generate ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects. | ||
| manifests: kustomize kubectl generate ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects. | ||
| rm -rf $(BUILD_KUSTOMIZE) | ||
| $(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=role webhook paths="./pkg/..." output:crd:artifacts:config=$(BUILD_KUSTOMIZE)/auto_generate/crd output:rbac:artifacts:config=$(BUILD_KUSTOMIZE)/auto_generate/rbac output:webhook:artifacts:config=$(BUILD_KUSTOMIZE)/auto_generate/webhook | ||
| hack/make-rules/kustomize_to_chart.sh --crd $(BUILD_KUSTOMIZE)/auto_generate/crd --webhook $(BUILD_KUSTOMIZE)/auto_generate/webhook --rbac $(BUILD_KUSTOMIZE)/auto_generate/rbac --output $(BUILD_KUSTOMIZE)/kustomize --templateDir charts/openyurt/templates | ||
| hack/make-rules/kustomize_to_chart.sh --crd $(BUILD_KUSTOMIZE)/auto_generate/crd --webhook $(BUILD_KUSTOMIZE)/auto_generate/webhook --rbac $(BUILD_KUSTOMIZE)/auto_generate/rbac --output $(BUILD_KUSTOMIZE)/kustomize --chartDir charts/yurt-manager | ||
|
|
||
|
|
||
| # newcontroller | ||
|
|
@@ -176,6 +190,26 @@ else | |
| $(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/[email protected]) | ||
| endif | ||
|
|
||
| .PHONY: kubectl | ||
| kubectl: $(KUBECTL) ## Download kustomize locally if necessary. If wrong version is installed, it will be removed before downloading. | ||
| $(KUBECTL): $(LOCALBIN) | ||
| @if test -x $(LOCALBIN)/kubectl && ! $(LOCALBIN)/kubectl version | grep -q $(KUBECTL_VERSION); then \ | ||
| echo "$(LOCALBIN)/kubectl version is not expected $(KUBECTL_VERSION). Removing it before installing."; \ | ||
| rm -rf $(LOCALBIN)/kubectl; \ | ||
| fi | ||
| test -s $(LOCALBIN)/kubectl || curl https://storage.googleapis.com/kubernetes-release/release/v1.22.3/bin/$(shell go env GOOS)/$(shell go env GOARCH)/kubectl -o $(KUBECTL) | ||
| chmod +x $(KUBECTL) | ||
|
|
||
| KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | ||
| .PHONY: kustomize | ||
| kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary. If wrong version is installed, it will be removed before downloading. | ||
| $(KUSTOMIZE): $(LOCALBIN) | ||
| @if test -x $(LOCALBIN)/kustomize && ! $(LOCALBIN)/kustomize version | grep -q $(KUSTOMIZE_VERSION); then \ | ||
| echo "$(LOCALBIN)/kustomize version is not expected $(KUSTOMIZE_VERSION). Removing it before installing."; \ | ||
| rm -rf $(LOCALBIN)/kustomize; \ | ||
| fi | ||
| test -s $(LOCALBIN)/kustomize || { curl -Ss $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); } | ||
|
|
||
| # go-get-tool will 'go get' any package $2 and install it to $1. | ||
| PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST)))) | ||
| define go-get-tool | ||
|
|
||
Oops, something went wrong.