From 2a313fc1e5e5d7e321858d66e170cd6d5cd0d1fa Mon Sep 17 00:00:00 2001 From: Yin Da Date: Mon, 22 May 2023 16:50:30 +0800 Subject: [PATCH 1/2] Fix: apply application should not use strategic merge patch Signed-off-by: Yin Da --- go.mod | 5 +++-- go.sum | 10 ++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 12b7b3a..3cfbff4 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/kubevela/workflow go 1.19 require ( - cuelang.org/go v0.5.0-beta.5 + cuelang.org/go v0.5.0 github.com/agiledragon/gomonkey/v2 v2.4.0 github.com/aliyun/aliyun-log-go-sdk v0.1.38 github.com/crossplane/crossplane-runtime v0.19.2 @@ -13,7 +13,7 @@ require ( github.com/google/go-cmp v0.5.9 github.com/hashicorp/go-version v1.6.0 github.com/kubevela/kube-trigger v0.1.1-0.20230403060228-6582e7595db6 - github.com/kubevela/pkg v1.8.1-0.20230403024929-46ddc1466157 + github.com/kubevela/pkg v1.8.1-0.20230522085329-7d5e1241a86d github.com/oam-dev/kubevela v1.8.0-beta.1.0.20230410031905-d8af20224298 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.27.5 @@ -124,6 +124,7 @@ require ( github.com/imdario/mergo v0.3.13 // indirect github.com/inconshreveable/mousetrap v1.0.1 // indirect github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect + github.com/jellydator/ttlcache/v3 v3.0.1 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect diff --git a/go.sum b/go.sum index 78b1501..61ab81c 100644 --- a/go.sum +++ b/go.sum @@ -6,8 +6,8 @@ cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGB cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= -cuelang.org/go v0.5.0-beta.5 h1:TAV4ZjXw2M6xf6jI8XyAAXCqWJ82Y0oxhlf9w3l544A= -cuelang.org/go v0.5.0-beta.5/go.mod h1:okjJBHFQFer+a41sAe2SaGm1glWS8oEb6CmJvn5Zdws= +cuelang.org/go v0.5.0 h1:D6N0UgTGJCOxFKU8RU+qYvavKNsVc/+ZobmifStVJzU= +cuelang.org/go v0.5.0/go.mod h1:okjJBHFQFer+a41sAe2SaGm1glWS8oEb6CmJvn5Zdws= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/AlecAivazis/survey/v2 v2.1.1 h1:LEMbHE0pLj75faaVEKClEX1TM4AJmmnOh9eimREzLWI= github.com/AlecAivazis/survey/v2 v2.1.1/go.mod h1:9FJRdMdDm8rnT+zHVbvQT2RTSTLq0Ttd6q3Vl2fahjk= @@ -580,6 +580,8 @@ github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLf github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= +github.com/jellydator/ttlcache/v3 v3.0.1 h1:cHgCSMS7TdQcoprXnWUptJZzyFsqs18Lt8VVhRuZYVU= +github.com/jellydator/ttlcache/v3 v3.0.1/go.mod h1:WwTaEmcXQ3MTjOm4bsZoDFiCu/hMvNWLO1w67RXz6h4= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= @@ -636,8 +638,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kubevela/kube-trigger v0.1.1-0.20230403060228-6582e7595db6 h1:VIWTjPpkB+Y8PoPsLvXHXOfjmRQF332uhtMV+B+5nkM= github.com/kubevela/kube-trigger v0.1.1-0.20230403060228-6582e7595db6/go.mod h1:8cXenu5zACvEHCMt1fnVvPOJkPN+dZQz7n8zaZf4heM= -github.com/kubevela/pkg v1.8.1-0.20230403024929-46ddc1466157 h1:01SXHJZjS2CYlPY1HpcmIkFCNko59sttqC7u/PYFt7s= -github.com/kubevela/pkg v1.8.1-0.20230403024929-46ddc1466157/go.mod h1:A6f7lQwCOt0KRPnQz511QLB4JgzPpDXYUG7bY8LJkEE= +github.com/kubevela/pkg v1.8.1-0.20230522085329-7d5e1241a86d h1:QMmTg33lUZEfTz94eYJKa6Nb7GDcEOmuXsXRt/dA5vk= +github.com/kubevela/pkg v1.8.1-0.20230522085329-7d5e1241a86d/go.mod h1:3ZWrl2+zb5ROdC2NJPPrL/4sun4M10wYfRP/9gF9WJE= github.com/kubevela/prism v1.7.0-alpha.1.0.20230403030519-b7e45f7f842e h1:hc3ctkLfQVERra9IKDoAgMK4iMCY3XpXEJ0TfP9FhSQ= github.com/kubevela/prism v1.7.0-alpha.1.0.20230403030519-b7e45f7f842e/go.mod h1:bEPKTha7KhDhJAPXYBNAHTMRyqffDvf9UqWZV2BtQtI= github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= From 37e349577fb438f1e895cbccfaeba334985688e9 Mon Sep 17 00:00:00 2001 From: Yin Da Date: Tue, 23 May 2023 09:40:14 +0800 Subject: [PATCH 2/2] upgrade ci version Signed-off-by: Yin Da --- .github/workflows/e2e.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 0098c73..7be111f 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -17,8 +17,8 @@ env: # Common versions GO_VERSION: '1.19' GOLANGCI_VERSION: 'v1.49' - K3D_IMAGE_VERSION: '[\"v1.20\",\"v1.24\"]' - K3D_IMAGE_VERSIONS: '[\"v1.20\",\"v1.24\"]' + K3D_IMAGE_VERSION: '[\"v1.26\"]' + K3D_IMAGE_VERSIONS: '[\"v1.26\"]' jobs: @@ -37,7 +37,7 @@ jobs: concurrent_skipping: false set-k8s-matrix: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 outputs: matrix: ${{ steps.set-k8s-matrix.outputs.matrix }} steps: @@ -51,7 +51,7 @@ jobs: fi e2e-tests: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: [ detect-noop,set-k8s-matrix ] if: needs.detect-noop.outputs.noop != 'true' strategy: @@ -83,7 +83,7 @@ jobs: - name: Calculate K3d args run: | EGRESS_ARG="" - if [[ "${{ matrix.k8s-version }}" == v1.24 ]]; then + if [[ "${{ matrix.k8s-version }}" == v1.26 ]]; then EGRESS_ARG="--k3s-arg --egress-selector-mode=disabled@server:0" fi echo "EGRESS_ARG=${EGRESS_ARG}" >> $GITHUB_ENV