fix: retry when error contains internal server error message (labring…

…#3347) Signed-off-by: fengxsong <[email protected]> Co-authored-by: cuisongliu <[email protected]>
sealos-ci-robot · Jun 14, 2023 · 5eeb554 · 5eeb554
1 parent 8e1ead6
commit 5eeb554
Show file tree

Hide file tree

Showing 4 changed files with 1,043 additions and 259 deletions.
diff --git a/go.mod b/go.mod
@@ -3,51 +3,51 @@ module github.com/labring/sealos
 go 1.20
 
 require (
- github.com/BurntSushi/toml v1.2.1
+ github.com/BurntSushi/toml v1.3.2
  github.com/Masterminds/sprig/v3 v3.2.3
- github.com/containerd/containerd v1.7.0
- github.com/containers/buildah v1.29.1
- github.com/containers/common v0.51.0
- github.com/containers/image/v5 v5.24.1
+ github.com/containerd/containerd v1.7.2
+ github.com/containers/buildah v1.30.0
+ github.com/containers/common v0.53.0
+ github.com/containers/image/v5 v5.25.1-0.20230605120906-abe51339f34d
  github.com/containers/ocicrypt v1.1.7
- github.com/containers/storage v1.45.4
+ github.com/containers/storage v1.46.2-0.20230530174214-1dc289a244ce
  github.com/davecgh/go-spew v1.1.1
  github.com/distribution/distribution/v3 v3.0.0-20221208165359-362910506bc2
- github.com/docker/cli v23.0.1+incompatible
- github.com/docker/docker v23.0.1+incompatible
+ github.com/docker/cli v23.0.5+incompatible
+ github.com/docker/docker v24.0.2+incompatible
  github.com/docker/go-units v0.5.0
- github.com/dustin/go-humanize v1.0.0
+ github.com/dustin/go-humanize v1.0.1
  github.com/emicklei/go-restful/v3 v3.10.1
  github.com/emirpasic/gods v1.18.1
- github.com/google/go-containerregistry v0.13.0
+ github.com/google/go-containerregistry v0.15.2
  github.com/hashicorp/go-multierror v1.1.1
- github.com/imdario/mergo v0.3.13
+ github.com/imdario/mergo v0.3.16
  github.com/labring/image-cri-shim v0.0.0
  github.com/labring/lvscare v0.0.0
  github.com/labring/sealos/controllers/account v0.0.0
  github.com/labring/sealos/controllers/imagehub v0.0.0
  github.com/manifoldco/promptui v0.9.0
  github.com/modood/table v0.0.0-20220527013332-8d47e76dad33
  github.com/onsi/ginkgo v1.16.5
- github.com/onsi/gomega v1.26.0
+ github.com/onsi/gomega v1.27.8
  github.com/openconfig/gnmi v0.0.0-20220920173703-480bf53a74d2
  github.com/opencontainers/go-digest v1.0.1-0.20220411205349-bde1400a84be
- github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b
+ github.com/opencontainers/image-spec v1.1.0-rc3
  github.com/pelletier/go-toml v1.9.5
  github.com/pkg/sftp v1.13.5
  github.com/schollz/progressbar/v3 v3.8.6
- github.com/sirupsen/logrus v1.9.0
- github.com/spf13/cobra v1.6.1
+ github.com/sirupsen/logrus v1.9.3
+ github.com/spf13/cobra v1.7.0
  github.com/spf13/pflag v1.0.5
- github.com/stretchr/testify v1.8.2
+ github.com/stretchr/testify v1.8.4
  github.com/wechatpay-apiv3/wechatpay-go v0.2.14
- go.mongodb.org/mongo-driver v1.11.1
+ go.mongodb.org/mongo-driver v1.11.3
  go.uber.org/zap v1.24.0
- golang.org/x/crypto v0.7.0
- golang.org/x/sync v0.1.0
- golang.org/x/sys v0.6.0
- golang.org/x/term v0.6.0
- google.golang.org/grpc v1.53.0
+ golang.org/x/crypto v0.10.0
+ golang.org/x/sync v0.2.0
+ golang.org/x/sys v0.9.0
+ golang.org/x/term v0.9.0
+ google.golang.org/grpc v1.55.0
  gopkg.in/natefinch/lumberjack.v2 v2.0.0
  gopkg.in/yaml.v2 v2.4.0
  helm.sh/helm/v3 v3.11.2
@@ -58,25 +58,25 @@ require (
  k8s.io/kubectl v0.26.0
  k8s.io/kubelet v0.25.6
  k8s.io/kubernetes v1.25.6
- k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5
+ k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
  sigs.k8s.io/controller-runtime v0.13.0
  sigs.k8s.io/kustomize/kyaml v0.13.9
  sigs.k8s.io/yaml v1.3.0
 )
 
-require k8s.io/cri-api v0.26.2 // indirect
+require k8s.io/cri-api v0.27.1 // indirect
 
 require (
  github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 // indirect
- github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
+ github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
  github.com/MakeNowJust/heredoc v1.0.0 // indirect
  github.com/Masterminds/goutils v1.1.1 // indirect
  github.com/Masterminds/semver/v3 v3.2.0 // indirect
- github.com/Microsoft/go-winio v0.6.0 // indirect
- github.com/Microsoft/hcsshim v0.10.0-rc.7 // indirect
+ github.com/Microsoft/go-winio v0.6.1 // indirect
+ github.com/Microsoft/hcsshim v0.10.0-rc.8 // indirect
  github.com/VividCortex/ewma v1.2.0 // indirect
  github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
- github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
+ github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
  github.com/beorn7/perks v1.0.1 // indirect
  github.com/blang/semver/v4 v4.0.0 // indirect
  github.com/cespare/xxhash/v2 v2.2.0 // indirect
@@ -85,13 +85,13 @@ require (
  github.com/containerd/cgroups v1.1.0 // indirect
  github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
  github.com/containernetworking/cni v1.1.2 // indirect
- github.com/containernetworking/plugins v1.2.0 // indirect
+ github.com/containernetworking/plugins v1.3.0 // indirect
  github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
  github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
- github.com/cyberphone/json-canonicalization v0.0.0-20220623050100-57a0ce2678a7 // indirect
+ github.com/cyberphone/json-canonicalization v0.0.0-20230514072755-504adb8a8af1 // indirect
  github.com/cyphar/filepath-securejoin v0.2.3 // indirect
  github.com/disiqueira/gotree/v3 v3.0.2 // indirect
- github.com/docker/distribution v2.8.1+incompatible // indirect
+ github.com/docker/distribution v2.8.2+incompatible // indirect
  github.com/docker/docker-credential-helpers v0.7.0 // indirect
  github.com/docker/go-connections v0.4.1-0.20210727194412-58542c764a11 // indirect
  github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
@@ -101,21 +101,21 @@ require (
  github.com/evanphx/json-patch/v5 v5.6.0 // indirect
  github.com/felixge/httpsnoop v1.0.3 // indirect
  github.com/fsnotify/fsnotify v1.6.0 // indirect
- github.com/fsouza/go-dockerclient v1.9.4 // indirect
+ github.com/fsouza/go-dockerclient v1.9.7 // indirect
  github.com/ghodss/yaml v1.0.0 // indirect
  github.com/go-errors/errors v1.4.2 // indirect
- github.com/go-logr/logr v1.2.3 // indirect
+ github.com/go-logr/logr v1.2.4 // indirect
  github.com/go-logr/stdr v1.2.2 // indirect
  github.com/go-openapi/analysis v0.21.4 // indirect
  github.com/go-openapi/errors v0.20.3 // indirect
  github.com/go-openapi/jsonpointer v0.19.5 // indirect
  github.com/go-openapi/jsonreference v0.20.0 // indirect
  github.com/go-openapi/loads v0.21.2 // indirect
- github.com/go-openapi/runtime v0.24.1 // indirect
- github.com/go-openapi/spec v0.20.7 // indirect
- github.com/go-openapi/strfmt v0.21.3 // indirect
+ github.com/go-openapi/runtime v0.26.0 // indirect
+ github.com/go-openapi/spec v0.20.9 // indirect
+ github.com/go-openapi/strfmt v0.21.7 // indirect
  github.com/go-openapi/swag v0.22.3 // indirect
- github.com/go-openapi/validate v0.22.0 // indirect
+ github.com/go-openapi/validate v0.22.1 // indirect
  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
@@ -139,19 +139,19 @@ require (
  github.com/jinzhu/copier v0.3.5 // indirect
  github.com/josharian/intern v1.0.0 // indirect
  github.com/json-iterator/go v1.1.12 // indirect
- github.com/klauspost/compress v1.16.0 // indirect
- github.com/klauspost/pgzip v1.2.6-0.20220930104621-17e8dac29df8 // indirect
+ github.com/klauspost/compress v1.16.5 // indirect
+ github.com/klauspost/pgzip v1.2.6 // indirect
  github.com/kr/fs v0.1.0 // indirect
  github.com/labring/sealos/controllers/user v0.0.0 // indirect
- github.com/letsencrypt/boulder v0.0.0-20221109233200-85aa52084eaf // indirect
+ github.com/letsencrypt/boulder v0.0.0-20230213213521-fdfea0d469b6 // indirect
  github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
  github.com/lithammer/dedent v1.1.0 // indirect
  github.com/mailru/easyjson v0.7.7 // indirect
  github.com/mattn/go-runewidth v0.0.14 // indirect
  github.com/mattn/go-shellwords v1.0.12 // indirect
  github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
  github.com/miekg/pkcs11 v1.1.1 // indirect
- github.com/mistifyio/go-zfs/v3 v3.0.0 // indirect
+ github.com/mistifyio/go-zfs/v3 v3.0.1 // indirect
  github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
  github.com/mitchellh/copystructure v1.2.0 // indirect
  github.com/mitchellh/go-homedir v1.1.0 // indirect
@@ -164,7 +164,7 @@ require (
  github.com/moby/spdystream v0.2.0 // indirect
  github.com/moby/sys/mountinfo v0.6.2 // indirect
  github.com/moby/sys/sequential v0.5.0 // indirect
- github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
+ github.com/moby/term v0.5.0 // indirect
  github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
  github.com/modern-go/reflect2 v1.0.2 // indirect
  github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
@@ -173,42 +173,41 @@ require (
  github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
  github.com/nxadm/tail v1.4.8 // indirect
  github.com/oklog/ulid v1.3.1 // indirect
- github.com/opencontainers/runc v1.1.4 // indirect
- github.com/opencontainers/runtime-spec v1.1.0-rc.1 // indirect
- github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626 // indirect
+ github.com/opencontainers/runc v1.1.7 // indirect
+ github.com/opencontainers/runtime-spec v1.1.0-rc.3 // indirect
+ github.com/opencontainers/runtime-tools v0.9.1-0.20230317050512-e931285f4b69 // indirect
  github.com/opencontainers/selinux v1.11.0 // indirect
  github.com/openshift/imagebuilder v1.2.4-0.20230309135844-a3c3f8358ca3 // indirect
  github.com/ostreedev/ostree-go v0.0.0-20210805093236-719684c64e4f // indirect
  github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
  github.com/pkg/errors v0.9.1 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
  github.com/proglottis/gpgme v0.1.3 // indirect
- github.com/prometheus/client_golang v1.14.0 // indirect
- github.com/prometheus/client_model v0.3.0 // indirect
- github.com/prometheus/common v0.39.0 // indirect
+ github.com/prometheus/client_golang v1.15.1 // indirect
+ github.com/prometheus/client_model v0.4.0 // indirect
+ github.com/prometheus/common v0.42.0 // indirect
  github.com/prometheus/procfs v0.9.0 // indirect
- github.com/rivo/uniseg v0.4.3 // indirect
- github.com/rogpeppe/go-internal v1.9.0 // indirect
+ github.com/rivo/uniseg v0.4.4 // indirect
  github.com/russross/blackfriday v1.6.0 // indirect
  github.com/russross/blackfriday/v2 v2.1.0 // indirect
  github.com/seccomp/libseccomp-golang v0.10.0 // indirect
  github.com/shopspring/decimal v1.3.1 // indirect
- github.com/sigstore/fulcio v1.0.0 // indirect
- github.com/sigstore/rekor v1.0.1 // indirect
- github.com/sigstore/sigstore v1.5.1 // indirect
+ github.com/sigstore/fulcio v1.3.1 // indirect
+ github.com/sigstore/rekor v1.2.2-0.20230601122533-4c81ff246d12 // indirect
+ github.com/sigstore/sigstore v1.6.5 // indirect
  github.com/smartystreets/goconvey v1.8.0 // indirect
- github.com/spf13/cast v1.5.0 // indirect
+ github.com/spf13/cast v1.5.1 // indirect
  github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980 // indirect
- github.com/sylabs/sif/v2 v2.9.0 // indirect
+ github.com/sylabs/sif/v2 v2.11.4 // indirect
  github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
  github.com/tchap/go-patricia/v2 v2.3.1 // indirect
- github.com/theupdateframework/go-tuf v0.5.2-0.20221207161717-9cb61d6e65f5 // indirect
+ github.com/theupdateframework/go-tuf v0.5.2 // indirect
  github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
  github.com/ulikunitz/xz v0.5.11 // indirect
- github.com/vbatts/tar-split v0.11.2 // indirect
- github.com/vbauerster/mpb/v7 v7.5.3 // indirect
+ github.com/vbatts/tar-split v0.11.3 // indirect
+ github.com/vbauerster/mpb/v8 v8.4.0 // indirect
  github.com/vishvananda/netlink v1.2.1-beta.2 // indirect
- github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 // indirect
+ github.com/vishvananda/netns v0.0.4 // indirect
  github.com/xdg-go/pbkdf2 v1.0.0 // indirect
  github.com/xdg-go/scram v1.1.1 // indirect
  github.com/xdg-go/stringprep v1.0.3 // indirect
@@ -220,21 +219,23 @@ require (
  go.etcd.io/bbolt v1.3.7 // indirect
  go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect
  go.opencensus.io v0.24.0 // indirect
- go.opentelemetry.io/otel v1.14.0 // indirect
- go.opentelemetry.io/otel/trace v1.14.0 // indirect
+ go.opentelemetry.io/otel v1.15.0 // indirect
+ go.opentelemetry.io/otel/trace v1.15.0 // indirect
  go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
  go.uber.org/atomic v1.10.0 // indirect
- go.uber.org/multierr v1.9.0 // indirect
- golang.org/x/mod v0.9.0 // indirect
- golang.org/x/net v0.8.0 // indirect
- golang.org/x/oauth2 v0.6.0 // indirect
- golang.org/x/text v0.8.0 // indirect
+ go.uber.org/multierr v1.11.0 // indirect
+ golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
+ golang.org/x/mod v0.10.0 // indirect
+ golang.org/x/net v0.10.0 // indirect
+ golang.org/x/oauth2 v0.8.0 // indirect
+ golang.org/x/text v0.10.0 // indirect
  golang.org/x/time v0.3.0 // indirect
- golang.org/x/tools v0.7.0 // indirect
+ golang.org/x/tools v0.9.3 // indirect
  gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
  google.golang.org/appengine v1.6.7 // indirect
- google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
- google.golang.org/protobuf v1.29.0 // indirect
+ google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
+ google.golang.org/protobuf v1.30.0 // indirect
+ gopkg.in/go-jose/go-jose.v2 v2.6.1 // indirect
  gopkg.in/inf.v0 v0.9.1 // indirect
  gopkg.in/square/go-jose.v2 v2.6.0 // indirect
  gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
@@ -245,10 +246,10 @@ require (
  k8s.io/cluster-bootstrap v0.25.6 // indirect
  k8s.io/component-base v0.26.2 // indirect
  k8s.io/component-helpers v0.25.6 // indirect
- k8s.io/klog/v2 v2.90.1 // indirect
+ k8s.io/klog/v2 v2.100.1 // indirect
  k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
  oras.land/oras-go v1.2.3 // indirect
- sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
+ sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
  sigs.k8s.io/kustomize/api v0.12.1 // indirect
  sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 )
@@ -269,7 +270,11 @@ replace (
  k8s.io/kubelet => k8s.io/kubelet v0.25.6
 )
 
-replace github.com/vishvananda/netlink => github.com/vishvananda/netlink v1.1.0
+replace (
+ github.com/containers/common => github.com/containers/common v0.53.1-0.20230613173441-e1ea4d9a74e5
+ github.com/docker/docker => github.com/docker/docker v23.0.6+incompatible
+ github.com/vishvananda/netlink => github.com/vishvananda/netlink v1.1.0
+)
 
 replace (
  github.com/labring/image-cri-shim => ./staging/src/github.com/labring/image-cri-shim