From bf7c0d1fbc37730b419364f09d807cb66bf9ecc7 Mon Sep 17 00:00:00 2001 From: Martin Hickey Date: Mon, 6 Mar 2023 15:26:08 +0000 Subject: [PATCH] Fix message Signed-off-by: Martin Hickey --- pkg/common/common.go | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkg/common/common.go b/pkg/common/common.go index 053ac8b..04011bd 100644 --- a/pkg/common/common.go +++ b/pkg/common/common.go @@ -93,17 +93,15 @@ func ReplaceManifestData(mapMetadata *mapping.Metadata, modifiedManifest string, return "", errors.Errorf("Failed to get the deprecated or removed Kubernetes version for API: %s", strings.ReplaceAll(deprecatedAPI, "\n", " ")) } - if semver.Compare(apiVersionStr, kubeVersionStr) > 0 { - log.Printf("The following API does not require mapping as the "+ - "API is not deprecated or removed in Kubernetes '%s':\n\"%s\"\n", apiVersionStr, - deprecatedAPI) - // skip to next mapping - continue - } - if count := strings.Count(modifiedManifest, deprecatedAPI); count > 0 { + if semver.Compare(apiVersionStr, kubeVersionStr) > 0 { + log.Printf("The following API:\n\"%s\" does not require mapping as the "+ + "API is not deprecated or removed in Kubernetes \"%s\"\n", deprecatedAPI, kubeVersionStr) + // skip to next mapping + continue + } if supportedAPI == "" { - log.Printf("Found %d instances of deprecated or removed Kubernetes API:\n\"%s\"\n", count, deprecatedAPI) + log.Printf("Found %d instances of deprecated or removed Kubernetes API:\n\"%s\"\nNo supported API equivalent\n", count, deprecatedAPI) modifiedManifest = removeDeprecatedAPIWithoutSuccessor(count, deprecatedAPI, modifiedManifest) } else { log.Printf("Found %d instances of deprecated or removed Kubernetes API:\n\"%s\"\nSupported API equivalent:\n\"%s\"\n", count, deprecatedAPI, supportedAPI)