Skip to content

Commit

Permalink
Upgraded version with test fixes
Browse files Browse the repository at this point in the history
Signed-off-by: Rahul M Chheda <rchheda@infracloud.io>
  • Loading branch information
Rahul M Chheda committed Jul 27, 2020
1 parent bbe17e8 commit 4841ef4
Show file tree
Hide file tree
Showing 76 changed files with 815 additions and 547 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
install:
- make go-mod-download
before_script:
- docker pull kindest/node:v1.17.2
- docker pull kindest/node:v1.18.2
- make start-kind
script:
- make build
Expand All @@ -44,7 +44,7 @@ jobs:
install:
- make go-mod-download
before_script:
- docker pull kindest/node:v1.17.2
- docker pull kindest/node:v1.18.2
- make start-kind
- make install-minio
script:
Expand Down
2 changes: 1 addition & 1 deletion build/codegen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ set -o xtrace

export GO111MODULE=on
go mod download
execDir="/go/pkg/mod/k8s.io/code-generator@$(go list -f '{{.Version}}' -m k8s.io/code-generator)"
execDir="$GOPATH/pkg/mod/k8s.io/code-generator@$(go list -f '{{.Version}}' -m k8s.io/code-generator)"
chmod +x "${execDir}"/generate-groups.sh
"${execDir}"/generate-groups.sh \
all \
Expand Down
4 changes: 2 additions & 2 deletions build/local_kubernetes.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export MINIKUBE_WANTREPORTERRORPROMPT=false
export MINIKUBE_HOME=$HOME
export CHANGE_MINIKUBE_NONE_USER=true
export KUBECONFIG=$HOME/.kube/config
export KUBE_VERSION=${KUBE_VERSION:-"v1.17.2"}
export KUBE_VERSION=${KUBE_VERSION:-"v1.18.2"}
export KIND_VERSION=${KIND_VERSION:-"v0.5.1"}
export LOCAL_CLUSTER_NAME=${LOCAL_CLUSTER_NAME:-"kanister"}
export LOCAL_PATH_PROV_VERSION="v0.0.11"
Expand Down Expand Up @@ -52,7 +52,7 @@ start_localkube() {
then
get_localkube
fi
kind create cluster --name ${LOCAL_CLUSTER_NAME} --image=kindest/node:${KUBE_VERSION}
kind create cluster --name ${LOCAL_CLUSTER_NAME} --image=kindest/node:${KUBE_VERSION} -v 1
if [ -e ${KUBECONFIG} ]; then
cp -fr ${KUBECONFIG} ${HOME}/.kube/config_bk
fi
Expand Down
35 changes: 12 additions & 23 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ require (
github.com/Masterminds/semver v1.4.2
github.com/Masterminds/sprig v2.15.0+incompatible
github.com/aokoli/goutils v1.1.0 // indirect
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
github.com/aws/aws-sdk-go v1.31.3
github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927 // indirect
github.com/dnaeon/go-vcr v1.0.1 // indirect
Expand All @@ -29,51 +28,41 @@ require (
github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2 // indirect
github.com/evanphx/json-patch v4.5.0+incompatible // indirect
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
github.com/go-openapi/errors v0.19.2 // indirect
github.com/go-openapi/strfmt v0.0.0-20170822153411-610b6cacdcde
github.com/go-openapi/strfmt v0.19.3
github.com/google/uuid v1.1.1
github.com/googleapis/gnostic v0.3.0 // indirect
github.com/graymeta/stow v0.0.0-00010101000000-000000000000
github.com/huandu/xstrings v1.2.0 // indirect
github.com/imdario/mergo v0.3.7 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/jarcoal/httpmock v1.0.4 // indirect
github.com/jpillora/backoff v0.0.0-20170918002102-8eab2debe79d
github.com/json-iterator/go v1.1.9
github.com/kelseyhightower/envconfig v1.4.0 // indirect
github.com/kopia/kopia v0.4.1-0.20200608151401-25934a544df4
github.com/lib/pq v1.2.0
github.com/luci/go-render v0.0.0-20160219211803-9a04cc21af0f
github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e // indirect
github.com/mitchellh/mapstructure v1.1.2
github.com/onsi/ginkgo v1.7.0 // indirect
github.com/onsi/gomega v1.4.3 // indirect
github.com/openshift/api v0.0.0-20190402135445-d2f01e7b77a6
github.com/openshift/client-go v0.0.0-20190402163854-7cc0953bbbb7
github.com/pborman/uuid v1.2.0 // indirect

//pinned openshift to release-4.5 branch
github.com/openshift/api v0.0.0-20200526144822-34f54f12813a
github.com/openshift/client-go v0.0.0-20200521150516-05eb9880269c
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.6.0
github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03 // indirect
github.com/satori/go.uuid v1.2.0
github.com/sirupsen/logrus v1.6.0
github.com/softlayer/softlayer-go v0.0.0-20190615201252-ba6e7f295217 // indirect
github.com/spf13/cobra v0.0.3
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/cobra v0.0.5
github.com/vmware/govmomi v0.21.1-0.20191008161538-40aebf13ba45
go.uber.org/zap v1.15.0
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
google.golang.org/api v0.25.0
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce // indirect
gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637
gopkg.in/yaml.v2 v2.2.7 // indirect
k8s.io/api v0.0.0-20190708174958-539a33f6e817
k8s.io/apiextensions-apiserver v0.0.0-20190708181606-527eacf2d4b7
k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d
k8s.io/client-go v11.0.1-0.20190708175433-62e1c231c5dc+incompatible
k8s.io/klog v0.3.0 // indirect
k8s.io/kube-openapi v0.0.0-20190208205540-d7c86cdc46e3 // indirect
k8s.io/utils v0.0.0-20190221042446-c2654d5206da // indirect
sigs.k8s.io/yaml v1.1.0 // indirect

//pinned k8s.io to v0.18.3 tag
k8s.io/api v0.18.3
k8s.io/apiextensions-apiserver v0.18.3
k8s.io/apimachinery v0.18.3
k8s.io/client-go v0.18.3
)
Loading

0 comments on commit 4841ef4

Please sign in to comment.