Skip to content
This repository was archived by the owner on Jul 30, 2021. It is now read-only.

Commit 9cff8d8

Browse files
authored
Merge pull request #279 from detiber/updateControllerRuntime
🏃 Update controller runtime, Go 1.12, Cluster API v0.2.5
2 parents 175bf91 + 9471ebc commit 9cff8d8

File tree

5 files changed

+153
-60
lines changed

5 files changed

+153
-60
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

Dockerfile.dev

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

api/v1alpha2/zz_generated.deepcopy.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ require (
1414
github.com/onsi/ginkgo v1.10.1
1515
github.com/onsi/gomega v1.7.0
1616
github.com/pkg/errors v0.8.1
17-
github.com/prometheus/client_golang v0.9.4 // indirect
1817
github.com/prometheus/procfs v0.0.5 // indirect
1918
github.com/spf13/pflag v1.0.5 // indirect
2019
github.com/stretchr/testify v1.4.0 // indirect
@@ -26,14 +25,12 @@ require (
2625
golang.org/x/text v0.3.2 // indirect
2726
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
2827
gopkg.in/yaml.v2 v2.2.4 // indirect
29-
k8s.io/api v0.0.0-20190409021203-6e4e0e4f393b
30-
k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d
31-
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
28+
k8s.io/api v0.0.0-20190918195907-bd6ac527cfd2
29+
k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d
30+
k8s.io/client-go v0.0.0-20190918200256-06eb1244587a
3231
k8s.io/cluster-bootstrap v0.0.0-20190516232516-d7d78ab2cfe7
3332
k8s.io/klog v0.4.0
3433
k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf // indirect
35-
sigs.k8s.io/cluster-api v0.2.3
36-
sigs.k8s.io/controller-runtime v0.2.2
34+
sigs.k8s.io/cluster-api v0.2.5
35+
sigs.k8s.io/controller-runtime v0.3.0
3736
)
38-
39-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v0.2.3

0 commit comments

Comments
 (0)