Skip to content

Commit

Permalink
update to k8s v1.21 and go 1.16
Browse files Browse the repository at this point in the history
  • Loading branch information
@kinarashah
kinarashah committed Apr 30, 2021
1 parent 3c0f955 commit 9d49d88
Show file tree
Hide file tree
Showing 2,371 changed files with 319,278 additions and 129,275 deletions.
5 changes: 2 additions & 3 deletions Dockerfile.dapper
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ RUN apt-get update && \
ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm=armv6l GOLANG_ARCH_arm64=arm64 GOLANG_ARCH=GOLANG_ARCH_${ARCH} \
GOPATH=/go PATH=/go/bin:/usr/local/go/bin:${PATH} SHELL=/bin/bash

RUN wget -O - https://storage.googleapis.com/golang/go1.14.7.linux-${!GOLANG_ARCH}.tar.gz | tar -xzf - -C /usr/local && \
go get github.com/rancher/trash && go get golang.org/x/lint/golint
RUN wget -O - https://storage.googleapis.com/golang/go1.16.linux-${!GOLANG_ARCH}.tar.gz | tar -xzf - -C /usr/local && \
go get golang.org/x/lint/golint

ENV DOCKER_URL_amd64=https://get.docker.com/builds/Linux/x86_64/docker-1.10.3 \
DOCKER_URL_arm=https://github.com/rancher/docker/releases/download/v1.10.3-ros1/docker-1.10.3_arm \
Expand All @@ -26,7 +26,6 @@ ENV DAPPER_RUN_ARGS --privileged -v /var/lib/docker
ENV DAPPER_OUTPUT ./bin ./dist ./build/bin
ENV DAPPER_DOCKER_SOCKET true
ENV DAPPER_ENV TAG REPO GOOS CROSS DRONE_TAG
ENV TRASH_CACHE ${DAPPER_SOURCE}/.trash-cache
ENV HOME ${DAPPER_SOURCE}
WORKDIR ${DAPPER_SOURCE}

Expand Down
8 changes: 0 additions & 8 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,6 @@ TARGETS := $(shell ls scripts)
$(TARGETS): .dapper
./.dapper $@

trash: .dapper
./.dapper -m bind trash

trash-keep: .dapper
./.dapper -m bind trash -k

deps: trash

.DEFAULT_GOAL := ci

.PHONY: $(TARGETS)
2 changes: 1 addition & 1 deletion dind/dind.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ func StartUpDindContainer(ctx context.Context, dindAddress, dindNetwork, dindSto
"net.ipv4.conf.all.rp_filter": "1",
},
}
resp, err := cli.ContainerCreate(ctx, imageCfg, hostCfg, nil, containerName)
resp, err := cli.ContainerCreate(ctx, imageCfg, hostCfg, nil, nil, containerName)
if err != nil {
return "", fmt.Errorf("Failed to create [%s] container on host [%s]: %v", containerName, cli.DaemonHost(), err)
}
Expand Down
2 changes: 1 addition & 1 deletion docker/docker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ func CreateContainer(ctx context.Context, dClient *client.Client, hostname strin
var err error
// Retry up to RetryCount times to see if image exists
for i := 1; i <= RetryCount; i++ {
created, err = dClient.ContainerCreate(ctx, imageCfg, hostCfg, nil, containerName)
created, err = dClient.ContainerCreate(ctx, imageCfg, hostCfg, nil, nil, containerName)
if err != nil {
logrus.Warningf("Failed to create Docker container [%s] on host [%s]: %v", containerName, hostname, err)
continue
Expand Down
33 changes: 17 additions & 16 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
module github.com/rancher/rke

go 1.13
go 1.16

replace (
github.com/knative/pkg => github.com/rancher/pkg v0.0.0-20190514055449-b30ab9de040e
golang.org/x/sys => golang.org/x/sys v0.0.0-20190830141801-acfa387b8d69
k8s.io/client-go => k8s.io/client-go v0.20.0
k8s.io/client-go => k8s.io/client-go v0.21.0
)

require (
github.com/Masterminds/sprig/v3 v3.0.0
github.com/Masterminds/sprig/v3 v3.2.2
github.com/Microsoft/hcsshim v0.8.9 // indirect
github.com/apparentlymart/go-cidr v1.0.1
github.com/blang/semver v3.5.1+incompatible
github.com/containerd/containerd v1.4.1-0.20201117152358-0edc412565dc // indirect
github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe // indirect
github.com/coreos/etcd v3.3.17+incompatible
github.com/coreos/go-semver v0.3.0
github.com/docker/distribution v2.7.1+incompatible
github.com/docker/docker v0.7.3-0.20190808172531-150530564a14
github.com/docker/docker v20.10.6+incompatible
github.com/docker/go-connections v0.4.0
github.com/ghodss/yaml v1.0.0
github.com/go-bindata/go-bindata v3.1.2+incompatible
Expand All @@ -27,26 +27,27 @@ require (
github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.12.1 // indirect
github.com/hashicorp/golang-lru v0.5.3 // indirect
github.com/mattn/go-colorable v0.1.2
github.com/mattn/go-colorable v0.1.8
github.com/mcuadros/go-version v0.0.0-20180611085657-6d5863ca60fa
github.com/moby/sys/mount v0.2.0 // indirect
github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c // indirect
github.com/opencontainers/image-spec v1.0.1 // indirect
github.com/opencontainers/runc v0.1.1 // indirect
github.com/pkg/errors v0.9.1
github.com/rancher/norman v0.0.0-20200517050325-f53cae161640
github.com/sirupsen/logrus v1.6.0
github.com/sirupsen/logrus v1.7.0
github.com/smartystreets/assertions v1.0.1 // indirect
github.com/stretchr/testify v1.6.1
github.com/urfave/cli v1.20.0
go.uber.org/atomic v1.5.0 // indirect
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.20.0
k8s.io/apimachinery v0.20.0
k8s.io/apiserver v0.20.0
k8s.io/client-go v12.0.0+incompatible
k8s.io/gengo v0.0.0-20201113003025-83324d819ded
k8s.io/kubectl v0.20.0
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.21.0
k8s.io/apimachinery v0.21.0
k8s.io/apiserver v0.21.0
k8s.io/client-go v0.21.0
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027
k8s.io/kubectl v0.21.0
sigs.k8s.io/yaml v1.2.0
)
Loading

0 comments on commit 9d49d88

Please sign in to comment.