Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to controller-runtime 0.5.0 #161

Merged
merged 7 commits into from
Feb 17, 2020
Merged

Update to controller-runtime 0.5.0 #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
422b6c9
Update to controller-runtime-0.5.0
wallrj Feb 14, 2020
ee2fd35
No need to set --advertise-address
wallrj Feb 14, 2020
5f3954b
Controller-runtime-0.5.0 requires the leaderElectionID to be set
wallrj Feb 14, 2020
9531c46
Use latest 0.17.3 patch version
wallrj Feb 14, 2020
14940a6
make go-get-patch
wallrj Feb 14, 2020
b46d37a
make gomod
wallrj Feb 14, 2020
ddde376
Give the leader-election configmap a clearer default name
wallrj Feb 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions controllers/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@ func setupSuite(t *testing.T) (suite *controllerSuite, teardownFunc func()) {

testEnv := &envtest.Environment{
CRDDirectoryPaths: []string{filepath.Join("..", "config", "crd", "bases")},
KubeAPIServerFlags: append(
envtest.DefaultKubeAPIServerFlags,
"--advertise-address=127.0.0.1",
),
}

cfg, err := testEnv.Start()
Expand Down
22 changes: 10 additions & 12 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@ module github.com/improbable-eng/etcd-cluster-operator

go 1.13

// Pin k8s.io/* dependencies to kubernetes-1.16.0 to match controller-runtime v0.4.0
// Pin k8s.io/* dependencies to kubernetes-1.17.0 to match controller-runtime v0.5.0
replace (
// This must match the version below
go.etcd.io/etcd => go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738
k8s.io/api => k8s.io/api v0.0.0-20190918155943-95b840bb6a1f
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190918161926-8f644eb6e783
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655
k8s.io/client-go => k8s.io/client-go v0.0.0-20190918160344-1fbdaa4c8d90
k8s.io/utils => k8s.io/utils v0.0.0-20190801114015-581e00157fb1
k8s.io/api => k8s.io/api v0.17.3
k8s.io/apimachinery => k8s.io/apimachinery v0.17.3
k8s.io/client-go => k8s.io/client-go v0.17.3
)

require (
Expand All @@ -30,7 +28,7 @@ require (
github.com/robfig/cron/v3 v3.0.1
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.4.0
// Pin spesific etcd version via tag. See https://github.com/etcd-io/etcd/pull/11477
// Pin specific etcd version via tag. See https://github.com/etcd-io/etcd/pull/11477
go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738
go.opencensus.io v0.22.3 // indirect
go.uber.org/zap v1.10.0
Expand All @@ -39,11 +37,11 @@ require (
google.golang.org/api v0.13.0 // indirect
google.golang.org/genproto v0.0.0-20200128133413-58ce757ed39b // indirect
google.golang.org/grpc v1.23.1
gopkg.in/yaml.v2 v2.2.8 // indirect
k8s.io/api v0.0.0-20190918195907-bd6ac527cfd2
k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655
k8s.io/api v0.17.3
k8s.io/apiextensions-apiserver v0.17.3 // indirect
k8s.io/apimachinery v0.17.3
k8s.io/client-go v11.0.0+incompatible
k8s.io/utils v0.0.0-20190801114015-581e00157fb1
sigs.k8s.io/controller-runtime v0.4.0
k8s.io/utils v0.0.0-20191114184206-e782cd3c129f
sigs.k8s.io/controller-runtime v0.5.0
sigs.k8s.io/kind v0.5.1
)
Loading