Skip to content

Commit 88ee5ce

Browse files
rjeberhardlennyphan
rjeberhard
and
lennyphan
authored
Recreate OWLS-86115 work (#2344)
* Remove use of configuration overrides for model in image Co-authored-by: Lenny Phan <lenny.phan@oracle.com>
1 parent 458eba6 commit 88ee5ce

File tree

15 files changed

+981
-28
lines changed

15 files changed

+981
-28
lines changed

‎operator/pom.xml

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -231,14 +231,36 @@
231231
<goal>java</goal>
232232
</goals>
233233
<phase>package</phase>
234+
<configuration>
235+
<mainClass>oracle.kubernetes.operator.helpers.CrdHelper</mainClass>
236+
<arguments>
237+
<argument>${project.basedir}/../kubernetes/crd/domain-crd.yaml</argument>
238+
</arguments>
239+
</configuration>
240+
</execution>
241+
<execution>
242+
<id>test-python-scripts</id>
243+
<phase>test</phase>
244+
<goals>
245+
<goal>exec</goal>
246+
</goals>
247+
<configuration>
248+
<skip>${skip.unit.tests}</skip>
249+
<executable>python</executable>
250+
<workingDirectory>src/test/python</workingDirectory>
251+
<environmentVariables>
252+
<PYTHONPATH>${project.basedir}/src/main/resources/scripts</PYTHONPATH>
253+
<DOMAIN_UID>sample-domain1</DOMAIN_UID>
254+
</environmentVariables>
255+
<arguments>
256+
<arugument>-B</arugument>
257+
<arugument>-m</arugument>
258+
<argument>unittest</argument>
259+
<argument>discover</argument>
260+
</arguments>
261+
</configuration>
234262
</execution>
235263
</executions>
236-
<configuration>
237-
<mainClass>oracle.kubernetes.operator.helpers.CrdHelper</mainClass>
238-
<arguments>
239-
<argument>${project.basedir}/../kubernetes/crd/domain-crd.yaml</argument>
240-
</arguments>
241-
</configuration>
242264
</plugin>
243265

244266
</plugins>

‎operator/src/main/java/oracle/kubernetes/operator/helpers/JobHelper.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,6 @@ List<V1EnvVar> getConfiguredEnvVars(TuningParameters tuningParameters) {
314314
Long.toString(getDomain().getWDTSetServerGroupsTimeoutMillis()));
315315
}
316316

317-
318317
String dataHome = getDataHome();
319318
if (dataHome != null && !dataHome.isEmpty()) {
320319
addEnvVar(vars, ServerEnvVars.DATA_HOME, dataHome);

‎operator/src/main/java/oracle/kubernetes/operator/helpers/PodStepContext.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
import oracle.kubernetes.operator.work.Step;
6262
import oracle.kubernetes.weblogic.domain.model.Domain;
6363
import oracle.kubernetes.weblogic.domain.model.DomainStatus;
64+
import oracle.kubernetes.weblogic.domain.model.IntrospectorJobEnvVars;
6465
import oracle.kubernetes.weblogic.domain.model.ServerEnvVars;
6566
import oracle.kubernetes.weblogic.domain.model.ServerSpec;
6667
import oracle.kubernetes.weblogic.domain.model.Shutdown;
@@ -631,6 +632,11 @@ private void updateEnv(List<V1EnvVar> env) {
631632
updateEnvForShutdown(env);
632633
updateEnvForStartupMode(env);
633634
defineConfigOverride(env);
635+
updateEnvWithDomainSourceType(env);
636+
}
637+
638+
private void updateEnvWithDomainSourceType(List<V1EnvVar> env) {
639+
addDefaultEnvVarIfMissing(env, IntrospectorJobEnvVars.DOMAIN_SOURCE_TYPE, getDomainHomeSourceType().toString());
634640
}
635641

636642
private void updateEnvForShutdown(List<V1EnvVar> env) {

‎operator/src/main/resources/scripts/introspectDomain.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -767,6 +767,10 @@ def addNetworkAccessPoint(self, server, nap, is_server_template):
767767
nap_protocol = getNAPProtocol(nap, server, self.env.getDomain(), is_server_template)
768768

769769
if istio_enabled == 'true':
770+
name = nap.getName()
771+
if name.startswith('http-') or name.startswith('tcp-') or name.startswith('tls-') or name.startswith('https-'):
772+
# skip istio ports already defined by WDT filtering for MII
773+
return
770774
http_protocol = [ 'http' ]
771775
https_protocol = ['https','admin']
772776
tcp_protocol = [ 't3', 'snmp', 'ldap', 'cluster-broadcast', 'iiop', 'sip']
@@ -1606,10 +1610,11 @@ def introspect(self):
16061610
tg = TopologyGenerator(self.env)
16071611

16081612
if tg.validate():
1609-
SitConfigGenerator(self.env).generate()
1613+
DOMAIN_SOURCE_TYPE = self.env.getEnvOrDef("DOMAIN_SOURCE_TYPE", None)
1614+
if DOMAIN_SOURCE_TYPE != "FromModel":
1615+
SitConfigGenerator(self.env).generate()
16101616
BootPropertiesGenerator(self.env).generate()
16111617
UserConfigAndKeyGenerator(self.env).generate()
1612-
DOMAIN_SOURCE_TYPE = self.env.getEnvOrDef("DOMAIN_SOURCE_TYPE", None)
16131618

16141619
if DOMAIN_SOURCE_TYPE == "FromModel":
16151620
trace("cfgmap write primordial_domain")

‎operator/src/main/resources/scripts/livenessProbe.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,11 @@ if [ $? != 0 ]; then
102102
exit $RETVAL
103103
fi
104104

105-
copySitCfgWhileRunning /weblogic-operator/introspector ${DOMAIN_HOME}/optconfig 'Sit-Cfg-CFG--'
106-
copySitCfgWhileRunning /weblogic-operator/introspector ${DOMAIN_HOME}/optconfig/jms 'Sit-Cfg-JMS--'
107-
copySitCfgWhileRunning /weblogic-operator/introspector ${DOMAIN_HOME}/optconfig/jdbc 'Sit-Cfg-JDBC--'
108-
copySitCfgWhileRunning /weblogic-operator/introspector ${DOMAIN_HOME}/optconfig/diagnostics 'Sit-Cfg-WLDF--'
105+
if [ ${DOMAIN_SOURCE_TYPE} != "FromModel" ]; then
106+
copySitCfgWhileRunning /weblogic-operator/introspector ${DOMAIN_HOME}/optconfig 'Sit-Cfg-CFG--'
107+
copySitCfgWhileRunning /weblogic-operator/introspector ${DOMAIN_HOME}/optconfig/jms 'Sit-Cfg-JMS--'
108+
copySitCfgWhileRunning /weblogic-operator/introspector ${DOMAIN_HOME}/optconfig/jdbc 'Sit-Cfg-JDBC--'
109+
copySitCfgWhileRunning /weblogic-operator/introspector ${DOMAIN_HOME}/optconfig/diagnostics 'Sit-Cfg-WLDF--'
110+
fi
109111

110112
exit 0

‎operator/src/main/resources/scripts/model-filters.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,9 @@
77
"discover": [
88
],
99
"update": [
10+
{ "name": "update_mii_filter", "path": "/u01/wdt/weblogic-deploy/lib/model_wdt_mii_filter.py" }
11+
],
12+
"validate": [
13+
{ "name": "validate_mii_filter", "path": "/u01/wdt/weblogic-deploy/lib/model_wdt_mii_filter.py" }
1014
]
1115
}

‎operator/src/main/resources/scripts/modelInImage.sh

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ WDT_OUTPUT="/tmp/wdt_output.log"
3737
WDT_BINDIR="${WDT_ROOT}/bin"
3838
WDT_FILTER_JSON="/weblogic-operator/scripts/model-filters.json"
3939
WDT_CREATE_FILTER="/weblogic-operator/scripts/model-wdt-create-filter.py"
40+
WDT_MII_FILTER="/weblogic-operator/scripts/model_wdt_mii_filter.py"
4041
UPDATE_RCUPWD_FLAG=""
4142
WLSDEPLOY_PROPERTIES="${WLSDEPLOY_PROPERTIES} -Djava.security.egd=file:/dev/./urandom"
4243
ARCHIVE_ZIP_CHANGED=0
@@ -319,9 +320,9 @@ function createWLDomain() {
319320
fi
320321

321322
# copy the filter related files to the wdt lib
322-
323-
cp ${WDT_FILTER_JSON} ${WDT_ROOT}/lib/model_filters.json
324-
cp ${WDT_CREATE_FILTER} ${WDT_ROOT}/lib
323+
cp ${WDT_FILTER_JSON} ${WDT_ROOT}/lib/model_filters.json || logSevereAndExit ${WDT_FILTER_JSON}
324+
cp ${WDT_CREATE_FILTER} ${WDT_ROOT}/lib || logSevereAndExit ${WDT_CREATE_FILTER}
325+
cp ${WDT_MII_FILTER} ${WDT_ROOT}/lib || logSevereAndExit ${WDT_MII_FILTER}
325326

326327
# check to see if any model including changed (or first model in image deploy)
327328
# if yes. then run create domain again
@@ -793,8 +794,14 @@ function generateMergedModel() {
793794

794795
export __WLSDEPLOY_STORE_MODEL__="${NEW_MERGED_MODEL}"
795796

796-
${WDT_BINDIR}/validateModel.sh -oracle_home ${ORACLE_HOME} ${model_list} \
797-
${archive_list} ${variable_list} -domain_type ${WDT_DOMAIN_TYPE} > ${WDT_OUTPUT} 2>&1
797+
local wdtArgs=""
798+
wdtArgs+=" -oracle_home ${ORACLE_HOME}"
799+
wdtArgs+=" ${model_list} ${archive_list} ${variable_list}"
800+
wdtArgs+=" -domain_type ${WDT_DOMAIN_TYPE}"
801+
802+
trace "About to call '${WDT_BINDIR}/validateModel.sh ${wdtArgs}'."
803+
804+
${WDT_BINDIR}/validateModel.sh ${wdtArgs} > ${WDT_OUTPUT} 2>&1
798805
ret=$?
799806
if [ $ret -ne 0 ]; then
800807
trace SEVERE "Model in Image: the WDT validate model tool detected an error with the fully merged model:"
@@ -917,8 +924,16 @@ function wdtUpdateModelDomain() {
917924
# make sure wdt create write out the merged model to a file in the root of the domain
918925
export __WLSDEPLOY_STORE_MODEL__=1
919926

920-
${WDT_BINDIR}/updateDomain.sh -oracle_home ${ORACLE_HOME} -domain_home ${DOMAIN_HOME} $model_list \
921-
${archive_list} ${variable_list} -domain_type ${WDT_DOMAIN_TYPE} ${UPDATE_RCUPWD_FLAG} > ${WDT_OUTPUT} 2>&1
927+
local wdtArgs=""
928+
wdtArgs+=" -oracle_home ${ORACLE_HOME}"
929+
wdtArgs+=" -domain_home ${DOMAIN_HOME}"
930+
wdtArgs+=" ${model_list} ${archive_list} ${variable_list}"
931+
wdtArgs+=" -domain_type ${WDT_DOMAIN_TYPE}"
932+
wdtArgs+=" ${UPDATE_RCUPWD_FLAG}"
933+
934+
trace "About to call '${WDT_BINDIR}/updateDomain.sh ${wdtArgs}'."
935+
936+
${WDT_BINDIR}/updateDomain.sh ${wdtArgs} > ${WDT_OUTPUT} 2>&1
922937
ret=$?
923938

924939
if [ $ret -ne 0 ]; then
@@ -1271,3 +1286,8 @@ function stop_trap() {
12711286
function cleanup_mii() {
12721287
rm -f /tmp/*.md5 /tmp/*.gz /tmp/*.ini /tmp/*.json
12731288
}
1289+
1290+
function logSevereAndExit() {
1291+
trace SEVERE "cp '$1' failed"
1292+
exitOrLoop
1293+
}

0 commit comments

Comments
 (0)