From 596f59ab986607e19cf90a71d77ca99f898c118f Mon Sep 17 00:00:00 2001 From: rgo Date: Tue, 20 Feb 2024 14:43:01 +0100 Subject: [PATCH 1/2] Better verbose logging on override path --- cmd/clusterctl/client/repository/overrides.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmd/clusterctl/client/repository/overrides.go b/cmd/clusterctl/client/repository/overrides.go index 1a6c858347bf..6026a7616e8a 100644 --- a/cmd/clusterctl/client/repository/overrides.go +++ b/cmd/clusterctl/client/repository/overrides.go @@ -28,6 +28,7 @@ import ( "github.com/pkg/errors" "sigs.k8s.io/cluster-api/cmd/clusterctl/client/config" + logf "sigs.k8s.io/cluster-api/cmd/clusterctl/log" ) const ( @@ -107,7 +108,11 @@ func (o *overrides) Path() (string, error) { // getLocalOverride return local override file from the config folder, if it exists. // This is required for development purposes, but it can be used also in production as a workaround for problems on the official repositories. func getLocalOverride(info *newOverrideInput) ([]byte, error) { + log := logf.Log + overridePath, err := newOverride(info).Path() + log.V(5).Info("Overrides", "SearchFile", overridePath, "Provider", info.provider.ManifestLabel(), "Version", info.version) + if err != nil { return nil, err } From b036df8545d607b556696f3e4b09d5f0519302d5 Mon Sep 17 00:00:00 2001 From: Ryan Gough Date: Wed, 21 Feb 2024 19:25:38 +0100 Subject: [PATCH 2/2] Update cmd/clusterctl/client/repository/overrides.go Co-authored-by: Christian Schlotter --- cmd/clusterctl/client/repository/overrides.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/clusterctl/client/repository/overrides.go b/cmd/clusterctl/client/repository/overrides.go index 6026a7616e8a..bd14f035d61b 100644 --- a/cmd/clusterctl/client/repository/overrides.go +++ b/cmd/clusterctl/client/repository/overrides.go @@ -111,7 +111,7 @@ func getLocalOverride(info *newOverrideInput) ([]byte, error) { log := logf.Log overridePath, err := newOverride(info).Path() - log.V(5).Info("Overrides", "SearchFile", overridePath, "Provider", info.provider.ManifestLabel(), "Version", info.version) + log.V(5).Info("Potential override file", "SearchFile", overridePath, "Provider", info.provider.ManifestLabel(), "Version", info.version) if err != nil { return nil, err