-
Notifications
You must be signed in to change notification settings - Fork 31
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #163 from JohnNiang/bug/admission-review-v1-not-found
Upgrade controller-manager from 0.4.0 to 0.7.1
- Loading branch information
Showing
2,908 changed files
with
2,963 additions
and
1,157,590 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,6 +4,19 @@ IMG ?= kubespheredev/s2ioperator:latest | |
| NAMESPACE ?= kubesphere-devops-system | ||
| export GO111MODULE=on | ||
|
|
||
| # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) | ||
| ifeq (,$(shell go env GOBIN)) | ||
| GOBIN=$(shell go env GOPATH)/bin | ||
| else | ||
| GOBIN=$(shell go env GOBIN) | ||
| endif | ||
|
|
||
| # Setting SHELL to bash allows bash commands to be executed by recipes. | ||
| # This is a requirement for 'setup-envtest.sh' in the test target. | ||
| # Options are set to exit when a recipe line exits non-zero or a piped command fails. | ||
| SHELL = /usr/bin/env bash -o pipefail | ||
| .SHELLFLAGS = -ec | ||
|
|
||
| all: test manager | ||
|
|
||
| # Run tests | ||
|
|
@@ -23,14 +36,14 @@ install-crd: manifests | |
| kubectl apply -f config/crds | ||
|
|
||
| # Deploy controller in the configured Kubernetes cluster in ~/.kube/config | ||
| deploy: manifests update-cert | ||
| deploy: manifests update-cert kustomize | ||
| kubectl apply -f config/templates | ||
| kubectl apply -f config/crds | ||
| kubectl kustomize config | kubectl apply -f - | ||
| $(KUSTOMIZE) config | kubectl apply -f - | ||
|
|
||
| # Generate manifests e.g. CRD, RBAC etc. | ||
| manifests: | ||
| go run vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go crd:trivialVersions=true rbac:roleName=manager-role paths="./pkg/apis/...;./pkg/controller/..." output:crd:artifacts:config=config/crds | ||
| manifests: controller-gen | ||
| $(CONTROLLER_GEN) crd:trivialVersions=true rbac:roleName=manager-role paths="./pkg/apis/...;./pkg/controller/..." output:crd:artifacts:config=config/crds | ||
|
|
||
| # Run go fmt against code | ||
| fmt: | ||
|
|
@@ -44,13 +57,12 @@ client-gen: | |
| ./hack/generate_group.sh all github.com/kubesphere/s2ioperator/pkg/client github.com/kubesphere/s2ioperator/pkg/apis "devops:v1alpha1" --go-header-file ./hack/boilerplate.go.txt | ||
|
|
||
| # Generate code | ||
| generate: | ||
| go run vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go object:headerFile=./hack/boilerplate.go.txt paths=./pkg/apis/... | ||
| go run vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go -O openapi_generated -i k8s.io/api/core/v1,k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/api/resource,k8s.io/apimachinery/pkg/runtime,k8s.io/apimachinery/pkg/util/intstr,k8s.io/apimachinery/pkg/version,github.com/kubesphere/s2ioperator/pkg/apis/devops/v1alpha1 -p github.com/kubesphere/s2ioperator/pkg/apis/devops/v1alpha1 -h hack/boilerplate.go.txt --report-filename api/api-rules/violation_exceptions.list | ||
|
|
||
| generate: controller-gen openapi-gen | ||
| $(CONTROLLER_GEN) object:headerFile=./hack/boilerplate.go.txt paths=./pkg/apis/... | ||
| $(OPENAPI_GEN) -O openapi_generated -i k8s.io/api/core/v1,k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/api/resource,k8s.io/apimachinery/pkg/runtime,k8s.io/apimachinery/pkg/util/intstr,k8s.io/apimachinery/pkg/version,github.com/kubesphere/s2ioperator/pkg/apis/devops/v1alpha1 -p github.com/kubesphere/s2ioperator/pkg/apis/devops/v1alpha1 -h hack/boilerplate.go.txt --report-filename api/api-rules/violation_exceptions.list | ||
|
|
||
| # Build the docker image | ||
| docker-build: | ||
| docker-build: manager | ||
| docker build -f deploy/Dockerfile -t $(IMG) bin/ | ||
| docker push $(IMG) | ||
|
|
||
|
|
@@ -60,8 +72,8 @@ image-multiarch: | |
| debug: manager | ||
| ./hack/build-image.sh | ||
|
|
||
| release: manager test docker-build update-cert | ||
| kubectl kustomize config > deploy/s2ioperator.yaml | ||
| release: kustomize manager test docker-build update-cert | ||
| $(KUSTOMIZE) config > deploy/s2ioperator.yaml | ||
|
|
||
| install-travis: | ||
| chmod +x ./hack/*.sh | ||
|
|
@@ -78,4 +90,30 @@ ca-secret: | |
| update-cert: ca-secret | ||
| ./hack/update-cert.sh | ||
|
|
||
| .PHONY : clean test | ||
| .PHONY : clean test | ||
|
|
||
| CONTROLLER_GEN = $(shell pwd)/bin/controller-gen | ||
| controller-gen: ## Download controller-gen locally if necessary. | ||
| $(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/[email protected]) | ||
|
|
||
| KUSTOMIZE = $(shell pwd)/bin/kustomize | ||
| kustomize: ## Download kustomize locally if necessary. | ||
| $(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/[email protected]) | ||
|
|
||
| OPENAPI_GEN = $(shell pwd)/bin/openapi-gen | ||
| openapi-gen: ## Download openapi-gen locally if necessary | ||
| $(call go-get-tool,$(OPENAPI_GEN),k8s.io/code-generator/cmd/[email protected]) | ||
|
|
||
| # 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 | ||
| @[ -f $(1) ] || { \ | ||
| set -e ;\ | ||
| TMP_DIR=$$(mktemp -d) ;\ | ||
| cd $$TMP_DIR ;\ | ||
| go mod init tmp ;\ | ||
| echo "Downloading $(2)" ;\ | ||
| GOBIN=$(PROJECT_DIR)/bin go install $(2) ;\ | ||
| rm -rf $$TMP_DIR ;\ | ||
| } | ||
| endef | ||
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
Oops, something went wrong.