chore: Upgrade the vela dependencies (#152)

* chore: Upgrade the vela dependencies - fixes #151 Signed-off-by: Anoop Gopalakrishnan <[email protected]> * Fix: solve dependency conflict Signed-off-by: Qiaozp <[email protected]> * Fix compile conflict Signed-off-by: Qiaozp <[email protected]> * Fix: downgrade go version to support github action builders Signed-off-by: Anoop Gopalakrishnan <[email protected]> * Fix: updated the golang and linter versions Signed-off-by: Anoop Gopalakrishnan <[email protected]> * Try lint Signed-off-by: Qiaozp <[email protected]> * fix go version Signed-off-by: Qiaozp <[email protected]> * rollback golangci-lint Signed-off-by: Qiaozp <[email protected]> * Add permission, bump staticcheck version Signed-off-by: Qiaozp <[email protected]> * Use staticcheck action Signed-off-by: Qiaozp <[email protected]> * Fix: remove go get command to download dependencies Update velaux image Signed-off-by: Qiaozp <[email protected]> * Fix: attempting to fix the build failure in staticheck Signed-off-by: Anoop Gopalakrishnan <[email protected]> * Fix: removed offending config for the docker setup Signed-off-by: Anoop Gopalakrishnan <[email protected]> * Fix: use newer docker version - removed timeout as that was not having any effect in the docker start wait check time Signed-off-by: Anoop Gopalakrishnan <[email protected]> * Fix: e2e tests for mac os - Upgrades docker version Signed-off-by: Anoop Gopalakrishnan <[email protected]> * Fix: upgrade the images for supporting k3s images Signed-off-by: Anoop Gopalakrishnan <[email protected]> --------- Signed-off-by: Anoop Gopalakrishnan <[email protected]> Signed-off-by: Qiaozp <[email protected]> Signed-off-by: Anoop Gopalakrishnan <[email protected]> Co-authored-by: Qiaozp <[email protected]>
kubevela · Jul 27, 2023 · aa3d7b9 · aa3d7b9
1 parent 46fd911
commit aa3d7b9
Show file tree

Hide file tree

Showing 11 changed files with 1,069 additions and 1,598 deletions.
diff --git a/.github/workflows/code-lint.yaml b/.github/workflows/code-lint.yaml
@@ -10,11 +10,13 @@ on:
       - main
       - release-*
   workflow_dispatch: { }
+permissions:
+  contents: read
 
 env:
   # Common versions
-  GO_VERSION: '1.19'
-  GOLANGCI_VERSION: 'v1.49'
+  GO_VERSION: '1.20'
+  GOLANGCI_VERSION: 'v1.52.2'
 
 jobs:
   staticcheck:
@@ -35,6 +37,8 @@ jobs:
 
       - name: Setup Docker
         uses: docker-practice/actions-setup-docker@master
+        with:
+          docker_version: "24.0.2"
 
       - name: Download resources
         run: |
@@ -46,13 +50,11 @@ jobs:
       - name: Go Dependencies
         run: |
           go mod tidy
-          go get -t -v -d ./...
-
-      - name: Install StaticCheck
-        run:  go install honnef.co/go/tools/cmd/[email protected]
 
-      - name: Static Check
-        run: staticcheck ./...
+      - uses: dominikh/[email protected]
+        with:
+          version: "2023.1.3"
+          install-go: false
 
   lint:
     strategy:
@@ -72,6 +74,8 @@ jobs:
 
       - name: Setup Docker
         uses: docker-practice/actions-setup-docker@master
+        with:
+          docker_version: "24.0.2"
 
       - name: Download resources
         run: |
@@ -109,10 +113,11 @@ jobs:
       - name: Go Dependencies
         run: |
           go mod tidy
-          go get -t -v -d ./...
 
       - name: Setup Docker
         uses: docker-practice/actions-setup-docker@master
+        with:
+          docker_version: "24.0.2"
 
       - name: Download resources
         run: |

diff --git a/.github/workflows/e2e-test.yaml b/.github/workflows/e2e-test.yaml
@@ -26,7 +26,7 @@ jobs:
       - name: Install dependencies
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: "1.20"
       - name: Get matrix
         id: get_matrix
         run: |
@@ -49,7 +49,7 @@ jobs:
       - name: Install dependencies
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: "1.20"
       - name: Install ginkgo
         run: go install github.com/onsi/ginkgo/[email protected]
       - uses: actions/download-artifact@v3
@@ -71,14 +71,16 @@ jobs:
       - name: Install dependencies
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: "1.20"
       - name: Install ginkgo
         run: go install github.com/onsi/ginkgo/[email protected]
       - uses: actions/download-artifact@v3
         with:
           name: velad-darwin-amd64
       - name: Setup Docker
-        uses: docker-practice/[email protected]
+        uses: docker-practice/actions-setup-docker@master
+        with:
+          docker_version: "24.0.2"
       - run: |
           chmod u+x velad-darwin-amd64 && mv velad-darwin-amd64 velad
           ./velad install --set image.pullPolicy=Never --set admissionWebhooks.patch.image.pullPolicy=Never --set multicluster.clusterGateway.image.pullPolicy=Never

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: "1.20"
       - name: Get release
         id: get_release
         uses: bruceadams/[email protected]

diff --git a/.golangci.yml b/.golangci.yml
@@ -111,10 +111,11 @@ linters:
     - goconst
     - goimports
     - gofmt  # We enable this as well as goimports for its simplify mode.
-    - golint
     - unconvert
     - misspell
     - nakedret
+    - exportloopref
+    # - revive
 
   presets:
     - bugs

diff --git a/Makefile b/Makefile
@@ -2,10 +2,10 @@ include makefiles/dependency.mk
 
 K3S_VERSION ?= v1.24.8+k3s1
 STATIC_DIR := pkg/resources/static
-VELA_VERSION ?= v1.8.0
-VELAUX_VERSION ?= v1.8.0
+VELA_VERSION ?= v1.9.4
+VELAUX_VERSION ?= v1.9.2
 VELA_VERSION_NO_V := $(subst v,,$(VELA_VERSION))
-VELAUX_IMAGE_VERSION ?= v1.8.0
+VELAUX_IMAGE_VERSION ?= v1.9.2
 LDFLAGS= "-X github.com/oam-dev/velad/version.VelaUXVersion=${VELAUX_VERSION} -X github.com/oam-dev/velad/version.VelaVersion=${VELA_VERSION}"
 
 UNAME_S := $(shell uname -s)
@@ -50,7 +50,7 @@ darwin-amd64 darwin-arm64 windows-amd64: download_vela_images_addons download_k3
 CHART_DIR := ${STATIC_DIR}/vela/charts
 download_vela_chart:
 	mkdir -p ${CHART_DIR}
-	curl -o ${CHART_DIR}/vela-core.tgz https://charts.kubevela.net/core/vela-core-${VELA_VERSION_NO_V}.tgz
+	curl -L -o ${CHART_DIR}/vela-core.tgz https://kubevela.github.io/charts/vela-core-${VELA_VERSION_NO_V}.tgz
 
 download_vela_images_addons: download_vela_chart
 	tar -xzf ${CHART_DIR}/vela-core.tgz -C ${CHART_DIR}