Merge branch 'jira-wdt-941-verrazza-no' into 'main'

Remove references to Verrazzano, including type definitions, CRDs, and model references

See merge request weblogic-cloud/weblogic-deploy-tooling!1827

Author: robertpatrick

core/src/main/python/wlsdeploy/aliases/model_constants.py

@@ -350,7 +350,6 @@
 USER_ATTRIBUTES = 'UserAttribute'
 USE_SAMPLE_DATABASE = 'UseSampleDatabase'
 USE_SSL = "useSSL"
-VERRAZZANO = "verrazzano"
 VIRTUAL_HOST = 'VirtualHost'
 VIRTUAL_TARGET = 'VirtualTarget'
 VIRTUAL_USER_AUTHENTICATOR = 'VirtualUserAuthenticator'
@@ -480,14 +479,12 @@
     TOPOLOGY,
     RESOURCES,
     APP_DEPLOYMENTS,
-    KUBERNETES,
-    VERRAZZANO
+    KUBERNETES
 ]
 
 # the contents of these sections are based on CRD schemas
 CRD_MODEL_SECTIONS = [
-    KUBERNETES,
-    VERRAZZANO
+    KUBERNETES
 ]
 
 # these domain attributes have special processing in create,

core/src/main/python/wlsdeploy/tool/modelhelp/model_crd_section_printer.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2020, 2023, Oracle and/or its affiliates.
+Copyright (c) 2020, 2025, Oracle and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 from wlsdeploy.exception import exception_helper
@@ -17,7 +17,7 @@
 
 class ModelCrdSectionPrinter(object):
     """
-    Class for printing kubernetes sections as model samples.
+    Class for printing the kubernetes section as a model sample.
     """
     _class_name = "ModelCrdSectionPrinter"
     _logger = PlatformLogger('wlsdeploy.modelhelp')
@@ -146,7 +146,7 @@ def _print_model_folder_sample(self, section_name, model_path_tokens, control_op
             lookup_token = token
             option_key = None
 
-            # check for a folder with multiple options, such as (verrazzano/.../trait#MetricsTrait)
+            # check for a folder with multiple options, such as (.../folder#option)
             if '#' in token:
                 parts = token.split('#', 1)
                 lookup_token = parts[0]
@@ -161,7 +161,7 @@ def _print_model_folder_sample(self, section_name, model_path_tokens, control_op
             if lookup_token in valid_subfolder_keys:
                 current_folder = properties[lookup_token]
 
-                # find matching option if folder has multiple options, such as (verrazzano/.../trait#MetricsTrait)
+                # find matching option if folder has multiple options, such as (.../folder#option)
                 token_suffix = ''
                 folder_options = schema_helper.get_one_of_options(current_folder)
                 if folder_options and option_key is not None:

core/src/main/python/wlsdeploy/tool/util/filter_helper.py

@@ -23,7 +23,6 @@
 __id_filter_map = {
     # groups that execute multiple filters
     'k8s_filter': wko_filter.filter_model,
-    'vz_filter': wko_filter.filter_model_for_vz,
     'wko_filter': wko_filter.filter_model_for_wko,
 
     # individual filters for custom target environments
@@ -38,7 +37,6 @@
 __final_filter_map = {
     # groups that execute multiple filters
     'k8s_final_filter': wko_final_filter.filter_final_model,
-    'vz_final_filter': wko_final_filter.filter_final_model_for_vz,
     'wko_final_filter': wko_final_filter.filter_final_model_for_wko,
     'wko3_final_filter': wko_final_filter.filter_final_model_for_wko3,
 }

core/src/main/python/wlsdeploy/tool/util/filters/wko_filter.py

@@ -79,16 +79,6 @@ def filter_model_for_wko(model, model_context):
     filter_model(model, model_context)
 
 
-def filter_model_for_vz(model, model_context):
-    """
-    Perform filtering operations on the specified model to prepare for Verrazzano deployment.
-    Currently matches the general k8s target filtering.
-    :param model: the model to be filtered
-    :param model_context: used by nested filters
-    """
-    filter_model(model, model_context)
-
-
 def filter_online_attributes(model, model_context):
     """
     Remove any online-only attributes from the specified model.

core/src/main/python/wlsdeploy/tool/util/filters/wko_final_filter.py

@@ -64,17 +64,6 @@ def filter_final_model_for_wko3(model, update_model, model_context):
     check_admin_server_defined(model, update_model, model_context)
 
 
-def filter_final_model_for_vz(model, update_model, model_context):
-    """
-    Perform filtering operations on the specified model to prepare for Verrazzano deployment.
-    Currently, matches the general k8s target filtering.
-    :param model: the model to be filtered
-    :param update_model: the model to be updated with any changes
-    :param model_context: used by nested filters
-    """
-    filter_final_model(model, update_model, model_context)
-
-
 def check_dynamic_cluster_prefixes(model, update_model, _model_context):
     """
     All Dynamic Clusters must have a DynamicServers section with the ServerNamePrefix field explicitly declared.

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

@@ -1,25 +1,20 @@
 """
-Copyright (c) 2020, 2024, Oracle and/or its affiliates.
+Copyright (c) 2020, 2025, Oracle and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-Methods for creating Kubernetes resource configuration files for Verrazzano.
+Methods for creating Kubernetes resource configuration files for WKO.
 """
 import os.path
 
 from java.io import File
 
-from wlsdeploy.aliases import alias_utils
 from wlsdeploy.aliases.location_context import LocationContext
-from wlsdeploy.aliases.model_constants import APPLICATION
 from wlsdeploy.aliases.model_constants import CLUSTER
-from wlsdeploy.aliases.model_constants import DYNAMIC_SERVERS
 from wlsdeploy.aliases.model_constants import JDBC_DRIVER_PARAMS
 from wlsdeploy.aliases.model_constants import JDBC_RESOURCE
 from wlsdeploy.aliases.model_constants import JDBC_SYSTEM_RESOURCE
-from wlsdeploy.aliases.model_constants import LISTEN_PORT
 from wlsdeploy.aliases.model_constants import SERVER
 from wlsdeploy.aliases.model_constants import SERVER_TEMPLATE
-from wlsdeploy.aliases.model_constants import TARGET
 from wlsdeploy.aliases.model_constants import URL
 from wlsdeploy.logging.platform_logger import PlatformLogger
 from wlsdeploy.tool.util import k8s_helper
@@ -31,15 +26,12 @@
 from wlsdeploy.util import target_configuration_helper
 import wlsdeploy.util.unicode_helper as str_helper
 
-__class_name = 'vz_config_helper'
+__class_name = 'additional_output_helper'
 __logger = PlatformLogger('wlsdeploy.tool.util')
 
 # substitution keys used in the templates
 ADDITIONAL_SECRET_NAME = 'additionalSecretName'
 ADDITIONAL_SECRETS = 'additionalSecrets'
-APPLICATIONS = 'applications'
-APPLICATION_NAME = 'applicationName'
-APPLICATION_PREFIX = 'applicationPrefix'
 CLUSTER_NAME = 'clusterName'
 CLUSTER_UID = 'clusterUid'
 CLUSTERS = 'clusters'
@@ -55,15 +47,9 @@
 DOMAIN_TYPE = 'domainType'
 DOMAIN_UID = 'domainUid'
 HAS_ADDITIONAL_SECRETS = 'hasAdditionalSecrets'
-HAS_APPLICATIONS = 'hasApplications'
 HAS_CLUSTERS = 'hasClusters'
 HAS_DATASOURCES = 'hasDatasources'
-HAS_HOST_APPLICATIONS = 'hasHostApplications'
 HAS_MODEL = 'hasModel'
-HOST_APPLICATION_APPLICATIONS = 'applications'
-HOST_APPLICATION_HOST = 'host'
-HOST_APPLICATION_PORT = 'port'
-HOST_APPLICATIONS = 'hostApplications'
 NAMESPACE = 'namespace'
 REPLICAS = 'replicas'
 RUNTIME_ENCRYPTION_SECRET = "runtimeEncryptionSecret"
@@ -255,73 +241,6 @@ def _build_template_hash(model, model_context, aliases, credential_injector, dom
     template_hash[DATASOURCES] = databases
     template_hash[HAS_DATASOURCES] = len(databases) != 0
 
-    # applications
-
-    apps = []
-
-    applications = dictionary_utils.get_dictionary_element(model.get_model_app_deployments(), APPLICATION)
-    for app_name in applications:
-        app_hash = dict()
-        prefix = '/' + app_name
-
-        # get the prefix from the app descriptor?
-
-        app_hash[APPLICATION_NAME] = app_name
-        app_hash[APPLICATION_PREFIX] = prefix
-
-        apps.append(app_hash)
-
-    template_hash[APPLICATIONS] = apps
-    template_hash[HAS_APPLICATIONS] = len(apps) != 0
-
-    # host applications - applications organized by host, for Verrazzano IngressTrait
-
-    app_map = {}
-    applications = dictionary_utils.get_dictionary_element(model.get_model_app_deployments(), APPLICATION)
-    for app_name in applications:
-        app_hash = dict()
-        app_hash[APPLICATION_NAME] = app_name
-        # this text is matched in crd_file_updater, be careful if changing
-        app_hash[APPLICATION_PREFIX] = '(path for ' + app_name + ')'
-
-        app_folder = dictionary_utils.get_dictionary_element(applications, app_name)
-        targets_value = dictionary_utils.get_dictionary_element(app_folder, TARGET)
-        targets = alias_utils.create_list(targets_value, 'WLSDPLY-01682')
-        for target in targets:
-            if target not in app_map:
-                app_map[target] = []
-            app_map[target].append(app_hash)
-
-    host_apps = []
-    target_keys = app_map.keys()
-    target_keys.sort()
-    for target_key in target_keys:
-        listen_port = DEFAULT_LISTEN_PORT
-        target_cluster = _find_cluster(model, target_key)
-        if target_cluster is not None:
-            full_host_name = k8s_helper.get_dns_name(domain_uid + '-cluster-' + target_key)
-            dynamic_servers = dictionary_utils.get_dictionary_element(target_cluster, DYNAMIC_SERVERS)
-            template_name = dictionary_utils.get_element(dynamic_servers, SERVER_TEMPLATE)
-            if template_name:
-                server_template = _find_server_template(model, template_name)
-                if server_template:
-                    listen_port = server_template[LISTEN_PORT] or listen_port
-        else:
-            full_host_name = k8s_helper.get_dns_name(domain_uid + '-' + target_key)
-            target_server = _find_server(model, target_key)
-            if target_server is not None:
-                listen_port = target_server[LISTEN_PORT] or listen_port
-
-        host_app = {
-            HOST_APPLICATION_HOST: full_host_name,
-            HOST_APPLICATION_PORT: str_helper.to_string(listen_port),
-            HOST_APPLICATION_APPLICATIONS: app_map[target_key]
-        }
-        host_apps.append(host_app)
-
-    template_hash[HOST_APPLICATIONS] = host_apps
-    template_hash[HAS_HOST_APPLICATIONS] = len(host_apps) != 0
-
     # additional secrets - exclude admin
 
     additional_secrets = []