Skip to content
This repository has been archived by the owner on Nov 17, 2021. It is now read-only.

Commit

Permalink
Merge pull request #286 from bitnami/upgrade
Browse files Browse the repository at this point in the history
Upgrade github.com/genuinetools/reg to v0.16.1
  • Loading branch information
Marko Mikulicic authored Mar 16, 2020
2 parents f07144e + f3d8be4 commit f6f2af0
Show file tree
Hide file tree
Showing 696 changed files with 8,027 additions and 97,263 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go:
# first value (ditto for `os` below).
# NB: release condition below also references (one) of the values in
# this list. Update there too!
- 1.12.x
- 1.14.x

os:
- linux
Expand Down Expand Up @@ -37,7 +37,7 @@ addons:
- ca-certificates

install:
- (cd $(mktemp -d); go mod init dummy; go get github.com/jteeuwen/go-bindata/go-bindata@6025e8de665b31fa74ab1a66f2cddd8c0abf887e)
- (cd /; GO111MODULE=on go get github.com/jteeuwen/go-bindata/go-bindata@6025e8de665b31fa74ab1a66f2cddd8c0abf887e)
- |
if [ "$DO_INTEGRATION_TEST" = 1 ]; then
if ! which minikube; then
Expand All @@ -56,7 +56,7 @@ install:
--kubernetes-version $INT_KVERS
export GO111MODULE=on
GINKGO_VERSION=$(go list -f '{{.Version}}' -m github.com/onsi/ginkgo)
(cd $(mktemp -d); go mod init dummy; go get github.com/onsi/ginkgo/ginkgo@$GINKGO_VERSION)
(cd /; go get github.com/onsi/ginkgo/ginkgo@$GINKGO_VERSION)
fi
script:
Expand Down
18 changes: 8 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
module github.com/bitnami/kubecfg

require (
contrib.go.opencensus.io/exporter/ocagent v0.4.6 // indirect
github.com/Azure/go-autorest v11.5.0+incompatible // indirect
github.com/dgrijalva/jwt-go v3.1.0+incompatible // indirect
cloud.google.com/go v0.34.0 // indirect
github.com/Azure/go-autorest/autorest v0.10.0 // indirect
github.com/elazarl/go-bindata-assetfs v1.0.1-0.20180223160309-38087fe4dafb
github.com/evanphx/json-patch v4.1.0+incompatible
github.com/genuinetools/reg v0.16.1-0.20190102165523-d959057b30da
github.com/genuinetools/reg v0.16.1
github.com/ghodss/yaml v1.0.0
github.com/go-openapi/spec v0.17.0 // indirect
github.com/golang/protobuf v1.2.0
Expand All @@ -19,20 +18,21 @@ require (
github.com/imdario/mergo v0.0.0-20170326204527-d806ba8c2177 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/json-iterator/go v1.1.5 // indirect
github.com/kr/pretty v0.1.0 // indirect
github.com/mattn/go-isatty v0.0.7
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/onsi/ginkgo v1.6.0
github.com/onsi/gomega v1.4.2
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/sergi/go-diff v1.0.0
github.com/sirupsen/logrus v1.0.6
github.com/sirupsen/logrus v1.4.2
github.com/spf13/cobra v0.0.2-0.20180319062004-c439c4fa0937
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.3.0
go.opencensus.io v0.19.0 // indirect
golang.org/x/crypto v0.0.0-20180910181607-0e37d006457b
golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413
golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890 // indirect
google.golang.org/appengine v1.3.0 // indirect
google.golang.org/genproto v0.0.0-20181219182458-5a97ab628bfb // indirect
gopkg.in/inf.v0 v0.9.0 // indirect
gopkg.in/yaml.v2 v2.2.2
k8s.io/api v0.0.0-20190222213804-5cb15d344471
Expand All @@ -45,6 +45,4 @@ require (
sigs.k8s.io/yaml v1.1.0 // indirect
)

replace github.com/census-instrumentation/opencensus-proto v0.1.0-0.20181214143942-ba49f56771b8 => github.com/census-instrumentation/opencensus-proto v0.0.3-0.20181214143942-ba49f56771b8

go 1.13
220 changes: 100 additions & 120 deletions go.sum

Large diffs are not rendered by default.

17 changes: 0 additions & 17 deletions vendor/contrib.go.opencensus.io/exporter/ocagent/.travis.yml

This file was deleted.

24 changes: 0 additions & 24 deletions vendor/contrib.go.opencensus.io/exporter/ocagent/CONTRIBUTING.md

This file was deleted.

61 changes: 0 additions & 61 deletions vendor/contrib.go.opencensus.io/exporter/ocagent/README.md

This file was deleted.

38 changes: 0 additions & 38 deletions vendor/contrib.go.opencensus.io/exporter/ocagent/common.go

This file was deleted.

94 changes: 0 additions & 94 deletions vendor/contrib.go.opencensus.io/exporter/ocagent/connection.go

This file was deleted.

9 changes: 0 additions & 9 deletions vendor/contrib.go.opencensus.io/exporter/ocagent/go.mod

This file was deleted.

55 changes: 0 additions & 55 deletions vendor/contrib.go.opencensus.io/exporter/ocagent/go.sum

This file was deleted.

Loading

0 comments on commit f6f2af0

Please sign in to comment.