Skip to content

No need to pass a build name around when reconciling a configuration #1793

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
knative-prow-robot merged 1 commit into from
Aug 7, 2018
Merged

No need to pass a build name around when reconciling a configuration #1793

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
4 changes: 1 addition & 3 deletions pkg/reconciler/v1alpha1/configuration/configuration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,6 @@ func (c *Reconciler) reconcile(ctx context.Context, config *v1alpha1.Configurati
func (c *Reconciler) createRevision(config *v1alpha1.Configuration, revName string) (*v1alpha1.Revision, error) {
logger := loggerWithConfigInfo(c.Logger, config.Namespace, config.Name)

buildName := ""
if config.Spec.Build != nil {
// TODO(mattmoor): Determine whether we reuse the previous build.
build := resources.MakeBuild(config)
Expand All @@ -211,10 +210,9 @@ func (c *Reconciler) createRevision(config *v1alpha1.Configuration, revName stri
}
logger.Infof("Created Build:\n%+v", created.Name)
c.Recorder.Eventf(config, corev1.EventTypeNormal, "Created", "Created Build %q", created.Name)
buildName = created.Name
}

rev := resources.MakeRevision(config, buildName)
rev := resources.MakeRevision(config)
created, err := c.ServingClientSet.ServingV1alpha1().Revisions(config.Namespace).Create(rev)
if err != nil {
return nil, err
Expand Down
25 changes: 11 additions & 14 deletions pkg/reconciler/v1alpha1/configuration/configuration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ var (
}
)

const noBuildName = ""

// This is heavily based on the way the OpenShift Ingress controller tests its reconciliation method.
func TestReconcile(t *testing.T) {
table := TableTest{{
Expand All @@ -64,7 +62,7 @@ func TestReconcile(t *testing.T) {
cfg("no-revisions-yet", "foo", 1234),
},
WantCreates: []metav1.Object{
resources.MakeRevision(cfg("no-revisions-yet", "foo", 1234), noBuildName),
resources.MakeRevision(cfg("no-revisions-yet", "foo", 1234)),
},
WantUpdates: []clientgotesting.UpdateActionImpl{{
Object: cfgWithStatus("no-revisions-yet", "foo", 1234,
Expand All @@ -86,7 +84,7 @@ func TestReconcile(t *testing.T) {
setConcurrencyModel(cfg("validation-failure", "foo", 1234), "Bogus"),
},
WantCreates: []metav1.Object{
setRevConcurrencyModel(resources.MakeRevision(cfg("validation-failure", "foo", 1234), noBuildName), "Bogus"),
setRevConcurrencyModel(resources.MakeRevision(cfg("validation-failure", "foo", 1234)), "Bogus"),
},
WantUpdates: []clientgotesting.UpdateActionImpl{{
Object: setConcurrencyModel(cfgWithStatus("validation-failure", "foo", 1234,
Expand All @@ -107,8 +105,7 @@ func TestReconcile(t *testing.T) {
},
WantCreates: []metav1.Object{
resources.MakeBuild(cfgWithBuild("need-rev-and-build", "foo", 99998, &buildSpec)),
resources.MakeRevision(cfgWithBuild("need-rev-and-build", "foo", 99998, &buildSpec),
resources.MakeBuild(cfgWithBuild("need-rev-and-build", "foo", 99998, &buildSpec)).Name),
resources.MakeRevision(cfgWithBuild("need-rev-and-build", "foo", 99998, &buildSpec)),
},
WantUpdates: []clientgotesting.UpdateActionImpl{{
Object: cfgWithBuildAndStatus("need-rev-and-build", "foo", 99998, &buildSpec,
Expand All @@ -127,7 +124,7 @@ func TestReconcile(t *testing.T) {
Name: "reconcile revision matching generation (ready: unknown)",
Objects: []runtime.Object{
cfg("matching-revision-not-done", "foo", 5432),
resources.MakeRevision(cfg("matching-revision-not-done", "foo", 5432), noBuildName),
resources.MakeRevision(cfg("matching-revision-not-done", "foo", 5432)),
},
WantUpdates: []clientgotesting.UpdateActionImpl{{
Object: cfgWithStatus("matching-revision-not-done", "foo", 5432,
Expand All @@ -146,7 +143,7 @@ func TestReconcile(t *testing.T) {
Name: "reconcile revision matching generation (ready: true)",
Objects: []runtime.Object{
cfg("matching-revision-done", "foo", 5555),
makeRevReady(t, resources.MakeRevision(cfg("matching-revision-done", "foo", 5555), noBuildName)),
makeRevReady(t, resources.MakeRevision(cfg("matching-revision-done", "foo", 5555))),
},
WantUpdates: []clientgotesting.UpdateActionImpl{{
Object: cfgWithStatus("matching-revision-done", "foo", 5555,
Expand Down Expand Up @@ -176,14 +173,14 @@ func TestReconcile(t *testing.T) {
}},
},
),
makeRevReady(t, resources.MakeRevision(cfg("matching-revision-done-idempotent", "foo", 5566), noBuildName)),
makeRevReady(t, resources.MakeRevision(cfg("matching-revision-done-idempotent", "foo", 5566))),
},
Key: "foo/matching-revision-done-idempotent",
}, {
Name: "reconcile revision matching generation (ready: false)",
Objects: []runtime.Object{
cfg("matching-revision-failed", "foo", 5555),
makeRevFailed(resources.MakeRevision(cfg("matching-revision-failed", "foo", 5555), noBuildName)),
makeRevFailed(resources.MakeRevision(cfg("matching-revision-failed", "foo", 5555))),
},
WantUpdates: []clientgotesting.UpdateActionImpl{{
Object: cfgWithStatus("matching-revision-failed", "foo", 5555,
Expand All @@ -204,7 +201,7 @@ func TestReconcile(t *testing.T) {
Name: "reconcile revision matching generation (ready: bad)",
Objects: []runtime.Object{
cfg("bad-condition", "foo", 5555),
makeRevStatus(resources.MakeRevision(cfg("bad-condition", "foo", 5555), noBuildName),
makeRevStatus(resources.MakeRevision(cfg("bad-condition", "foo", 5555)),
v1alpha1.RevisionStatus{
Conditions: []v1alpha1.RevisionCondition{{
Type: v1alpha1.RevisionConditionReady,
Expand Down Expand Up @@ -265,7 +262,7 @@ func TestReconcile(t *testing.T) {
cfg("create-revision-failure", "foo", 99998),
},
WantCreates: []metav1.Object{
resources.MakeRevision(cfg("create-revision-failure", "foo", 99998), noBuildName),
resources.MakeRevision(cfg("create-revision-failure", "foo", 99998)),
},
WantUpdates: []clientgotesting.UpdateActionImpl{{
Object: cfgWithStatus("create-revision-failure", "foo", 99998,
Expand All @@ -291,7 +288,7 @@ func TestReconcile(t *testing.T) {
cfg("update-config-failure", "foo", 1234),
},
WantCreates: []metav1.Object{
resources.MakeRevision(cfg("update-config-failure", "foo", 1234), noBuildName),
resources.MakeRevision(cfg("update-config-failure", "foo", 1234)),
},
WantUpdates: []clientgotesting.UpdateActionImpl{{
Object: cfgWithStatus("update-config-failure", "foo", 1234,
Expand Down Expand Up @@ -321,7 +318,7 @@ func TestReconcile(t *testing.T) {
}},
},
),
makeRevReady(t, resources.MakeRevision(cfg("revision-recovers", "foo", 1337), noBuildName)),
makeRevReady(t, resources.MakeRevision(cfg("revision-recovers", "foo", 1337))),
},
WantUpdates: []clientgotesting.UpdateActionImpl{{
Object: cfgWithStatus("revision-recovers", "foo", 1337,
Expand Down
4 changes: 2 additions & 2 deletions pkg/reconciler/v1alpha1/configuration/resources/revision.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/knative/serving/pkg/reconciler/v1alpha1/configuration/resources/names"
)

func MakeRevision(config *v1alpha1.Configuration, buildName string) *v1alpha1.Revision {
func MakeRevision(config *v1alpha1.Configuration) *v1alpha1.Revision {
// Start from the ObjectMeta/Spec inlined in the Configuration resources.
rev := &v1alpha1.Revision{
ObjectMeta: config.Spec.RevisionTemplate.ObjectMeta,
Expand All @@ -51,7 +51,7 @@ func MakeRevision(config *v1alpha1.Configuration, buildName string) *v1alpha1.Re
rev.OwnerReferences = append(rev.OwnerReferences, *reconciler.NewControllerRef(config))

// Fill in the build name, if specified.
rev.Spec.BuildName = buildName
rev.Spec.BuildName = names.Build(config)

return rev
}
3 changes: 1 addition & 2 deletions pkg/reconciler/v1alpha1/configuration/resources/revision_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import (
buildv1alpha1 "github.com/knative/build/pkg/apis/build/v1alpha1"
"github.com/knative/serving/pkg/apis/serving"
"github.com/knative/serving/pkg/apis/serving/v1alpha1"
"github.com/knative/serving/pkg/reconciler/v1alpha1/configuration/resources/names"
)

func TestRevisions(t *testing.T) {
Expand Down Expand Up @@ -227,7 +226,7 @@ func TestRevisions(t *testing.T) {

for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
got := MakeRevision(test.configuration, names.Build(test.configuration))
got := MakeRevision(test.configuration)
if diff := cmp.Diff(test.want, got); diff != "" {
t.Errorf("MakeRevision (-want, +got) = %v", diff)
}
Expand Down