diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml deleted file mode 100644 index 49fdc07cb..000000000 --- a/.github/workflows/e2e.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: E2E - -on: - push: - branches: [master] - pull_request: - branches: [master] - paths-ignore: - - 'docs/**' - - '**.md' - -jobs: - build: - name: e2e-tests - runs-on: aliyun - steps: - - name: Check out code into the Go module directory - uses: actions/checkout@v2 - - - name: Get dependencies - run: | - go get -v -t -d ./... - - - name: Setup Kind Cluster - uses: engineerd/setup-kind@v0.5.0 - with: - version: "v0.7.0" - skipClusterCreation: true - - - name: Setup Kind Cluster - run: | - kind delete cluster - kind create cluster - kubectl version - kubectl cluster-info - - - name: Load Image to kind cluster - run: make kind-load - - - name: Run Make - run: make - - - name: Run Make Manager - run: make manager - - - name: Run e2e tests - run: | - make e2e-cleanup - make e2e-setup - make e2e-test - make e2e-api-test diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 59bca79f4..119e69ab4 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -2,26 +2,45 @@ name: Go on: push: - branches: [master] + branches: + - master + - release-* + workflow_dispatch: {} pull_request: branches: [master] paths-ignore: - 'docs/**' - '**.md' +env: + # Common versions + GO_VERSION: '1.14' + GOLANGCI_VERSION: 'v1.31' + DOCKER_BUILDX_VERSION: 'v0.4.2' + KIND_VERSION: 'v0.7.0' + jobs: - build: - name: unit-tests + + unit-tests: runs-on: ubuntu-20.04 steps: - name: Set up Go 1.14 uses: actions/setup-go@v1 with: - go-version: 1.14 + go-version: ${{ env.GO_VERSION }} id: go - name: Check out code into the Go module directory uses: actions/checkout@v2 + with: + submodules: true + + - name: Cache Go Dependencies + uses: actions/cache@v2 + with: + path: .work/pkg + key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }} + restore-keys: ${{ runner.os }}-pkg- - name: Install ginkgo run: | @@ -30,7 +49,7 @@ jobs: - name: Setup Kind Cluster uses: engineerd/setup-kind@v0.5.0 with: - version: "v0.7.0" + version: ${{ env.KIND_VERSION }} - name: install Kubebuilder uses: wonderflow/kubebuilder-action@v1.1 @@ -45,3 +64,91 @@ jobs: file: ./coverage.txt flags: unittests name: codecov-umbrella + + e2e-tests: + runs-on: aliyun + steps: + - name: Check out code into the Go module directory + uses: actions/checkout@v2 + + - name: Get dependencies + run: | + go get -v -t -d ./... + + - name: Setup Kind Cluster + uses: engineerd/setup-kind@v0.5.0 + with: + version: ${{ env.KIND_VERSION }} + skipClusterCreation: true + + - name: Setup Kind Cluster + run: | + kind delete cluster + kind create cluster + kubectl version + kubectl cluster-info + + - name: Load Image to kind cluster + run: make kind-load + + - name: Run Make + run: make + + - name: Run Make Manager + run: make manager + + - name: Run e2e tests + run: | + make e2e-cleanup + make e2e-setup + make e2e-test + make e2e-api-test + + lint: + runs-on: ubuntu-20.04 + + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + submodules: true + + - name: Cache Go Dependencies + uses: actions/cache@v2 + with: + path: .work/pkg + key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }} + restore-keys: ${{ runner.os }}-pkg- + + # This action uses its own setup-go, which always seems to use the latest + # stable version of Go. We could run 'make lint' to ensure our desired Go + # version, but we prefer this action because it leaves 'annotations' (i.e. + # it comments on PRs to point out linter violations). + - name: Lint + uses: golangci/golangci-lint-action@v2 + with: + version: ${{ env.GOLANGCI_VERSION }} + + check-diff: + runs-on: ubuntu-20.04 + + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + submodules: true + + - name: Setup Go + uses: actions/setup-go@v2 + with: + go-version: ${{ env.GO_VERSION }} + + - name: Cache Go Dependencies + uses: actions/cache@v2 + with: + path: .work/pkg + key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }} + restore-keys: ${{ runner.os }}-pkg- + + - name: Check Diff + run: make check-diff \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index f71fd6dd5..e2b3316b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.13 as builder +FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.14 as builder WORKDIR /workspace # Copy the Go Modules manifests @@ -11,7 +11,7 @@ RUN go mod download # Copy the go source COPY cmd/core/main.go main.go -COPY apis apis/ +COPY apis/ apis/ COPY pkg/ pkg/ # Build diff --git a/Makefile b/Makefile index 75d8be746..0b9b13b03 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,22 @@ GOX = go run github.com/mitchellh/gox TARGETS := darwin/amd64 linux/amd64 windows/amd64 DIST_DIRS := find * -type d -exec +TIME_LONG = `date +%Y-%m-%d' '%H:%M:%S` +TIME_SHORT = `date +%H:%M:%S` +TIME = $(TIME_SHORT) + +BLUE := $(shell printf "\033[34m") +YELLOW := $(shell printf "\033[33m") +RED := $(shell printf "\033[31m") +GREEN := $(shell printf "\033[32m") +CNone := $(shell printf "\033[0m") + +INFO = echo ${TIME} ${BLUE}[ .. ]${CNone} +WARN = echo ${TIME} ${YELLOW}[WARN]${CNone} +ERR = echo ${TIME} ${RED}[FAIL]${CNone} +OK = echo ${TIME} ${GREEN}[ OK ]${CNone} +FAIL = (echo ${TIME} ${RED}[FAIL]${CNone} && false) + # 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 @@ -22,12 +38,14 @@ all: build # Run tests test: vet lint go test -race -coverprofile=coverage.txt -covermode=atomic ./pkg/... ./cmd/... + @$(OK) unit-tests pass # Build manager binary build: fmt vet lint go run hack/chart/generate.go go build -o bin/vela -ldflags ${LDFLAGS} cmd/vela/main.go git checkout cmd/vela/fake/chart_source.go + @$(OK) build succeed vela-cli: go build -o bin/vela -ldflags ${LDFLAGS} cmd/vela/main.go @@ -64,10 +82,10 @@ run: fmt vet go run ./cmd/core/main.go # Run go fmt against code -fmt: goimports +fmt: goimports installcue go fmt ./... $(GOIMPORTS) -local github.com/oam-dev/kubevela -w ./pkg ./cmd - ./hack/cue-fmt.sh + $(CUE) fmt ./hack/vela-templates/cue/* # Run go vet against code vet: @@ -76,6 +94,14 @@ vet: lint: golangci $(GOLANGCILINT) run ./... +reviewable: fmt vet lint manifests + go mod tidy + +# Execute auto-gen code commands and ensure branch is clean. +check-diff: reviewable + git diff --quiet || $(FAIL) + @$(OK) branch is clean + # Build the docker image docker-build: test docker build . -t ${IMG} @@ -96,6 +122,7 @@ e2e-test: CGO_ENABLED=0 go test -timeout 1h -count=1 -v -tags 'integration' ./test/integration ginkgo -v -skipPackage capability,setup,apiserver -r e2e ginkgo -v ./test/e2e-test + @$(OK) tests pass e2e-api-test: # Run e2e test @@ -114,15 +141,15 @@ kind-load: IMG ?= vela-core:latest # Run tests -core-test: generate fmt vet manifests +core-test: fmt vet manifests go test ./pkg/... -coverprofile cover.out # Build manager binary -manager: generate fmt vet lint manifests +manager: fmt vet lint manifests go build -o bin/manager ./cmd/core/main.go # Run against the configured Kubernetes cluster in ~/.kube/config -core-run: generate fmt vet manifests +core-run: fmt vet manifests go run ./cmd/core/main.go # Install CRDs and Definitions of Vela Core into a cluster, this is for develop convenient. @@ -133,6 +160,7 @@ core-install: manifests kubectl apply -f charts/vela-core/templates/definitions/ kubectl apply -f charts/vela-core/templates/velaConfig.yaml bin/vela workloads + @$(OK) install succeed # Uninstall CRDs and Definitions of Vela Core from a cluster, this is for develop convenient. core-uninstall: manifests @@ -145,27 +173,6 @@ manifests: go generate $(foreach t,pkg apis,./$(t)/...) ./hack/vela-templates/gen_definitions.sh -# Generate code -generate: controller-gen - $(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..." - -# find or download controller-gen -# download controller-gen if necessary -controller-gen: -ifeq (, $(shell which controller-gen)) - @{ \ - set -e ;\ - CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\ - cd $$CONTROLLER_GEN_TMP_DIR ;\ - go mod init tmp ;\ - go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.2.5 ;\ - rm -rf $$CONTROLLER_GEN_TMP_DIR ;\ - } -CONTROLLER_GEN=$(GOBIN)/controller-gen -else -CONTROLLER_GEN=$(shell which controller-gen) -endif - GOLANGCILINT_VERSION ?= v1.29.0 HOSTOS := $(shell uname -s | tr '[:upper:]' '[:lower:]') HOSTARCH := $(shell uname -m) @@ -196,4 +203,16 @@ ifeq (, $(shell which goimports)) GOIMPORTS=$(GOBIN)/goimports else GOIMPORTS=$(shell which goimports) +endif + +.PHONY: installcue +installcue: +ifeq (, $(shell which cue)) + @{ \ + set -e ;\ + GO111MODULE=off go get -u cuelang.org/go/cmd/cue ;\ + } +CUE=$(GOBIN)/cue +else +CUE=$(shell which cue) endif \ No newline at end of file diff --git a/apis/generate.go b/apis/generate.go index 3d494fdad..555d78324 100644 --- a/apis/generate.go +++ b/apis/generate.go @@ -3,9 +3,6 @@ // See the below link for details on what is happening here. // https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module -// NOTE(@negz): See the below link for details on what is happening here. -// https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module - // NOTE(@wonderflow) We don't remove existing CRDs here, because the crd folders contain not only auto generated. // Generate deepcopy methodsets and CRD manifests diff --git a/go.sum b/go.sum index 0d9622264..082fbbe90 100644 --- a/go.sum +++ b/go.sum @@ -55,6 +55,7 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.9.0/go.mod h1:m+/etGaqZbylxaNT876QGXqEHp4PR2Rq5GMqICWb9bU= +cloud.google.com/go/storage v1.10.0 h1:STgFzyU5/8miMl0//zKh2aQeTyeaUH3WN9bSUiJ09bA= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= code.gitea.io/sdk/gitea v0.12.0/go.mod h1:z3uwDV/b9Ls47NGukYM9XhnHtqPh/J+t40lsUrR6JDY= collectd.org v0.3.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE= @@ -279,6 +280,7 @@ github.com/aws/aws-sdk-go v1.30.12/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZve github.com/aws/aws-sdk-go v1.30.16/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.31.6/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.31.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= +github.com/aws/aws-sdk-go v1.31.12 h1:SxRRGyhlCagI0DYkhOg+FgdXGXzRTE3vEX/gsgFaiKQ= github.com/aws/aws-sdk-go v1.31.12/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/axw/gocov v1.0.0/go.mod h1:LvQpEYiwwIb2nYkXY2fDWhg9/AsYqkhmrCshjlUJECE= @@ -291,6 +293,7 @@ github.com/beorn7/perks v1.0.0 h1:HWo1m869IqiPhD389kmkxeTalrjNbbJTC8LXupb+sl0= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas= github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y= @@ -876,7 +879,9 @@ github.com/google/licenseclassifier v0.0.0-20200402202327-879cb1424de0/go.mod h1 github.com/google/licenseclassifier v0.0.0-20200708223521-3d09a0ea2f39/go.mod h1:qsqn2hxC+vURpyBRygGUuinTO42MFRLcsmQ/P8v94+M= github.com/google/mako v0.0.0-20190821191249-122f8dcef9e3/go.mod h1:YzLcVlL+NqWnmUEPuhS1LxDDwGO9WNbVlEXaF4IH35g= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible h1:xmapqc1AyLoB+ddYT6r04bD9lIjlOqGaREovi0SzFaE= github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/martian/v3 v3.0.0 h1:pMen7vLs8nvgEYhywH3KDWJIJTeEr2ULsVWHWYHQyBs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= @@ -918,6 +923,7 @@ github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEo github.com/gophercloud/gophercloud v0.3.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= github.com/gophercloud/gophercloud v0.6.0/go.mod h1:GICNByuaEBibcjmjvI7QvYJSZEbGkcYwAR7EZK2WMqM= github.com/gophercloud/gophercloud v0.10.0/go.mod h1:gmC5oQqMDOMO1t1gq5DquX/yAU808e/4mzjjDA76+Ss= +github.com/gophercloud/gophercloud v0.11.0 h1:pYMP9UZBdQa3lsfIZ1tZor4EbtxiuB6BHhocenkiH/E= github.com/gophercloud/gophercloud v0.11.0/go.mod h1:gmC5oQqMDOMO1t1gq5DquX/yAU808e/4mzjjDA76+Ss= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20191106031601-ce3c9ade29de/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= @@ -983,6 +989,7 @@ github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brv github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-getter v1.4.0 h1:ENHNi8494porjD0ZhIrjlAHnveSFhY7hvOJrV/fsKkw= github.com/hashicorp/go-getter v1.4.0/go.mod h1:7qxyCd8rBfcShwsvxgIguu4KbS3l8bUCwg2Umn7RjeY= github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI= github.com/hashicorp/go-hclog v0.8.0/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= @@ -1009,6 +1016,7 @@ github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa github.com/hashicorp/go-rootcerts v1.0.1/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= +github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo= github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc= @@ -1101,6 +1109,7 @@ github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af/go.mod github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/jmespath/go-jmespath v0.3.0 h1:OS12ieG61fsCg5+qLJ+SsW9NicxNkg3b25OyT2yCeUc= github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= github.com/jmoiron/sqlx v1.2.0 h1:41Ip0zITnmWNR/vHV+S4m+VoUivnWY5E4OJfLZjCJMA= github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= @@ -1127,6 +1136,7 @@ github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jsternberg/zap-logfmt v1.0.0/go.mod h1:uvPs/4X51zdkcm5jXl5SYoN+4RK21K8mysFmDaM/h+o= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= @@ -1305,6 +1315,7 @@ github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrk github.com/mitchellh/go-ps v0.0.0-20190716172923-621e5597135b/go.mod h1:r1VsdOzOPt1ZSrGZWFoNhsAedKnEd6r9Np1+5blZCWk= github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg= github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/go-testing-interface v1.0.0 h1:fzU/JVNcaqHQEcVFAKeR41fkiLdIPrefOvVG1VZ96U0= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4= github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= diff --git a/hack/cue-fmt.sh b/hack/cue-fmt.sh deleted file mode 100755 index 73a2e6260..000000000 --- a/hack/cue-fmt.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -set -e - -if ! cue version ; then - echo "Installing CUE..." - GO111MODULE=off go get -u cuelang.org/go/cmd/cue -fi - -echo "Formatting CUE templates..." -cue fmt ./hack/vela-templates/cue/* diff --git a/pkg/controller/core.oam.dev/v1alpha2/applicationconfiguration/dependency_test.go b/pkg/controller/core.oam.dev/v1alpha2/applicationconfiguration/dependency_test.go index 6996c30ff..1d94d352a 100644 --- a/pkg/controller/core.oam.dev/v1alpha2/applicationconfiguration/dependency_test.go +++ b/pkg/controller/core.oam.dev/v1alpha2/applicationconfiguration/dependency_test.go @@ -167,9 +167,10 @@ var _ = Describe("Resource Dependency in an ApplicationConfiguration", func() { By("Verify the appconfig's dependency is satisfied") appconfig = &v1alpha2.ApplicationConfiguration{} Eventually(func() []v1alpha2.UnstaifiedDependency { + reconcileRetry(reconciler, req) k8sClient.Get(ctx, appconfigKey, appconfig) return appconfig.Status.Dependency.Unsatisfied - }, time.Second, 300*time.Millisecond).Should(BeNil()) + }, 5*time.Second, 300*time.Millisecond).Should(BeNil()) } It("trait depends on another trait", func() { diff --git a/test/e2e-test/suite_test.go b/test/e2e-test/suite_test.go index b334a9cc6..bb9cedd0a 100644 --- a/test/e2e-test/suite_test.go +++ b/test/e2e-test/suite_test.go @@ -96,11 +96,11 @@ var _ = BeforeSuite(func(done Done) { By("Applying CRD of WorkloadDefinition and TraitDefinition") var workloadDefinitionCRD crdv1.CustomResourceDefinition - Expect(readYaml("../../charts/oam-kubernetes-runtime/crds/core.oam.dev_workloaddefinitions.yaml", &workloadDefinitionCRD)).Should(BeNil()) + Expect(readYaml("../../charts/vela-core/crds/core.oam.dev_workloaddefinitions.yaml", &workloadDefinitionCRD)).Should(BeNil()) Expect(k8sClient.Create(context.Background(), &workloadDefinitionCRD)).Should(SatisfyAny(BeNil(), &util.AlreadyExistMatcher{})) var traitDefinitionCRD crdv1.CustomResourceDefinition - Expect(readYaml("../../charts/oam-kubernetes-runtime/crds/core.oam.dev_traitdefinitions.yaml", &traitDefinitionCRD)).Should(BeNil()) + Expect(readYaml("../../charts/vela-core/crds/core.oam.dev_traitdefinitions.yaml", &traitDefinitionCRD)).Should(BeNil()) Expect(k8sClient.Create(context.Background(), &traitDefinitionCRD)).Should(SatisfyAny(BeNil(), &util.AlreadyExistMatcher{})) // Create manual scaler trait definition diff --git a/test/integration/appconfig_test.go b/test/integration/appconfig_test.go index ea53d8951..ce592b598 100644 --- a/test/integration/appconfig_test.go +++ b/test/integration/appconfig_test.go @@ -216,7 +216,7 @@ func TestAppConfigController(t *testing.T) { } i, err := integration.New(cfg, - integration.WithCRDPaths("../../charts/oam-kubernetes-runtime/crds"), + integration.WithCRDPaths("../../charts/vela-core/crds"), integration.WithCleaners( integration.NewCRDCleaner(), integration.NewCRDDirCleaner()),