From 8ac1975f5f439e2d5a5fff5d305e9c07f11a9f97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charles-Edouard=20Br=C3=A9t=C3=A9ch=C3=A9?=
 <charles.edouard@nirmata.com>
Date: Fri, 2 Jun 2023 12:36:19 +0200
Subject: [PATCH] chore: deprecate imageSignatureRepository flag (#7391)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>
---
 CHANGELOG.md          |  8 ++++++++
 cmd/internal/flag.go  | 10 +++++++++-
 cmd/internal/setup.go |  1 +
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b612a35232..04ececadb8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## v1.11.0
+
+## v1.11.0-rc.1
+
+### Note
+
+- Deprecated flag `--imageSignatureRepository`. Will be removed in 1.12. Use per rule configuration `verifyImages.Repository` instead.
+
 ## v1.10.0
 
 ## v1.10.0-rc.1
diff --git a/cmd/internal/flag.go b/cmd/internal/flag.go
index 4c18463aa2..8160aa51bf 100644
--- a/cmd/internal/flag.go
+++ b/cmd/internal/flag.go
@@ -88,7 +88,7 @@ func initConfigMapCachingFlags() {
 }
 
 func initCosignFlags() {
-	flag.StringVar(&imageSignatureRepository, "imageSignatureRepository", "", "Alternate repository for image signatures. Can be overridden per rule via `verifyImages.Repository`.")
+	flag.StringVar(&imageSignatureRepository, "imageSignatureRepository", "", "(DEPRECATED, will be removed in 1.12) Alternate repository for image signatures. Can be overridden per rule via `verifyImages.Repository`.")
 }
 
 func initRegistryClientFlags() {
@@ -179,6 +179,14 @@ func initFlags(config Configuration, opts ...Option) {
 	}
 }
 
+func showWarnings(config Configuration, logger logr.Logger) {
+	if config.UsesCosign() {
+		if imageSignatureRepository != "" {
+			logger.Info("Warning: imageSignatureRepository is deprecated and will be removed in 1.12. Use per rule configuration `verifyImages.Repository` instead.")
+		}
+	}
+}
+
 func ParseFlags(config Configuration, opts ...Option) {
 	initFlags(config, opts...)
 	flag.Parse()
diff --git a/cmd/internal/setup.go b/cmd/internal/setup.go
index 7108d7a0a9..b22f495776 100644
--- a/cmd/internal/setup.go
+++ b/cmd/internal/setup.go
@@ -48,6 +48,7 @@ func Setup(config Configuration, name string, skipResourceFilters bool) (context
 	logger := setupLogger()
 	showVersion(logger)
 	printFlagSettings(logger)
+	showWarnings(config, logger)
 	sdownMaxProcs := setupMaxProcs(logger)
 	setupProfiling(logger)
 	ctx, sdownSignals := setupSignals(logger)