Skip to content

Conversation

@joelddiaz
Copy link
Contributor

PRs failing like so https://openshift-gce-devel.appspot.com/build/origin-ci-test/pr-logs/pull/openshift_hive/120/pull-ci-openshift-hive-master-unit/208

failed to wait for test pod to complete: could not wait for pod completion: the pod ci-op-kn2253g0/unit failed after 1m35s (failed containers: test):  unknown

Container test exited with code 2, reason Error
---
go generate ./pkg/... ./cmd/...
gofmt -w -s pkg contrib
go vet ./pkg/... ./cmd/... ./contrib/...
# github.com/openshift/hive/pkg/awsclient/mock
pkg/awsclient/mock/client_generated.go:43:8: m.ctrl.T undefined (type *gomock.Controller has no field or method T, but does have gomock.t)
pkg/awsclient/mock/client_generated.go:52:14: mr.mock.ctrl.T undefined (type *gomock.Controller has no field or method T, but does have gomock.t)
pkg/awsclient/mock/client_generated.go:58:8: m.ctrl.T undefined (type *gomock.Controller has no field or method T, but does have gomock.t)
pkg/awsclient/mock/client_generated.go:67:14: mr.mock.ctrl.T undefined (type *gomock.Controller has no field or method T, but does have gomock.t)
pkg/awsclient/mock/client_generated.go:73:8: m.ctrl.T undefined (type *gomock.Controller has no field or method T, but does have gomock.t)
pkg/awsclient/mock/client_generated.go:82:14: mr.mock.ctrl.T undefined (type *gomock.Controller has no field or method T, but does have gomock.t)
pkg/awsclient/mock/client_generated.go:88:8: m.ctrl.T undefined (type *gomock.Controller has no field or method T, but does have gomock.t)
pkg/awsclient/mock/client_generated.go:97:14: mr.mock.ctrl.T undefined (type *gomock.Controller has no field or method T, but does have gomock.t)
pkg/awsclient/mock/client_generated.go:103:8: m.ctrl.T undefined (type *gomock.Controller has no field or method T, but does have gomock.t)
pkg/awsclient/mock/client_generated.go:112:14: mr.mock.ctrl.T undefined (type *gomock.Controller has no field or method T, but does have gomock.t)
pkg/awsclient/mock/client_generated.go:112:14: too many errors
make: *** [vet] Error 2

Update gomock/mockgen

@joelddiaz joelddiaz requested a review from dgoodwin December 10, 2018 18:53
@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Dec 10, 2018
Copy link
Contributor

@dgoodwin dgoodwin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One tiny nit, otherwise looks good, I was going to point out you can just update specific deps but it sounds like you did, so dep bites us again. Thanks for taking on and solving this.

for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
ic, err := GenerateInstallConfig(test.cd, adminPassword, adminSSHKey, pullSecret)
ic, err := GenerateInstallConfig(test.cd /* adminPassword, */, adminSSHKey, pullSecret)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can remove this.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

no longer need admin username/password

update all the places that used clusterDeployment.spec.config.admin
@dgoodwin
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 11, 2018
@openshift-merge-robot openshift-merge-robot merged commit 4452543 into openshift:master Dec 11, 2018
// The two types are extremely similar, but have different goals and in some cases deviation was required
// as ClusterDeployment is used as a CRD API.
//
// It is assumed the caller will lookup the admin password and ssh key from their respective secrets.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The "admin password" reference is stale now. I'm not sure what to replace it with though, because I don't understand the whole "caller will lookup" idea. The caller is passing these into GenerateInstallConfig, so why would they need to look them up at all? And how do secrets come into this?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In hive's ClusterDeployment the sshKey and pullSecret (and previously admin password) are referenced via secrets. Whatever code calls this needs to look them up, I didn't want this function responsible for talking to etcd.

@joelddiaz joelddiaz deleted the gomock branch January 15, 2019 19:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants