Skip to content

Commit

Permalink
add kind to pending status
Browse files Browse the repository at this point in the history
Signed-off-by: Will Kutler <wkutler@redhat.com>
  • Loading branch information
willkutler authored and openshift-merge-robot committed Nov 10, 2022
1 parent 79715ac commit ae22618
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions controllers/templatesync/template_sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ func (r *PolicyReconciler) Reconcile(ctx context.Context, request reconcile.Requ
errMsg := fmt.Sprintf("Dependencies were not satisfied: %s", pendingErr)

r.emitTemplatePending(instance, tIndex, tName, errMsg)
tLogger.Info("Dependencies were not satisfied in the policy template",
tLogger.Info("Dependencies were not satisfied for the policy template",
"namespace", instance.GetNamespace(),
"kind", gvk.Kind,
)
Expand Down Expand Up @@ -553,7 +553,7 @@ func (r *PolicyReconciler) processDependencies(ctx context.Context, dClient dyna
func generatePendingErr(dependencyFailures []depclient.ObjectIdentifier) error {
names := make([]string, len(dependencyFailures))
for i, dep := range dependencyFailures {
names[i] = dep.Name
names[i] = fmt.Sprintf("%s %s", dep.Kind, dep.Name)
}

nameStr := strings.Join(names, ", ")
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/case12_ordering_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func generateEventOnPolicy(plcName string, cfgPlcNamespacedName string, eventTyp
msg)
}

var _ = Describe("Test status sync", Ordered, func() {
var _ = Describe("Test dependency logic in template sync", Ordered, func() {
AfterEach(func() {
opt := metav1.ListOptions{}
utils.ListWithTimeout(clientHubDynamic, gvrPolicy, opt, 0, true, defaultTimeoutSeconds)
Expand Down

0 comments on commit ae22618

Please sign in to comment.