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

Commit

Permalink
Merge pull request #279 from detiber/updateControllerRuntime
Browse files Browse the repository at this point in the history
🏃 Update controller runtime, Go 1.12, Cluster API v0.2.5
  • Loading branch information
k8s-ci-robot authored Oct 11, 2019
2 parents 175bf91 + 9471ebc commit 9cff8d8
Show file tree
Hide file tree
Showing 5 changed files with 153 additions and 60 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

# Build the manager binary
FROM golang:1.12.9 as builder
FROM golang:1.12.10 as builder
WORKDIR /workspace

# Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

# Build the manager binary
FROM golang:1.12.9 as builder
FROM golang:1.12.10 as builder
WORKDIR /workspace

# Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy
Expand Down
4 changes: 2 additions & 2 deletions api/v1alpha2/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 5 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ require (
github.com/onsi/ginkgo v1.10.1
github.com/onsi/gomega v1.7.0
github.com/pkg/errors v0.8.1
github.com/prometheus/client_golang v0.9.4 // indirect
github.com/prometheus/procfs v0.0.5 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/testify v1.4.0 // indirect
Expand All @@ -26,14 +25,12 @@ require (
golang.org/x/text v0.3.2 // indirect
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
gopkg.in/yaml.v2 v2.2.4 // indirect
k8s.io/api v0.0.0-20190409021203-6e4e0e4f393b
k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
k8s.io/api v0.0.0-20190918195907-bd6ac527cfd2
k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d
k8s.io/client-go v0.0.0-20190918200256-06eb1244587a
k8s.io/cluster-bootstrap v0.0.0-20190516232516-d7d78ab2cfe7
k8s.io/klog v0.4.0
k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf // indirect
sigs.k8s.io/cluster-api v0.2.3
sigs.k8s.io/controller-runtime v0.2.2
sigs.k8s.io/cluster-api v0.2.5
sigs.k8s.io/controller-runtime v0.3.0
)

replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v0.2.3
Loading

0 comments on commit 9cff8d8

Please sign in to comment.