Fix broken build after rebasing on #4565
Git didn't detect any merge conflicts, but the resulting code didn't build. Signed-off-by: Nic Cope <nicc@rk0n.org>
This commit is contained in:
parent
683f0c5763
commit
b8a90432b6
|
@ -298,7 +298,7 @@ func (c *PTComposer) Compose(ctx context.Context, xr resource.Composite, req Com
|
|||
|
||||
// If this resource is anonymous its "name" is just its index within the
|
||||
// array of composed resource templates.
|
||||
name := ResourceName(pointer.StringDeref(t.Name, strconv.Itoa(i)))
|
||||
name := ResourceName(pointer.StringDeref(t.Name, fmt.Sprintf("resource %d", i+1)))
|
||||
|
||||
// If we were unable to render the composed resource we should not try
|
||||
// to observe it. We still want to return it to the Reconciler so that
|
||||
|
|
|
@ -644,7 +644,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req reconcile.Request) (reco
|
|||
// become ready, since we can't watch them.
|
||||
names := make([]string, len(unready))
|
||||
for i, cd := range unready {
|
||||
names[i] = cd.ResourceName
|
||||
names[i] = string(cd.ResourceName)
|
||||
}
|
||||
// sort for stable condition messages. With functions, we don't have a
|
||||
// stable order otherwise.
|
||||
|
|
Loading…
Reference in New Issue