JIRA WDT-452 - Remove runtime encryption secret from Verrazzano model.yaml (#705)

Author: rakillen

core/src/main/python/wlsdeploy/tool/util/targets/vz_config_helper.py

@@ -40,7 +40,6 @@
 HAS_CLUSTERS = 'hasClusters'
 HAS_DATABASES = 'hasDatabases'
 REPLICAS = 'replicas'
-RUNTIME_ENCRYPTION_SECRET = 'runtimeEncryptionSecret'
 WEBLOGIC_CREDENTIALS_SECRET = 'webLogicCredentialsSecret'
 
 
@@ -115,8 +114,6 @@ def _build_template_hash(model, model_context, aliases):
 
     # configuration / model
     template_hash[DOMAIN_TYPE] = model_context.get_domain_type()
-    template_hash[RUNTIME_ENCRYPTION_SECRET] = domain_uid +\
-                                               target_configuration_helper.RUNTIME_ENCRYPTION_SECRET_SUFFIX
 
     # clusters
 

core/src/main/python/wlsdeploy/util/target_configuration_helper.py

@@ -26,10 +26,6 @@
 __class_name = 'target_configuration_helper'
 __logger = PlatformLogger('wlsdeploy.tool.util')
 
-# secret name for runtime encryption
-RUNTIME_ENCRYPTION_SECRET_NAME = 'runtime-encryption'
-RUNTIME_ENCRYPTION_SECRET_SUFFIX = '-' + RUNTIME_ENCRYPTION_SECRET_NAME
-
 # Kubernetes secret for admin name and password is <domainUid>-weblogic-credentials
 WEBLOGIC_CREDENTIALS_SECRET_NAME = 'weblogic-credentials'
 WEBLOGIC_CREDENTIALS_SECRET_SUFFIX = '-' + WEBLOGIC_CREDENTIALS_SECRET_NAME
@@ -155,15 +151,6 @@ def generate_k8s_script(model_context, token_dictionary, model_dictionary):
         k8s_script.write("# " + message + nl)
         k8s_script.write(command_string + nl)
 
-    # for vz additional output type, add the runtime encryption secret
-    output_types = model_context.get_target_configuration().get_additional_output_types()
-    if VZ_EXTRA_CONFIG in output_types:
-        message = exception_helper.get_message("WLSDPLY-01663", PASSWORD_TAG, RUNTIME_ENCRYPTION_SECRET_NAME)
-        command_string = "create_k8s_secret %s %s " % (RUNTIME_ENCRYPTION_SECRET_NAME, PASSWORD_TAG)
-        k8s_script.write(nl)
-        k8s_script.write("# " + message + nl)
-        k8s_script.write(command_string + nl)
-
     k8s_script.close()
 
 

core/src/main/resources/oracle/weblogic/deploy/targets/vz/model.yaml

@@ -33,7 +33,6 @@ spec:
         configuration:
           model:
             domainType: {{{domainType}}}
-            runtimeEncryptionSecret: {{{runtimeEncryptionSecret}}}
       connections:
         - ingress:
             - name: {{{domainPrefix}}}-ingress