Skip to content

Commit

Permalink
Bump vela to v1.6.0-alpha.6, add velaux enable test (#93)
Browse files Browse the repository at this point in the history 
* Bump vela to v1.6.0-alpha.6, add velaux enable test

Signed-off-by: Qiaozp <[email protected]>

* use go 1.19 for compatibility

Signed-off-by: Qiaozp <[email protected]>

* add assume-no-moving-gc package

Signed-off-by: Qiaozp <[email protected]>

Signed-off-by: Qiaozp <[email protected]>
  • Loading branch information
@chivalryq
chivalryq authored Oct 25, 2022
1 parent 1cc0b8f commit f7feb07
Show file tree
Hide file tree
Showing 37 changed files with 735 additions and 518 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/code-lint.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:

env:
# Common versions
GO_VERSION: '1.17'
GO_VERSION: '1.19'
GOLANGCI_VERSION: 'v1.38'

jobs:
Expand Down Expand Up @@ -46,7 +46,7 @@ jobs:
- name: Go Dependencies
run: |
go mod tidy -compat=1.17
go mod tidy
go get -t -v -d ./...
- name: Install StaticCheck
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:

- name: Go Dependencies
run: |
go mod tidy -compat=1.17
go mod tidy
go get -t -v -d ./...
- name: Setup Docker
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/e2e-test.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Install dependencies
uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.19
- name: Get matrix
id: get_matrix
run: |
Expand All @@ -51,6 +51,7 @@ jobs:
- run: chmod u+x velad-linux-amd64 && mv velad-linux-amd64 velad
- run: sudo ./velad install
- run: sudo vela def list
- run: sudo vela addon enable /root/.vela/addons/velaux
test-darwin:
runs-on: macos-12
needs: [ build-artifact ]
Expand All @@ -63,6 +64,7 @@ jobs:
- run: chmod u+x velad-darwin-amd64 && mv velad-darwin-amd64 velad
- run: ./velad install
- run: vela def list
- run: vela addon enable ~/.vela/addons/velaux
# test-linux-arm64:
# runs-on: ubuntu-20.04
# needs: [ build-artifact ]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.19
- name: Get release
id: get_release
uses: bruceadams/[email protected]
Expand Down
9 changes: 5 additions & 4 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ include makefiles/dependency.mk

K3S_VERSION ?= v1.21.10+k3s1
STATIC_DIR := pkg/resources/static
VELA_VERSION ?= v1.6.0-alpha.3
VELAUX_VERSION ?= v1.5.4
VELA_VERSION ?= v1.6.0-alpha.6
VELAUX_VERSION ?= v1.5.8
VELAUX_IMAGE_VERSION ?= ${VELAUX_VERSION}
LDFLAGS= "-X github.com/oam-dev/velad/version.VelaUXVersion=${VELAUX_VERSION} -X github.com/oam-dev/velad/version.VelaVersion=${VELA_VERSION}"
OS ?= linux
ARCH ?= amd64
Expand All @@ -22,7 +23,7 @@ darwin-amd64 darwin-arm64 windows-amd64: download_vela_images_addons download_k3
github.com/oam-dev/velad/cmd/velad

download_vela_images_addons:
./hack/download_vela_images.sh ${VELA_VERSION} ${VELAUX_VERSION} ${ARCH}
./hack/download_vela_images.sh ${VELA_VERSION} ${VELAUX_IMAGE_VERSION} ${ARCH}
./hack/download_addons.sh ${VELAUX_VERSION}

download_k3d:
Expand Down Expand Up @@ -62,7 +63,7 @@ go-check:
go vet ./...

reviewable: lint staticcheck fmt go-check
go mod tidy -compat=1.17
go mod tidy

check-diff: reviewable
git --no-pager diff
Expand Down
2 changes: 1 addition & 1 deletion contribute/upgrade-vela.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ github.com/oam-dev/kubevela v1.x.y
Then change the `v1.x.y` to version you want to upgrade to, then run:

```shell
go mod tidy -compat=1.17
go mod tidy
```

### Upgrade vela version in makefile
Expand Down
2 changes: 1 addition & 1 deletion docs/contribute.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This guild helps you get started developing VelaD

### Prerequisites

1. Golang version 1.17+
1. Golang version 1.19+
2. Docker (for non-linux user)
3. golangci-lint 1.38.0+, it will install automatically if you run make, you can install it [manually](https://golangci-lint.run/usage/install/#local-installation) if the installation is too slow.

Expand Down
47 changes: 29 additions & 18 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
module github.com/oam-dev/velad

go 1.17
go 1.19

require (
github.com/docker/docker v20.10.16+incompatible
github.com/docker/go-connections v0.4.0
github.com/fatih/color v1.13.0
github.com/k3d-io/k3d/v5 v5.4.1
github.com/kyokomi/emoji/v2 v2.2.9
github.com/oam-dev/kubevela v1.6.0-alpha.3
github.com/oam-dev/kubevela v1.6.0-alpha.6
github.com/pkg/errors v0.9.1
github.com/spf13/cobra v1.4.0
github.com/stretchr/testify v1.7.1
Expand Down Expand Up @@ -46,23 +46,29 @@ require (
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/agext/levenshtein v1.2.2 // indirect
github.com/alessio/shellescape v1.2.2 // indirect
github.com/alibabacloud-go/cs-20151215/v2 v2.4.5 // indirect
github.com/alibabacloud-go/darabonba-openapi v0.1.4 // indirect
github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.4 // indirect
github.com/alibabacloud-go/cs-20151215/v3 v3.0.21 // indirect
github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.0 // indirect
github.com/alibabacloud-go/debug v0.0.0-20190504072949-9472017b5c68 // indirect
github.com/alibabacloud-go/endpoint-util v1.1.0 // indirect
github.com/alibabacloud-go/openapi-util v0.0.7 // indirect
github.com/alibabacloud-go/tea v1.1.15 // indirect
github.com/alibabacloud-go/tea-utils v1.3.9 // indirect
github.com/alibabacloud-go/endpoint-util v1.1.1 // indirect
github.com/alibabacloud-go/openapi-util v0.0.11 // indirect
github.com/alibabacloud-go/tea v1.1.19 // indirect
github.com/alibabacloud-go/tea-utils v1.4.5 // indirect
github.com/alibabacloud-go/tea-utils/v2 v2.0.0 // indirect
github.com/alibabacloud-go/tea-xml v1.1.2 // indirect
github.com/aliyun/alibaba-cloud-sdk-go v1.61.1704 // indirect
github.com/aliyun/credentials-go v1.1.2 // indirect
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b // indirect
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/briandowns/spinner v1.11.1 // indirect
github.com/buger/jsonparser v1.1.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 // indirect
github.com/chartmuseum/helm-push v0.10.2 // indirect
github.com/clbanning/mxj/v2 v2.5.5 // indirect
github.com/cloudtty/cloudtty v0.2.0 // indirect
github.com/cockroachdb/apd/v2 v2.0.2 // indirect
github.com/containerd/cgroups v1.0.3 // indirect
Expand All @@ -73,6 +79,7 @@ require (
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
github.com/coreos/prometheus-operator v0.41.1 // indirect
github.com/crossplane/crossplane-runtime v0.14.1-0.20210722005935-0b469fcc77cd // indirect
github.com/cue-exp/kubevelafix v0.0.0-20220922150317-aead819d979d // indirect
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/deckarep/golang-set v1.7.1 // indirect
Expand Down Expand Up @@ -119,6 +126,7 @@ require (
github.com/gobwas/glob v0.2.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/goodhosts/hostsfile v0.1.1 // indirect
github.com/google/btree v1.0.1 // indirect
Expand All @@ -145,15 +153,16 @@ require (
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/jmoiron/sqlx v1.3.1 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
github.com/klauspost/compress v1.15.9 // indirect
github.com/kubevela/pkg v0.0.0-20220913093640-a41193098f92 // indirect
github.com/kubevela/pkg v0.0.0-20221017134311-26e5042d4503 // indirect
github.com/kubevela/prism v1.5.1-0.20220915071949-6bf3ad33f84f // indirect
github.com/kubevela/workflow v0.0.0-20220919092128-ce7766fae4aa // indirect
github.com/kubevela/workflow v0.0.0-20221019093241-b5b7a0d79051 // indirect
github.com/kyokomi/emoji v2.2.4+incompatible // indirect
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
Expand Down Expand Up @@ -187,8 +196,9 @@ require (
github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/nacos-group/nacos-sdk-go/v2 v2.1.0 // indirect
github.com/oam-dev/cluster-gateway v1.4.0 // indirect
github.com/oam-dev/cluster-register v1.0.4-0.20220325092210-cee4a3d3fb7d // indirect
github.com/oam-dev/cluster-register v1.0.4-0.20220928064144-5f76a9d7ca8c // indirect
github.com/oam-dev/terraform-config-inspect v0.0.0-20210418082552-fc72d929aa28 // indirect
github.com/oam-dev/terraform-controller v0.7.0 // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
Expand All @@ -203,7 +213,7 @@ require (
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021 // indirect
github.com/prometheus/client_golang v1.12.1 // indirect
github.com/prometheus/client_golang v1.12.2 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.34.0 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
Expand All @@ -215,7 +225,7 @@ require (
github.com/sergi/go-diff v1.2.0 // indirect
github.com/shopspring/decimal v1.2.0 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/spf13/afero v1.6.0 // indirect
github.com/spf13/afero v1.8.0 // indirect
github.com/spf13/cast v1.4.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
Expand All @@ -225,7 +235,7 @@ require (
github.com/theupdateframework/notary v0.7.0 // indirect
github.com/tjfoc/gmsm v1.3.2 // indirect
github.com/wercker/stern v0.0.0-20190705090245-4fa46dd6987f // indirect
github.com/wonderflow/cert-manager-api v1.0.3 // indirect
github.com/wonderflow/cert-manager-api v1.0.4-0.20210304051430-e08aa76f6c5f // indirect
github.com/xanzy/go-gitlab v0.60.0 // indirect
github.com/xanzy/ssh-agent v0.3.0 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
Expand Down Expand Up @@ -253,25 +263,26 @@ require (
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.21.0 // indirect
go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect
go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37 // indirect
go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 // indirect
golang.org/x/crypto v0.0.0-20220507011949-2cf3adece122 // indirect
golang.org/x/net v0.0.0-20220906165146-f3363e06e74c // indirect
golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2 // indirect
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20220411224347-583f2d630306 // indirect
golang.org/x/text v0.3.8 // indirect
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03 // indirect
google.golang.org/grpc v1.47.0 // indirect
google.golang.org/grpc v1.48.0 // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df // indirect
gopkg.in/gorp.v1 v1.7.2 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.66.2 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/square/go-jose.v2 v2.5.1 // indirect
gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
gopkg.in/src-d/go-git.v4 v4.13.1 // indirect
Expand Down
Loading

0 comments on commit f7feb07

Please sign in to comment.