Skip to content

Commit 7dd20b3

Browse files
Fix linter and tests
Signed-off-by: Danil-Grigorev <[email protected]>
1 parent 4552a49 commit 7dd20b3

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

internal/controller/manifests_downloader.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,10 @@ func (p *PhaseReconciler) checkConfigMapExists(ctx context.Context, labelSelecto
144144
func (p *PhaseReconciler) Finalize(ctx context.Context) (*Result, error) {
145145
err := setCacheHash(ctx, p.ctrlClient, p.provider)
146146
if err != nil {
147-
ctrl.LoggerFrom(ctx).V(5).Error(err, "Failed to update providers ConfigMap hash")
147+
ctrl.LoggerFrom(ctx).V(5).Error(err, "Failed to update providers hash")
148148
}
149149

150-
return &Result{}, wrapPhaseError(err, "failed to update providers ConfigMap hash", operatorv1.ProviderInstalledCondition)
150+
return &Result{}, wrapPhaseError(err, "failed to update providers hash", operatorv1.ProviderInstalledCondition)
151151
}
152152

153153
// prepareConfigMapLabels returns labels that identify a config map with downloaded manifests.

internal/controller/phases.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,7 @@ func addNamespaceIfMissing(objs []unstructured.Unstructured, targetNamespace str
659659
return objs
660660
}
661661

662-
// upgrade ensure all the clusterctl CRDs are available before installing the provider,
662+
// Upgrade ensure all the clusterctl CRDs are available before installing the provider,
663663
// and update existing components if required.
664664
func (p *PhaseReconciler) Upgrade(ctx context.Context) (*Result, error) {
665665
log := ctrl.LoggerFrom(ctx)
@@ -832,7 +832,7 @@ func (p *PhaseReconciler) repositoryProxy(ctx context.Context, provider configcl
832832
return nil, err
833833
}
834834

835-
return repositoryProxy{Client: cl, components: nil}, nil
835+
return repositoryProxy{Client: cl, components: p.components}, nil
836836
}
837837

838838
// newClusterClient returns a clusterctl client for interacting with management cluster.

0 commit comments

Comments
 (0)