From a433b8ec0a7eac1f90163d859e741534526b783d Mon Sep 17 00:00:00 2001 From: DanStough Date: Wed, 22 Dec 2021 16:42:46 +0000 Subject: [PATCH] chore: update go to 1.17 --- .devcontainer/devcontainer.json | 2 +- .github/workflows/alpha.yaml | 8 +- .github/workflows/build-test.yaml | 8 +- .github/workflows/nightly.yaml | 2 +- .github/workflows/release.yaml | 10 +- actions/copy-assets/Dockerfile | 4 +- actions/copy-assets/go.mod | 11 +- go.mod | 318 ++++++++++++++++++++++++++++-- hack/dev/Dockerfile.skaffoldcache | 2 +- kurl_proxy/Dockerfile.skaffold | 2 +- kurl_proxy/go.mod | 37 +++- 11 files changed, 368 insertions(+), 36 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index d6798d4b2e..a0a09ee449 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,7 +5,7 @@ "build": { "dockerfile": "Dockerfile", "args": { - "GO_VERSION": "1.16", + "GO_VERSION": "1.17", } }, diff --git a/.github/workflows/alpha.yaml b/.github/workflows/alpha.yaml index 9f62c8281d..d4aa7347af 100644 --- a/.github/workflows/alpha.yaml +++ b/.github/workflows/alpha.yaml @@ -184,7 +184,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2 with: - go-version: '^1.16.3' + go-version: '^1.17.4' - name: Build kurl_proxy env: @@ -210,7 +210,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '^1.16.3' + go-version: '^1.17.4' - id: go-cache-paths run: | @@ -259,7 +259,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2 with: - go-version: '^1.16.3' + go-version: '^1.17.4' - id: go-cache-paths run: | @@ -310,7 +310,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2 with: - go-version: '^1.16.3' + go-version: '^1.17.4' - id: go-cache-paths run: | diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml index 4e89d3cb7d..d71387e136 100644 --- a/.github/workflows/build-test.yaml +++ b/.github/workflows/build-test.yaml @@ -64,7 +64,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '^1.16.3' + go-version: '^1.17.4' - name: setup env run: | @@ -112,7 +112,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '^1.16.3' + go-version: '^1.17.4' - name: setup env run: | @@ -162,7 +162,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '^1.16.3' + go-version: '^1.17.4' - name: setup env run: | @@ -208,7 +208,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '^1.16.3' + go-version: '^1.17.4' - name: setup env run: | diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index bc01365450..956287e305 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -35,7 +35,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2 with: - go-version: '^1.16.3' + go-version: '^1.17.4' - name: Run Update Script env: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index c5fd993f0a..cdd6195548 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -166,7 +166,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2 with: - go-version: '^1.16.3' + go-version: '^1.17.4' - name: Get tags id: get_tag @@ -195,7 +195,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '^1.16.3' + go-version: '^1.17.4' - id: go-cache-paths run: | @@ -247,7 +247,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2 with: - go-version: '^1.16.3' + go-version: '^1.17.4' - id: go-cache-paths run: | @@ -310,7 +310,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2 with: - go-version: '^1.16.3' + go-version: '^1.17.4' - id: go-cache-paths run: | @@ -372,7 +372,7 @@ jobs: - uses: actions/setup-go@v2 with: - go-version: '^1.16.3' + go-version: '^1.17.4' - run: sudo apt-get update -y - run: sudo apt-get -qq -y install gnupg2 libdevmapper-dev libgpgme-dev libc6-dev-i386 btrfs-progs btrfs-tools pkg-config diff --git a/actions/copy-assets/Dockerfile b/actions/copy-assets/Dockerfile index f8a633e2f5..850d9eaad9 100644 --- a/actions/copy-assets/Dockerfile +++ b/actions/copy-assets/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16 as builder +FROM golang:1.17 as builder WORKDIR /action COPY . /action @@ -8,4 +8,4 @@ RUN go build -ldflags="-w -s" -v -o copy-assets . FROM alpine:latest COPY --from=builder /action/copy-assets /copy-assets -ENTRYPOINT ["/copy-assets"] \ No newline at end of file +ENTRYPOINT ["/copy-assets"] diff --git a/actions/copy-assets/go.mod b/actions/copy-assets/go.mod index de680e3400..a9cfe18d54 100644 --- a/actions/copy-assets/go.mod +++ b/actions/copy-assets/go.mod @@ -1,9 +1,18 @@ module github.com/replicatedhq/kots/actions/copy-assets -go 1.16 +go 1.17 require ( github.com/google/go-github/v39 v39.0.0 github.com/pkg/errors v0.9.1 golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f ) + +require ( + github.com/golang/protobuf v1.4.2 // indirect + github.com/google/go-querystring v1.1.0 // indirect + golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect + golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/protobuf v1.25.0 // indirect +) diff --git a/go.mod b/go.mod index 03f4022334..fac17bbf87 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/replicatedhq/kots -go 1.16 +go 1.17 require ( cloud.google.com/go/storage v1.10.0 @@ -14,9 +14,6 @@ require ( github.com/aws/aws-sdk-go v1.38.49 github.com/bitnami-labs/sealed-secrets v0.14.1 github.com/blang/semver v3.5.1+incompatible - github.com/bugsnag/bugsnag-go v1.5.3 // indirect - github.com/bugsnag/panicwrap v1.2.0 // indirect - github.com/c9s/goprocinfo v0.0.0-20190309065803-0b2ad9ac246b // indirect github.com/containerd/containerd v1.5.7 github.com/containers/image/v5 v5.17.0 github.com/coreos/go-oidc v2.2.1+incompatible @@ -24,7 +21,6 @@ require ( github.com/docker/distribution v2.7.1+incompatible github.com/docker/go-units v0.4.0 github.com/fatih/color v1.13.0 - github.com/garyburd/redigo v1.6.0 // indirect github.com/ghodss/yaml v1.0.0 github.com/go-git/go-git/v5 v5.2.0 github.com/go-logfmt/logfmt v0.5.0 @@ -40,7 +36,6 @@ require ( github.com/hashicorp/go-cleanhttp v0.5.2 github.com/heroku/docker-registry-client v0.0.0-20190909225348-afc9e1acc3d5 github.com/k3s-io/kine v0.7.3 - github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect github.com/lib/pq v1.10.4 github.com/manifoldco/promptui v0.9.0 github.com/marccampbell/yaml-toolbox v0.0.0-20200805160637-950ceb36c770 @@ -50,13 +45,11 @@ require ( github.com/mitchellh/hashstructure v1.1.0 github.com/open-policy-agent/opa v0.24.0 github.com/opencontainers/image-spec v1.0.2-0.20210819154149-5ad6f50d6283 - github.com/openshift/api v0.0.0-20210513192832-efee9960e6fd // indirect github.com/openshift/client-go v0.0.0-20210503124028-ac0910aac9fa github.com/otiai10/copy v1.0.2 github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 github.com/pkg/errors v0.9.1 github.com/pmezard/go-difflib v1.0.0 - github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect github.com/rancher/wrangler v0.8.3 github.com/replicatedhq/kurl v0.0.0-20210414162418-8d6211901244 github.com/replicatedhq/troubleshoot v0.26.0 @@ -72,15 +65,10 @@ require ( github.com/stretchr/testify v1.7.0 github.com/tj/go-spin v1.1.0 github.com/vmware-tanzu/velero v1.5.4 - github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 // indirect - github.com/yvasiyarov/gorelic v0.0.7 // indirect - github.com/yvasiyarov/newrelic_platform_go v0.0.0-20160601141957-9c099fbc30e9 // indirect; indirect= - go.starlark.net v0.0.0-20200821142938-949cc6f4b097 // indirect go.uber.org/multierr v1.6.0 go.uber.org/zap v1.19.1 golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f - golang.org/x/tools v0.1.8-0.20211028023602-8de2a7fd1736 // indirect google.golang.org/api v0.56.0 google.golang.org/grpc v1.41.0 gopkg.in/go-playground/assert.v1 v1.2.1 @@ -95,12 +83,10 @@ require ( k8s.io/cli-runtime v0.23.1 k8s.io/client-go v0.23.1 k8s.io/cluster-bootstrap v0.22.1 - k8s.io/controller-manager v0.23.1 // indirect k8s.io/helm v2.14.3+incompatible k8s.io/klog/v2 v2.30.0 k8s.io/kubelet v0.0.0 k8s.io/kubernetes v1.23.1 - k8s.io/metrics v0.16.15 // indirect k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b oras.land/oras-go v0.4.0 sigs.k8s.io/application v0.8.3 @@ -110,6 +96,308 @@ require ( sigs.k8s.io/yaml v1.3.0 ) +require ( + cloud.google.com/go v0.93.3 // indirect + github.com/AppsFlyer/go-sundheit v0.4.0 // indirect + github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect + github.com/Azure/go-autorest v14.2.0+incompatible // indirect + github.com/Azure/go-autorest/autorest/azure/auth v0.4.2 // indirect + github.com/Azure/go-autorest/autorest/azure/cli v0.3.1 // indirect + github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect + github.com/Azure/go-autorest/autorest/mocks v0.4.1 // indirect + github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect + github.com/Azure/go-autorest/autorest/validation v0.2.0 // indirect + github.com/Azure/go-autorest/logger v0.2.1 // indirect + github.com/Azure/go-autorest/tracing v0.6.0 // indirect + github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c // indirect + github.com/BurntSushi/toml v0.4.1 // indirect + github.com/GoogleCloudPlatform/k8s-cloud-provider v1.16.1-0.20210702024009-ea6160c1d0e3 // indirect + github.com/MakeNowJust/heredoc v1.0.0 // indirect + github.com/Masterminds/goutils v1.1.1 // indirect + github.com/Masterminds/sprig v2.22.0+incompatible // indirect + github.com/Masterminds/squirrel v1.5.0 // indirect + github.com/Microsoft/go-winio v0.5.0 // indirect + github.com/Microsoft/hcsshim v0.8.22 // indirect + github.com/NYTimes/gziphandler v1.1.1 // indirect + github.com/OneOfOne/xxhash v1.2.7 // indirect + github.com/PuerkitoBio/purell v1.1.1 // indirect + github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect + github.com/Rican7/retry v0.1.0 // indirect + github.com/VividCortex/ewma v1.2.0 // indirect + github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect + github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e // indirect + github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef // indirect + github.com/aws/aws-sdk-go-v2 v1.3.0 // indirect + github.com/aws/aws-sdk-go-v2/config v1.1.3 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.1.3 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.4 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.4 // indirect + github.com/aws/aws-sdk-go-v2/service/ssm v1.2.0 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.1.3 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.2.0 // indirect + github.com/aws/smithy-go v1.2.0 // indirect + github.com/beevik/etree v1.1.0 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect + github.com/bugsnag/bugsnag-go v1.5.3 // indirect + github.com/bugsnag/panicwrap v1.2.0 // indirect + github.com/c9s/goprocinfo v0.0.0-20190309065803-0b2ad9ac246b // indirect + github.com/canonical/go-dqlite v1.5.1 // indirect + github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 // indirect + github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect + github.com/container-storage-interface/spec v1.5.0 // indirect + github.com/containerd/cgroups v1.0.1 // indirect + github.com/containerd/stargz-snapshotter/estargz v0.9.0 // indirect + github.com/containers/libtrust v0.0.0-20190913040956-14b96171aa3b // indirect + github.com/containers/ocicrypt v1.1.2 // indirect + github.com/containers/storage v1.37.0 // indirect + github.com/coreos/go-oidc/v3 v3.0.0 // indirect + github.com/coreos/go-semver v0.3.0 // indirect + github.com/coreos/go-systemd/v22 v22.3.2 // indirect + github.com/cyphar/filepath-securejoin v0.2.2 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/dexidp/dex/api/v2 v2.0.0 // indirect + github.com/dimchansky/utfbom v1.1.0 // indirect + github.com/docker/cli v20.10.7+incompatible // indirect + github.com/docker/docker v20.10.11+incompatible // indirect + github.com/docker/docker-credential-helpers v0.6.4 // indirect + github.com/docker/go-connections v0.4.0 // indirect + github.com/docker/go-metrics v0.0.1 // indirect + github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect + github.com/dsnet/compress v0.0.1 // indirect + github.com/dustin/go-humanize v1.0.0 // indirect + github.com/emicklei/go-restful v2.9.6+incompatible // indirect + github.com/emirpasic/gods v1.12.0 // indirect + github.com/evanphx/json-patch v4.12.0+incompatible // indirect + github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect + github.com/felixge/httpsnoop v1.0.2 // indirect + github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect + github.com/fsnotify/fsnotify v1.5.1 // indirect + github.com/garyburd/redigo v1.6.0 // indirect + github.com/go-asn1-ber/asn1-ber v1.5.1 // indirect + github.com/go-errors/errors v1.0.1 // indirect + github.com/go-git/gcfg v1.5.0 // indirect + github.com/go-git/go-billy/v5 v5.0.0 // indirect + github.com/go-ldap/ldap/v3 v3.3.0 // indirect + github.com/go-logr/logr v1.2.0 // indirect + github.com/go-ole/go-ole v1.2.6 // indirect + github.com/go-openapi/jsonpointer v0.19.5 // indirect + github.com/go-openapi/jsonreference v0.19.5 // indirect + github.com/go-openapi/swag v0.19.14 // indirect + github.com/go-redis/redis/v7 v7.4.1 // indirect + github.com/go-sql-driver/mysql v1.6.0 // indirect + github.com/gobwas/glob v0.2.3 // indirect + github.com/gocql/gocql v0.0.0-20200815110948-5378c8f664e9 // indirect + github.com/godbus/dbus v4.1.0+incompatible // indirect + github.com/gofrs/uuid v4.0.0+incompatible // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/golang/snappy v0.0.4 // indirect + github.com/google/btree v1.0.1 // indirect + github.com/google/cel-go v0.9.0 // indirect + github.com/google/go-cmp v0.5.6 // indirect + github.com/google/go-intervals v0.0.2 // indirect + github.com/google/go-querystring v1.1.0 // indirect + github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect + github.com/googleapis/gax-go/v2 v2.1.0 // indirect + github.com/googleapis/gnostic v0.5.5 // indirect + github.com/gophercloud/gophercloud v0.1.0 // indirect + github.com/gorilla/handlers v1.5.1 // indirect + github.com/gosuri/uitable v0.0.4 // indirect + github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect + github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect + github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect + github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect + github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect + github.com/hashicorp/errwrap v1.0.0 // indirect + github.com/hashicorp/go-getter v1.5.9 // indirect + github.com/hashicorp/go-hclog v0.12.0 // indirect + github.com/hashicorp/go-multierror v1.1.1 // indirect + github.com/hashicorp/go-plugin v0.0.0-20190610192547-a1bc61569a26 // indirect + github.com/hashicorp/go-safetemp v1.0.0 // indirect + github.com/hashicorp/go-version v1.3.0 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect + github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb // indirect + github.com/huandu/xstrings v1.3.2 // indirect + github.com/imdario/mergo v0.3.12 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/jackc/chunkreader/v2 v2.0.1 // indirect + github.com/jackc/pgconn v1.8.0 // indirect + github.com/jackc/pgio v1.0.0 // indirect + github.com/jackc/pgpassfile v1.0.0 // indirect + github.com/jackc/pgproto3/v2 v2.0.6 // indirect + github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect + github.com/jackc/pgtype v1.6.2 // indirect + github.com/jackc/pgx/v4 v4.10.1 // 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/joho/godotenv v1.3.0 // indirect + github.com/jonboulle/clockwork v0.2.2 // indirect + github.com/josharian/intern v1.0.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect + github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect + github.com/klauspost/compress v1.13.6 // indirect + github.com/klauspost/pgzip v1.2.5 // indirect + github.com/kr/pretty v0.3.0 // indirect + github.com/kubernetes-csi/external-snapshotter/v2 v2.2.0-rc1 // indirect + github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect + github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect + github.com/libopenstorage/openstorage v1.0.0 // indirect + github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect + github.com/longhorn/go-iscsi-helper v0.0.0-20210330030558-49a327fb024e // indirect + github.com/magiconair/properties v1.8.5 // indirect + github.com/mailru/easyjson v0.7.6 // indirect + github.com/mattermost/xml-roundtrip-validator v0.1.0 // indirect + github.com/mattn/go-colorable v0.1.9 // indirect + github.com/mattn/go-runewidth v0.0.13 // indirect + github.com/mattn/go-shellwords v1.0.12 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/miekg/pkcs11 v1.0.3 // indirect + github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect + github.com/mitchellh/copystructure v1.1.1 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/mitchellh/go-testing-interface v1.0.0 // indirect + github.com/mitchellh/go-wordwrap v1.0.0 // indirect + github.com/mitchellh/mapstructure v1.4.2 // indirect + github.com/mitchellh/reflectwalk v1.0.1 // indirect + github.com/mkmik/multierror v0.3.0 // indirect + github.com/moby/locker v1.0.1 // indirect + github.com/moby/spdystream v0.2.0 // indirect + github.com/moby/sys/mountinfo v0.4.1 // indirect + github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect + github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect + github.com/morikuni/aec v1.0.0 // indirect + github.com/mtrmac/gpgme v0.1.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect + github.com/nwaples/rardecode v1.1.2 // indirect + github.com/oklog/run v1.1.0 // indirect + github.com/opencontainers/go-digest v1.0.0 // indirect + github.com/opencontainers/runc v1.0.2 // indirect + github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect + github.com/opencontainers/selinux v1.9.1 // indirect + github.com/openshift/api v0.0.0-20210513192832-efee9960e6fd // indirect + github.com/ostreedev/ostree-go v0.0.0-20190702140239-759a8c1ac913 // indirect + github.com/pelletier/go-toml v1.9.4 // indirect + github.com/peterbourgon/diskv v2.0.1+incompatible // indirect + github.com/pierrec/lz4 v2.6.1+incompatible // indirect + github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect + github.com/prometheus/client_golang v1.11.0 // indirect + github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/common v0.28.0 // indirect + github.com/prometheus/procfs v0.6.0 // indirect + github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be // indirect + github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a // indirect + github.com/rivo/uniseg v0.2.0 // indirect + github.com/rubenv/sql-migrate v0.0.0-20210614095031-55d5740dbbcc // indirect + github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021 // indirect + github.com/russellhaering/goxmldsig v1.1.0 // indirect + github.com/russross/blackfriday v1.5.2 // indirect + github.com/satori/go.uuid v1.2.0 // indirect + github.com/shirou/gopsutil v3.21.11+incompatible // indirect + github.com/shopspring/decimal v1.2.0 // indirect + github.com/sirupsen/logrus v1.8.1 // indirect + github.com/soheilhy/cmux v0.1.5 // indirect + github.com/spf13/afero v1.6.0 // indirect + github.com/spf13/cast v1.4.1 // indirect + github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980 // indirect + github.com/stoewer/go-strcase v1.2.0 // indirect + github.com/subosito/gotenv v1.2.0 // indirect + github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect + github.com/tchap/go-patricia v2.3.0+incompatible // indirect + github.com/tklauser/go-sysconf v0.3.9 // indirect + github.com/tklauser/numcpus v0.3.0 // indirect + github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect + github.com/ulikunitz/xz v0.5.10 // indirect + github.com/vbatts/tar-split v0.11.2 // indirect + github.com/vbauerster/mpb/v7 v7.1.5 // indirect + github.com/vmware/govmomi v0.20.3 // indirect + github.com/xanzy/ssh-agent v0.2.1 // indirect + github.com/xeipuuv/gojsonpointer v0.0.0-20190809123943-df4f5c81cb3b // indirect + github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect + github.com/xeipuuv/gojsonschema v1.2.0 // indirect + github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect + github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect + github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect + github.com/xo/dburl v0.0.0-20200124232849-e9ec94f52bc3 // indirect + github.com/yashtewari/glob-intersection v0.0.0-20180916065949-5c77d914dd0b // indirect + github.com/yusufpapurcu/wmi v1.2.2 // indirect + github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 // indirect + github.com/yvasiyarov/gorelic v0.0.7 // indirect + github.com/yvasiyarov/newrelic_platform_go v0.0.0-20160601141957-9c099fbc30e9 // indirect; indirect= + go.etcd.io/bbolt v1.3.6 // indirect + go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738 // indirect + go.etcd.io/etcd/api/v3 v3.5.0 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.5.0 // indirect + go.etcd.io/etcd/client/v2 v2.305.0 // indirect + go.etcd.io/etcd/client/v3 v3.5.0 // indirect + go.etcd.io/etcd/pkg/v3 v3.5.0 // indirect + go.etcd.io/etcd/raft/v3 v3.5.0 // indirect + go.etcd.io/etcd/server/v3 v3.5.0 // indirect + go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1 // indirect + go.opencensus.io v0.23.0 // indirect + go.opentelemetry.io/contrib v0.20.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect + go.opentelemetry.io/otel v0.20.0 // indirect + go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect + go.opentelemetry.io/otel/metric v0.20.0 // indirect + go.opentelemetry.io/otel/sdk v0.20.0 // indirect + go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect + go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect + go.opentelemetry.io/otel/trace v0.20.0 // indirect + go.opentelemetry.io/proto/otlp v0.7.0 // indirect + go.starlark.net v0.0.0-20200821142938-949cc6f4b097 // indirect + go.uber.org/atomic v1.7.0 // indirect + golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect + golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 // indirect + golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect + golang.org/x/text v0.3.7 // indirect + golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect + golang.org/x/tools v0.1.8-0.20211028023602-8de2a7fd1736 // indirect + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + gonum.org/v1/gonum v0.6.2 // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/genproto v0.0.0-20211005153810-c76a74d43a8e // indirect + google.golang.org/protobuf v1.27.1 // indirect + gopkg.in/gcfg.v1 v1.2.3 // indirect + gopkg.in/gorp.v1 v1.7.2 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect + gopkg.in/square/go-jose.v2 v2.6.0 // indirect + gopkg.in/warnings.v0 v0.1.2 // indirect + k8s.io/apiserver v0.23.1 // indirect + k8s.io/cloud-provider v0.0.0 // indirect + k8s.io/component-base v0.23.1 // indirect + k8s.io/component-helpers v0.0.0 // indirect + k8s.io/controller-manager v0.23.1 // indirect + k8s.io/cri-api v0.20.6 // indirect + k8s.io/csi-translation-lib v0.0.0 // indirect + k8s.io/kube-aggregator v0.18.0 // indirect + k8s.io/kube-controller-manager v0.0.0 // indirect + k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect + k8s.io/kube-proxy v0.0.0 // indirect + k8s.io/kube-scheduler v0.0.0 // indirect + k8s.io/kubectl v0.22.1 // indirect + k8s.io/legacy-cloud-providers v0.0.0 // indirect + k8s.io/metrics v0.16.15 // indirect + k8s.io/mount-utils v0.0.0 // indirect + k8s.io/pod-security-admission v0.0.0 // indirect + periph.io/x/periph v3.6.8+incompatible // indirect + sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.25 // indirect + sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect +) + replace ( github.com/go-openapi/jsonpointer => github.com/go-openapi/jsonpointer v0.19.5 github.com/go-openapi/jsonreference => github.com/go-openapi/jsonreference v0.19.6 diff --git a/hack/dev/Dockerfile.skaffoldcache b/hack/dev/Dockerfile.skaffoldcache index b0d2c46ad3..62539f183b 100644 --- a/hack/dev/Dockerfile.skaffoldcache +++ b/hack/dev/Dockerfile.skaffoldcache @@ -1,4 +1,4 @@ -FROM golang:1.16 as deps +FROM golang:1.17 as deps RUN go get github.com/go-delve/delve/cmd/dlv@v1.7.2 diff --git a/kurl_proxy/Dockerfile.skaffold b/kurl_proxy/Dockerfile.skaffold index b3201d47d6..0d1ec17b3e 100644 --- a/kurl_proxy/Dockerfile.skaffold +++ b/kurl_proxy/Dockerfile.skaffold @@ -1,4 +1,4 @@ -FROM golang:1.16 +FROM golang:1.17 ENV PROJECTPATH=/go/src/github.com/replicatedhq/kots/kurl_proxy WORKDIR $PROJECTPATH diff --git a/kurl_proxy/go.mod b/kurl_proxy/go.mod index 2d96cc8e02..2e55ab6796 100644 --- a/kurl_proxy/go.mod +++ b/kurl_proxy/go.mod @@ -1,6 +1,6 @@ module github.com/replicatedhq/kots/kurl_proxy -go 1.16 +go 1.17 require ( github.com/docker/go-connections v0.4.0 @@ -12,3 +12,38 @@ require ( k8s.io/apimachinery v0.22.2 k8s.io/client-go v0.22.2 ) + +require ( + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/gin-contrib/sse v0.1.0 // indirect + github.com/go-logr/logr v0.4.0 // indirect + github.com/go-playground/locales v0.13.0 // indirect + github.com/go-playground/universal-translator v0.17.0 // indirect + github.com/go-playground/validator/v10 v10.4.1 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/google/go-cmp v0.5.5 // indirect + github.com/google/gofuzz v1.1.0 // indirect + github.com/googleapis/gnostic v0.5.5 // indirect + github.com/json-iterator/go v1.1.11 // indirect + github.com/leodido/go-urn v1.2.0 // indirect + github.com/mattn/go-isatty v0.0.12 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect + github.com/ugorji/go/codec v1.1.7 // indirect + golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect + golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect + golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect + golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 // indirect + golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect + golang.org/x/text v0.3.6 // indirect + golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect + google.golang.org/appengine v1.6.5 // indirect + google.golang.org/protobuf v1.26.0 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + k8s.io/klog/v2 v2.9.0 // indirect + k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect + sigs.k8s.io/yaml v1.2.0 // indirect +)