Skip to content

Wdt 414 k8s filter #628

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 23 commits into from
May 27, 2020
Merged

Wdt 414 k8s filter #628

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
043d3d6
rename method to reflect intention
May 11, 2020
3753855
Add support for preparing a domain for k8s during discovery
May 13, 2020
5aae867
add comments
May 14, 2020
87172ba
remove obsolete code
May 14, 2020
8bfd282
add command for preparing models for operator
May 15, 2020
ea448b5
refactor method
May 15, 2020
0d46839
Fix code if no -variable_file is passed
May 15, 2020
8779ffe
cleanup
May 15, 2020
0f1a324
JIRA WDT-414 - Don't include single-unpredictable tokens in model path
rakillen May 15, 2020
1bef778
fix bug
May 15, 2020
730583b
fix password formating
May 15, 2020
fc21ef1
refactor code
May 18, 2020
c771e05
Fix multiple models problem
May 18, 2020
cf2615e
Add documentation
May 18, 2020
a29a350
Fix initialization error
May 18, 2020
96f39db
various fixes for review
May 19, 2020
7987c9e
Fix PR review
May 21, 2020
4def452
python version requirment
May 21, 2020
7fb404f
update to avoid duplicate create secrets
May 22, 2020
0852c9a
change target file final name
May 26, 2020
a88b094
update doc
May 26, 2020
844e2d3
doc update
May 26, 2020
4a2ccee
Merge branch 'master' into wdt-414-k8s-filter
ddsharpe May 26, 2020
File filter

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
Fix multiple models problem
  • Loading branch information
Johnny Shum committed May 18, 2020
commit c771e05a620f4aa9bd9e32b7dac0612a60e96539
11 changes: 6 additions & 5 deletions core/src/main/python/prepare_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,7 @@ def walk(self):

model_file_list = self.model_files.split(',')
for model_file in model_file_list:
self.cache.clear()
if os.path.splitext(model_file)[1].lower() == ".yaml":
model_file_name = model_file
FileToPython(model_file_name, True).parse()
Expand Down Expand Up @@ -497,11 +498,11 @@ def main():
model_context = __process_args(sys.argv, __logger)
_outputdir = model_context.get_kubernetes_output_dir()
model1 = model_context.get_model_file()
for f in [ model1 ]:
if not os.path.exists(f):
raise CLAException("Model %s does not exists" % f)
if os.path.isdir(f):
raise CLAException("Model %s is a directory" % f)
# for f in [ model1 ]:
# if not os.path.exists(f):
# raise CLAException("Model %s does not exists" % f)
# if os.path.isdir(f):
# raise CLAException("Model %s is a directory" % f)


obj = PrepareModel(model1, model_context, __logger, _outputdir)
Expand Down
81 changes: 45 additions & 36 deletions core/src/main/python/wlsdeploy/util/target_configuration_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,51 @@ def generate_k8s_script(file_location, token_dictionary):
NL = '\n'
par_dir = os.path.abspath(os.path.join(file_location,os.pardir))
k8s_file = os.path.join(par_dir, "create_k8s_secrets.sh")
k8s_create_script_handle = open(k8s_file, 'w')
k8s_create_script_handle.write('#!/bin/bash')
k8s_create_script_handle.write(NL)
k8s_create_script_handle.write('set -eu')
k8s_create_script_handle.write(NL)
k8s_create_script_handle.write('NAMESPACE=default')
k8s_create_script_handle.write(NL)
k8s_create_script_handle.write('DOMAIN_UID=domain1')
k8s_create_script_handle.write(NL)
k8s_create_script_handle.write('ADMIN_USER=wlsAdminUser')
k8s_create_script_handle.write(NL)
k8s_create_script_handle.write('ADMIN_PWD=wlsAdminPwd')
k8s_create_script_handle.write(NL)
k8s_create_script_handle.write('function create_k8s_secret {')
k8s_create_script_handle.write(NL)
k8s_create_script_handle.write('kubectl -n $NAMESPACE delete secret ${DOMAIN_UID}-$1 --ignore-not-found')
k8s_create_script_handle.write(NL)
k8s_create_script_handle.write('kubectl -n $NAMESPACE create secret generic ${DOMAIN_UID}-$1 ' +
'--from-literal=$2=$3')
k8s_create_script_handle.write(NL)
k8s_create_script_handle.write('kubectl -n $NAMESPACE label secret ${DOMAIN_UID}-$1 ' +
'weblogic.domainUID=${DOMAIN_UID}')
k8s_create_script_handle.write(NL)
k8s_create_script_handle.write('}')
k8s_create_script_handle.write(NL)
# Only write the function and wls crednetials if it does not exists
if not os.path.exists(k8s_file):
k8s_create_script_handle = open(k8s_file, 'w')
k8s_create_script_handle.write('#!/bin/bash')
k8s_create_script_handle.write(NL)
k8s_create_script_handle.write(NL)
k8s_create_script_handle.write('set -eu')
k8s_create_script_handle.write(NL)
k8s_create_script_handle.write(NL)
k8s_create_script_handle.write('NAMESPACE=default')
k8s_create_script_handle.write(NL)
k8s_create_script_handle.write('DOMAIN_UID=domain1')
k8s_create_script_handle.write(NL)
k8s_create_script_handle.write('ADMIN_USER=wlsAdminUser')
k8s_create_script_handle.write(NL)
k8s_create_script_handle.write('ADMIN_PWD=wlsAdminPwd')
k8s_create_script_handle.write(NL)
k8s_create_script_handle.write(NL)
k8s_create_script_handle.write('function create_k8s_secret {')
k8s_create_script_handle.write(NL)
k8s_create_script_handle.write('kubectl -n $NAMESPACE delete secret ${DOMAIN_UID}-$1 --ignore-not-found')
k8s_create_script_handle.write(NL)
k8s_create_script_handle.write('kubectl -n $NAMESPACE create secret generic ${DOMAIN_UID}-$1 ' +
'--from-literal=$2=$3')
k8s_create_script_handle.write(NL)
k8s_create_script_handle.write('kubectl -n $NAMESPACE label secret ${DOMAIN_UID}-$1 ' +
'weblogic.domainUID=${DOMAIN_UID}')
k8s_create_script_handle.write(NL)
k8s_create_script_handle.write('}')
k8s_create_script_handle.write(NL)
k8s_create_script_handle.write(NL)
k8s_create_script_handle.write("kubectl -n $NAMESPACE delete secret ${DOMAIN_UID}-weblogic-credentials "
+ "--ignore-not-found")
k8s_create_script_handle.write(NL)
k8s_create_script_handle.write("kubectl -n $NAMESPACE create secret generic "
+ "${DOMAIN_UID}-weblogic-credentials "
+ "--from-literal=username=${ADMIN_USER} --from-literal=password=${ADMIN_PWD}")
k8s_create_script_handle.write(NL)
k8s_create_script_handle.write('kubectl -n $NAMESPACE label secret ${DOMAIN_UID}-weblogic-credentials ' +
'weblogic.domainUID=${DOMAIN_UID}')
k8s_create_script_handle.write(NL)
k8s_create_script_handle.write(NL)
k8s_create_script_handle.close()

k8s_create_script_handle = open(k8s_file, "a+")
k8s_create_script_handle.write(NL)
for property_name in token_dictionary:
# AdminPassword handle differently and SecurityConfig.NodeManagerPasswordEncrypted is the short name
Expand All @@ -50,17 +70,6 @@ def generate_k8s_script(file_location, token_dictionary):
k8s_create_script_handle.write(command_string)
k8s_create_script_handle.write(NL)

k8s_create_script_handle.write(NL)
k8s_create_script_handle.write("kubectl -n $NAMESPACE delete secret ${DOMAIN_UID}-weblogic-credentials "
+ "--ignore-not-found")
k8s_create_script_handle.write(NL)
k8s_create_script_handle.write("kubectl -n $NAMESPACE create secret generic "
+ "${DOMAIN_UID}-weblogic-credentials "
+ "--from-literal=username=${ADMIN_USER} --from-literal=password=${ADMIN_PWD}")
k8s_create_script_handle.write(NL)
k8s_create_script_handle.write('kubectl -n $NAMESPACE label secret ${DOMAIN_UID}-weblogic-credentials ' +
'weblogic.domainUID=${DOMAIN_UID}')
k8s_create_script_handle.write(NL)
k8s_create_script_handle.close()

def format_as_secret(prop_name):
Expand Down