Make it possible to add annotations to the keys secret (#3484)

* Make it possible to add annotations to the keys secret

* fix inconsistent naming

* we need to quote booleans as well

* fix naming

* fix review comments

* fix condition according to comments

---------

Co-authored-by: Lilian Kasem <[email protected]>

Author: sdahlbac

src/Azure.Functions.Cli/Actions/KubernetesActions/KubernetesDeployAction.cs

@@ -50,6 +50,8 @@ class KubernetesDeployAction : BaseAction
         public string HashFilesPattern { get; set; } = "";
         public bool BuildImage { get; set; } = true;
 
+        public IDictionary<string, string> KeySecretAnnotations { get; private set; }
+
         public KubernetesDeployAction(ISecretsManager secretsManager)
         {
             _secretsManager = secretsManager;
@@ -93,6 +95,7 @@ public override ICommandLineParserResult ParseArgs(string[] args)
             SetFlag<string>("config-file", "if --write-configs is true, write configs to this file (default: 'functions.yaml')", f => ConfigFile = f);
             SetFlag<string>("hash-files", "Files to hash to determine the image version", f => HashFilesPattern = f);
             SetFlag<bool>("image-build", "If false, skip the docker build", f => BuildImage = f);
+            SetFlag<string>("key-secret-annotations", "The annotations to add to the keys secret e.g. key1=val1,key2=val2", a => KeySecretAnnotations = a.Split(',').Select(s => s.Split('=')).ToDictionary(k => k[0], v => v[1]));
 
             return base.ParseArgs(args);
         }
@@ -145,7 +148,9 @@ public override async Task RunAsync()
                 MaxReplicaCount,
                 KeysSecretCollectionName,
                 MountFuncKeysAsContainerVolume,
-                KedaVersion);
+                KedaVersion,
+                KeySecretAnnotations
+                );
 
             if (DryRun)
             {

src/Azure.Functions.Cli/Kubernetes/KubernetesHelpers.cs

@@ -106,7 +106,8 @@ internal static async Task CreateNamespace(string @namespace)
             int? maxReplicas = null,
             string keysSecretCollectionName = null,
             bool mountKeysAsContainerVolume = false,
-            KedaVersion? kedaVersion = null)
+            KedaVersion? kedaVersion = null,
+            IDictionary<string, string> keySecretsAnnotations = null)
         {
             IKubernetesResource scaledObject = null;
             var result = new List<IKubernetesResource>();
@@ -224,7 +225,7 @@ internal static async Task CreateNamespace(string @namespace)
                 resultantFunctionKeys = GetFunctionKeys(currentImageFuncKeys, await GetExistingFunctionKeys(keysSecretCollectionName, @namespace));
                 if (resultantFunctionKeys.Any())
                 {
-                    result.Insert(resourceIndex, GetSecret(keysSecretCollectionName, @namespace, resultantFunctionKeys));
+                    result.Insert(resourceIndex, GetSecret(keysSecretCollectionName, @namespace, resultantFunctionKeys, annotations: keySecretsAnnotations));
                     resourceIndex++;
                 }
 
@@ -480,10 +481,13 @@ public QuoteNumbersEventEmitter(IEventEmitter nextEmitter)
 
             public override void Emit(ScalarEventInfo eventInfo, IEmitter emitter)
             {
-                if (eventInfo.Source.Type == typeof(string) && double.TryParse(eventInfo.Source.Value.ToString(), out _))
+                if (eventInfo.Source.Type == typeof(string) &&
+                    (double.TryParse(eventInfo.Source.Value.ToString(), out _) ||
+                     bool.TryParse(eventInfo.Source.Value.ToString(), out _)))
                 {
                     eventInfo.Style = ScalarStyle.DoubleQuoted;
                 }
+
                 base.Emit(eventInfo, emitter);
             }
         }
@@ -642,7 +646,7 @@ private static ServiceV1 GetService(string name, string @namespace, DeploymentV1
             };
         }
 
-        private static SecretsV1 GetSecret(string name, string @namespace, IDictionary<string, string> secrets)
+        private static SecretsV1 GetSecret(string name, string @namespace, IDictionary<string, string> secrets, IDictionary<string, string> annotations = null)
         {
             return new SecretsV1
             {
@@ -651,7 +655,8 @@ private static SecretsV1 GetSecret(string name, string @namespace, IDictionary<s
                 Metadata = new ObjectMetadataV1
                 {
                     Name = name,
-                    Namespace = @namespace
+                    Namespace = @namespace,
+                    Annotations = annotations
                 },
                 Data = secrets.ToDictionary(k => k.Key, v => Convert.ToBase64String(Encoding.UTF8.GetBytes(v.Value)))
             };