fix(management): SeparateChain property support added to K8STLSSECR and K8SSecret store-types

Author: spbsoluble

kubernetes-orchestrator-extension/Clients/KubeClient.cs

@@ -948,13 +948,13 @@ public V1Secret CreateOrUpdateCertificateStoreSecret(K8SJobCertificate jobCertif
 
     public V1Secret CreateOrUpdateCertificateStoreSecret(string keyPem, string certPem, List<string> chainPem,
         string secretName,
-        string namespaceName, string secretType, bool append = false, bool overwrite = false, bool remove = false)
+        string namespaceName, string secretType, bool append = false, bool overwrite = false, bool remove = false, bool separateChain = true)
     {
         _logger.LogTrace("Entered CreateOrUpdateCertificateStoreSecret()");
 
         _logger.LogDebug($"Attempting to create new secret {secretName} in namespace {namespaceName}");
         _logger.LogTrace("Calling CreateNewSecret()");
-        var k8SSecretData = CreateNewSecret(secretName, namespaceName, keyPem, certPem, chainPem, secretType);
+        var k8SSecretData = CreateNewSecret(secretName, namespaceName, keyPem, certPem, chainPem, secretType, separateChain);
         _logger.LogTrace("Finished calling CreateNewSecret()");
 
         _logger.LogTrace("Entering try/catch block to create secret...");
@@ -1277,7 +1277,7 @@ public V1Secret CreateOrUpdateBuddyPass(string secretName, string passwordFieldN
     }
 
     private V1Secret CreateNewSecret(string secretName, string namespaceName, string keyPem, string certPem,
-        List<string> chainPem, string secretType, bool separateChain = false)
+        List<string> chainPem, string secretType, bool separateChain = true)
     {
         _logger.LogTrace("Entered CreateNewSecret()");
         _logger.LogDebug("Attempting to create new secret...");

kubernetes-orchestrator-extension/Jobs/JobBase.cs

@@ -738,6 +738,11 @@ private void InitializeProperties(dynamic storeProperties)
                 Logger.LogDebug("KubeSecretKey not found in store properties");
                 CertificateDataFieldName = "";
             }
+            
+            if (storeProperties.ContainsKey("SeparateChain"))
+            {
+                SeparateChain = storeProperties["SeparateChain"];
+            }
         }
         catch (Exception)
         {

kubernetes-orchestrator-extension/Jobs/Management.cs

@@ -450,7 +450,7 @@ private V1Secret HandleTlsSecret(string certAlias, K8SJobCertificate certObj, st
 
         var keyPem = certObj.PrivateKeyPem;
         if (!string.IsNullOrEmpty(keyPem)) keyPems = new[] { keyPem };
-
+        
         Logger.LogDebug("Calling CreateOrUpdateCertificateStoreSecret() to create or update secret in Kubernetes...");
         var createResponse = KubeClient.CreateOrUpdateCertificateStoreSecret(
             certObj.PrivateKeyPem,
@@ -460,7 +460,9 @@ private V1Secret HandleTlsSecret(string certAlias, K8SJobCertificate certObj, st
             KubeNamespace,
             "tls_secret",
             append,
-            overwrite
+            overwrite,
+            false,
+            SeparateChain
         );
         if (createResponse == null)
             Logger.LogError("createResponse is null");