Skip to content

Commit d707649

Browse files
committed
Update controller-runtime and golang versions
- Update controller-runtime to v0.3.0 - Update golang used to v1.12.10
1 parent 7c427f9 commit d707649

File tree

5 files changed

+179
-80
lines changed

5 files changed

+179
-80
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
# Build the manager binary
16-
FROM golang:1.12.9 as builder
16+
FROM golang:1.12.10 as builder
1717
WORKDIR /workspace
1818

1919
# Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ release-binary: $(RELEASE_DIR)
238238
-e GOARCH=$(GOARCH) \
239239
-v "$$(pwd):/workspace" \
240240
-w /workspace \
241-
golang:1.12.9 \
241+
golang:1.12.10 \
242242
go build -a -ldflags '-extldflags "-static"' \
243243
-o $(RELEASE_DIR)/$(notdir $(RELEASE_BINARY))-$(GOOS)-$(GOARCH) $(RELEASE_BINARY)
244244

cmd/example-provider/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
# Build the manager binary
16-
FROM golang:1.12.9 as builder
16+
FROM golang:1.12.10 as builder
1717

1818
ENV GOPROXY=https://proxy.golang.org
1919
WORKDIR /workspace

go.mod

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,29 @@ module sigs.k8s.io/cluster-api
33
go 1.12
44

55
require (
6-
github.com/Azure/go-autorest/autorest/adal v0.6.0 // indirect
76
github.com/davecgh/go-spew v1.1.1
87
github.com/go-logr/logr v0.1.0
98
github.com/gogo/protobuf v1.2.1 // indirect
109
github.com/gophercloud/gophercloud v0.3.0 // indirect
1110
github.com/imdario/mergo v0.3.7 // indirect
12-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
13-
github.com/json-iterator/go v1.1.6 // indirect
14-
github.com/modern-go/reflect2 v1.0.1 // indirect
1511
github.com/onsi/ginkgo v1.8.0
1612
github.com/onsi/gomega v1.5.0
1713
github.com/pkg/errors v0.8.1
18-
github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829 // indirect
1914
github.com/sergi/go-diff v1.0.0
2015
github.com/spf13/cobra v0.0.3
2116
github.com/spf13/pflag v1.0.3
22-
golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3
17+
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 // indirect
18+
golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc
19+
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 // indirect
2320
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
24-
k8s.io/api v0.0.0-20190409021203-6e4e0e4f393b
25-
k8s.io/apiextensions-apiserver v0.0.0-20190409022649-727a075fdec8
26-
k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d
27-
k8s.io/apiserver v0.0.0-20190409021813-1ec86e4da56c
28-
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
29-
k8s.io/component-base v0.0.0-20190409021516-bd2732e5c3f7
21+
k8s.io/api v0.0.0-20190918195907-bd6ac527cfd2
22+
k8s.io/apiextensions-apiserver v0.0.0-20190918201827-3de75813f604
23+
k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d
24+
k8s.io/apiserver v0.0.0-20190918200908-1e17798da8c1
25+
k8s.io/client-go v0.0.0-20190918200256-06eb1244587a
26+
k8s.io/component-base v0.0.0-20190918200425-ed2f0867c778
3027
k8s.io/klog v0.4.0
3128
k8s.io/utils v0.0.0-20190809000727-6c36bc71fc4a
32-
sigs.k8s.io/controller-runtime v0.2.2
29+
sigs.k8s.io/controller-runtime v0.3.0
3330
sigs.k8s.io/testing_frameworks v0.1.2-0.20190130140139-57f07443c2d4 // indirect
3431
)

0 commit comments

Comments
 (0)