Skip to content

Add WKO v4 support for WDT #1218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 24 commits into from
Oct 24, 2022
Merged

Add WKO v4 support for WDT #1218

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
81169ce
Added schemas for domain v9 and cluster v1
rakillen Oct 10, 2022
763bd2a
Read schema versions corresponding to WKO version
rakillen Oct 10, 2022
d40da45
Avoid logging parsed JSON and YAML
rakillen Oct 11, 2022
402cfed
Add WKO v4 schema support for modelHelp; use revised interface in uni…
rakillen Oct 11, 2022
6768451
Pass exception to logger to display formatted stack trace in log
rakillen Oct 12, 2022
38c73bc
Add WKO v4 support to validateModel; refined wko_schema_helper API
rakillen Oct 12, 2022
9426e86
Moved wko_schema_helper API code
rakillen Oct 12, 2022
1080085
Use alternate template to generate CRD file for WKO v4
rakillen Oct 13, 2022
34d9d2e
Refactored CRD folder API; renamed wko_schema_helper
rakillen Oct 18, 2022
30316f8
Use correct exception type for extractResource
rakillen Oct 19, 2022
9060ce3
Corrections to WKO v4 CRD template
rakillen Oct 19, 2022
7eeb08e
Rename crd_file_updater and use model CRD helper API; combine target …
rakillen Oct 19, 2022
4e4addd
Allow different object list keys for different model CRD folders
rakillen Oct 19, 2022
8262883
Corrected usages
rakillen Oct 19, 2022
ca1aef9
Code cleanup, corrected copyrights
rakillen Oct 19, 2022
b5da4f7
Allow createDomain, deployDomain, and updateDomain to skip validation…
rakillen Oct 20, 2022
8886a15
Add comments to WKO v4 cluster CRD documents
rakillen Oct 20, 2022
63f4bbb
Add WKO v4 target configurations for DII and PV
rakillen Oct 20, 2022
fd01924
Create a results JSON file instead of a k8s secrets file
rakillen Oct 20, 2022
46bbab5
Replace stack trace in Java exceptions based on Jython exceptions/errors
rakillen Oct 21, 2022
c014082
Let tool_main handle unexpected exceptions in prepareModel
rakillen Oct 21, 2022
02fc056
Add cluster server count information to result.json
rakillen Oct 21, 2022
d1e2f35
Add domain UID to JSON results file; use helper methods throughout
rakillen Oct 21, 2022
02a4cb2
Revised unit test to use results.json file instead of k8s_secrets.json
rakillen Oct 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Moved wko_schema_helper API code
  • Loading branch information
@rakillen
rakillen committed Oct 12, 2022
commit 9426e86a14d7a8b24a3d9767fe63555320e62f5e
2 changes: 1 addition & 1 deletion core/src/main/python/wlsdeploy/tool/modelhelp/model_kubernetes_printer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"""
from wlsdeploy.exception import exception_helper
from wlsdeploy.logging.platform_logger import PlatformLogger
from wlsdeploy.tool.util.wko import wko_schema_helper
from wlsdeploy.tool.util.targets import wko_schema_helper
from wlsdeploy.tool.modelhelp import model_help_utils
from wlsdeploy.tool.modelhelp.model_help_utils import ControlOptions
from wlsdeploy.util.exit_code import ExitCode
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/python/wlsdeploy/tool/util/targets/output_file_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from wlsdeploy.exception import exception_helper
from wlsdeploy.exception.expection_types import ExceptionType
from wlsdeploy.logging.platform_logger import PlatformLogger
from wlsdeploy.tool.util.wko import wko_schema_helper
from wlsdeploy.tool.util.targets import wko_schema_helper
from wlsdeploy.util import dictionary_utils
from wlsdeploy.yaml.yaml_translator import PythonToYaml
from wlsdeploy.yaml.yaml_translator import YamlToPython
Expand Down
2 changes: 1 addition & 1 deletion ...ploy/tool/util/wko/wko_document_folder.py → .../tool/util/targets/wko_document_folder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Copyright (c) 2022, 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.tool.util.wko import wko_schema_helper
from wlsdeploy.tool.util.targets import wko_schema_helper


class WkoDocumentFolder:
Expand Down
2 changes: 1 addition & 1 deletion ...deploy/tool/util/wko/wko_schema_helper.py → ...oy/tool/util/targets/wko_schema_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from wlsdeploy.exception.expection_types import ExceptionType
from wlsdeploy.json.json_translator import JsonStreamToPython
from wlsdeploy.logging import platform_logger
from wlsdeploy.tool.util.wko.wko_document_folder import WkoDocumentFolder
from wlsdeploy.tool.util.targets.wko_document_folder import WkoDocumentFolder
from wlsdeploy.util import dictionary_utils

CLUSTER_SCHEMA_NAME = 'cluster-crd-schema'
Expand Down
4 changes: 0 additions & 4 deletions core/src/main/python/wlsdeploy/tool/util/wko/__init__.py
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion core/src/main/python/wlsdeploy/tool/validate/kubernetes_validator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from wlsdeploy.aliases.model_constants import KUBERNETES
from wlsdeploy.exception.expection_types import ExceptionType
from wlsdeploy.logging.platform_logger import PlatformLogger
from wlsdeploy.tool.util.wko import wko_schema_helper
from wlsdeploy.tool.util.targets import wko_schema_helper
from wlsdeploy.util import dictionary_utils


Expand Down
2 changes: 1 addition & 1 deletion core/src/main/python/wlsdeploy/util/target_configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from wlsdeploy.logging.platform_logger import PlatformLogger
from wlsdeploy.util import dictionary_utils
from wlsdeploy.util.validate_configuration import VALIDATION_METHODS
from wlsdeploy.tool.util.wko import wko_schema_helper
from wlsdeploy.tool.util.targets import wko_schema_helper

# types for credential method
CREDENTIALS_METHOD = "credentials_method"
Expand Down
2 changes: 1 addition & 1 deletion core/src/test/python/wlsdeploy/tool/extract/kubernetes_schema_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from oracle.weblogic.deploy.util import PyOrderedDict

from wlsdeploy.aliases.model_constants import KUBERNETES
from wlsdeploy.tool.util.wko import wko_schema_helper
from wlsdeploy.tool.util.targets import wko_schema_helper


class KubernetesSchemaTest(unittest.TestCase):
Expand Down