Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func (se SkippedError) Error() string {
}

func NewSkippedError(errString string) error {
return SkippedError{err: fmt.Errorf(errString)}
return SkippedError{err: fmt.Errorf("%s", errString)}
}

const (
Expand Down
2 changes: 1 addition & 1 deletion controllers/cloud.redhat.com/clowderconfig/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func getConfig() ClowderConfig {
err = json.Unmarshal(jsonData, &clowderConfig)

if err != nil {
fmt.Printf("Couldn't parse json:\n" + err.Error())
fmt.Printf("Couldn't parse json:\n %s", err.Error())
return ClowderConfig{}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ func (r *ClowdJobInvocationReconciler) Reconcile(ctx context.Context, req ctrl.R

// CJI has already invoked a job, we'll update the status. The Job map must have entries
// because it can exist to update the status without having done any work.
if cji.Status.JobMap != nil && len(cji.Status.JobMap) > 0 {
if len(cji.Status.JobMap) > 0 {
if condErr := SetClowdJobInvocationConditions(ctx, r.Client, &cji, crd.ReconciliationSuccessful, nil); condErr != nil {
return ctrl.Result{}, condErr
}
Expand Down
8 changes: 4 additions & 4 deletions controllers/cloud.redhat.com/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ func applyKafkaStatus(t *testing.T, ch chan int) {
err := k8sClient.Get(ctx, nn, &cluster)

if err != nil {
t.Logf(err.Error())
t.Logf("%s", err.Error())
continue
}

Expand All @@ -195,7 +195,7 @@ func applyKafkaStatus(t *testing.T, ch chan int) {
err = k8sClient.Status().Update(ctx, &cluster)

if err != nil {
t.Logf(err.Error())
t.Logf("%s", err.Error())
continue
}

Expand All @@ -208,7 +208,7 @@ func applyKafkaStatus(t *testing.T, ch chan int) {
err = k8sClient.Get(ctx, nn, &connectCluster)

if err != nil {
t.Logf(err.Error())
t.Logf("%s", err.Error())
continue
}

Expand All @@ -222,7 +222,7 @@ func applyKafkaStatus(t *testing.T, ch chan int) {
err = k8sClient.Status().Update(ctx, &connectCluster)

if err != nil {
t.Logf(err.Error())
t.Logf("%s", err.Error())
continue
}

Expand Down