Skip to content

Use rev for revision variables everywhere #200

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

Merged
grantr merged 1 commit into from
Feb 21, 2018
Merged

Use rev for revision variables everywhere #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions pkg/controller/configuration/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,14 +186,14 @@ func TestCreateConfigurationCreatesBuildAndPR(t *testing.T) {
})

h.OnCreate(&elaClient.Fake, "revisions", func(obj runtime.Object) hooks.HookResult {
hr := obj.(*v1alpha1.Revision)
glog.Infof("checking revision %s", hr.Name)
if config.Spec.Template.Spec.Service != hr.Spec.Service {
t.Errorf("hr service was not %s", config.Spec.Template.Spec.Service)
rev := obj.(*v1alpha1.Revision)
glog.Infof("checking revision %s", rev.Name)
if config.Spec.Template.Spec.Service != rev.Spec.Service {
t.Errorf("rev service was not %s", config.Spec.Template.Spec.Service)
}
// TODO(mattmoor): The fake doesn't properly support GenerateName,
// so it never looks like the BuildName is populated.
// if hr.Spec.BuildName == "" {
// if rev.Spec.BuildName == "" {
// t.Error("Missing BuildName; want non-empty, but got empty string")
// }
return hooks.HookComplete
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/revision/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,11 +456,11 @@ func (c *RevisionControllerImpl) addBuildEvent(obj interface{}) {
for k := range c.buildtracker.GetTrackers(build) {
// Look up the revision to mark complete.
namespace, name := splitKey(k)
hr, err := c.lister.Revisions(namespace).Get(name)
rev, err := c.lister.Revisions(namespace).Get(name)
if err != nil {
glog.Errorf("Error fetching revision '%s/%s' upon build completion: %v", namespace, name, err)
}
if err := c.markBuildComplete(hr, cond); err != nil {
if err := c.markBuildComplete(rev, cond); err != nil {
glog.Errorf("Error marking build completion for '%s/%s': %v", namespace, name, err)
}
}
Expand Down