Skip to content

Commit 7e6925f

Browse files
committed
use require instead of replace for controller-runtime
1 parent 36996f7 commit 7e6925f

File tree

5 files changed

+5
-8
lines changed

5 files changed

+5
-8
lines changed

go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ require (
8989
k8s.io/kube-openapi v0.0.0-20190401085232-94e1e7b7574c
9090
k8s.io/kube-state-metrics v1.6.0
9191
k8s.io/kubernetes v1.14.2
92-
sigs.k8s.io/controller-runtime v0.2.0-beta.3
92+
sigs.k8s.io/controller-runtime v0.2.0
9393
sigs.k8s.io/controller-tools v0.0.0-20190411181648-9d55346c2bde
9494
sigs.k8s.io/kustomize v2.0.3+incompatible // indirect
9595
vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 // indirect
@@ -114,6 +114,5 @@ replace (
114114
github.com/operator-framework/operator-lifecycle-manager => github.com/operator-framework/operator-lifecycle-manager v0.0.0-20190605231540-b8a4faf68e36
115115
k8s.io/helm => k8s.io/helm v2.14.1+incompatible
116116
k8s.io/kube-state-metrics => k8s.io/kube-state-metrics v1.6.0
117-
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.2.0
118117
sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.1.11-0.20190411181648-9d55346c2bde
119118
)

go.sum

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -654,6 +654,7 @@ k8s.io/kubernetes v1.14.1/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
654654
k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0=
655655
k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5 h1:VBM/0P5TWxwk+Nw6Z+lAw3DKgO76g90ETOiA6rfLV1Y=
656656
k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
657+
sigs.k8s.io/controller-runtime v0.1.10/go.mod h1:HFAYoOh6XMV+jKF1UjFwrknPbowfyHEHHRdJMf2jMX8=
657658
sigs.k8s.io/controller-runtime v0.2.0 h1:5gL30PXOisGZl+Osi4CmLhvMUj77BO3wJeouKF2va50=
658659
sigs.k8s.io/controller-runtime v0.2.0/go.mod h1:ZHqrRDZi3f6BzONcvlUxkqCKgwasGk5FZrnSv9TVZF4=
659660
sigs.k8s.io/controller-tools v0.1.11-0.20190411181648-9d55346c2bde h1:ZkaHf5rNYzIB6CB82keKMQNv7xxkqT0ylOBdfJPfi+k=

internal/pkg/scaffold/ansible/go_mod.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ require (
4747
k8s.io/apiextensions-apiserver v0.0.0-20190409022649-727a075fdec8
4848
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
4949
k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208 // indirect
50-
sigs.k8s.io/controller-runtime v0.2.0-beta.3
50+
sigs.k8s.io/controller-runtime v0.2.0
5151
sigs.k8s.io/controller-tools v0.1.10
5252
)
5353
@@ -61,7 +61,6 @@ replace (
6161
)
6262
6363
replace (
64-
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.2.0
6564
// Pinned to v2.10.0 (kubernetes-1.14.1) so https://proxy.golang.org can
6665
// resolve it correctly.
6766
github.com/prometheus/prometheus => github.com/prometheus/prometheus d20e84d0fb64aff2f62a977adc8cfb656da4e286

internal/pkg/scaffold/go_mod.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ require (
4545
k8s.io/apimachinery v0.0.0-20190612125636-6a5db36e93ad
4646
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
4747
k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208 // indirect
48-
sigs.k8s.io/controller-runtime v0.2.0-beta.3
48+
sigs.k8s.io/controller-runtime v0.2.0
4949
sigs.k8s.io/controller-tools v0.1.10
5050
)
5151
@@ -60,7 +60,6 @@ replace (
6060
6161
replace (
6262
github.com/coreos/prometheus-operator => github.com/coreos/prometheus-operator v0.31.1
63-
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.2.0
6463
sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.1.11-0.20190411181648-9d55346c2bde
6564
// Pinned to v2.10.0 (kubernetes-1.14.1) so https://proxy.golang.org can
6665
// resolve it correctly.

internal/pkg/scaffold/helm/go_mod.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ require (
6363
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
6464
k8s.io/helm v2.14.1+incompatible // indirect
6565
k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208 // indirect
66-
sigs.k8s.io/controller-runtime v0.2.0-beta.3
66+
sigs.k8s.io/controller-runtime v0.2.0
6767
sigs.k8s.io/controller-tools v0.1.10
6868
)
6969
@@ -80,7 +80,6 @@ replace (
8080
)
8181
8282
replace (
83-
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.2.0
8483
github.com/coreos/prometheus-operator => github.com/coreos/prometheus-operator v0.31.1
8584
// Pinned to v2.10.0 (kubernetes-1.14.1) so https://proxy.golang.org can
8685
// resolve it correctly.

0 commit comments

Comments
 (0)