Skip to content

Commit 7c69e22

Browse files
rjeberhardrjeberhard
committed
More corrections
1 parent 0bd89a3 commit 7c69e22

File tree

8 files changed

+3
-190
lines changed

8 files changed

+3
-190
lines changed

‎operator/src/main/java/oracle/kubernetes/operator/ProcessingConstants.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,5 @@ public interface ProcessingConstants {
2929
public static final String DOMAIN_INTROSPECTOR_LOG_RESULT = "domainIntrospectorLogResult";
3030
public static final String SIT_CONFIG_MAP = "sitConfigMap";
3131
public static final String DOMAIN_RESTART_VERSION = "weblogic.domainRestartVersion";
32-
public static final String DOMAIN_INPUTS_HASH = "weblogic.domainInputsHash";
3332
public static final String REMAINING_SERVERS_HEALTH_TO_READ = "serverHealthRead";
3433
}

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -93,16 +93,10 @@ public static Step readExistingSituConfigMap(String ns, String domainUid) {
9393

9494
static Map<String, String> parseIntrospectorResult(String text, String domainUid) {
9595
Map<String, String> map = new HashMap<>();
96-
String token = ">>> updatedomainResult=";
9796

9897
try (BufferedReader reader = new BufferedReader(new StringReader(text))) {
9998
String line = reader.readLine();
10099
while (line != null) {
101-
if (line.contains(token)) {
102-
int index = line.indexOf(token);
103-
int beg = index + 1 + token.length();
104-
map.put("UPDATEDOMAINRESULT", line.substring(beg - 1));
105-
}
106100
if (line.startsWith(">>>") && !line.endsWith("EOF")) {
107101
String filename = extractFilename(line);
108102
readFile(reader, filename, map, domainUid);
@@ -372,8 +366,6 @@ public NextAction apply(Packet packet) {
372366
LOGGER.fine(data.toString());
373367
LOGGER.fine("================");
374368
String topologyYaml = data.get("topology.yaml");
375-
String miiModelSecretsHash = data.get("secrets.md5");
376-
String miiDomainZipHash = data.get("domainzip_hash");
377369
if (topologyYaml != null) {
378370
LOGGER.fine("topology.yaml: " + topologyYaml);
379371
DomainTopology domainTopology = parseDomainTopologyYaml(topologyYaml);
@@ -600,28 +592,19 @@ public NextAction onSuccess(Packet packet, CallResponse<V1ConfigMap> callRespons
600592
if (result != null) {
601593
Map<String, String> data = result.getData();
602594
final String topologyYaml = data.get("topology.yaml");
603-
final String miiModelSecretsHash = data.get("secrets.md5");
604-
final String miiDomainZipHash = data.get("domainzip_hash");
605595
final String domainRestartVersion = data.get(ProcessingConstants.DOMAIN_RESTART_VERSION);
606-
final String modelInImageSpecHash = data.get(ProcessingConstants.DOMAIN_INPUTS_HASH);
607596

608597
LOGGER.finest("ReadSituConfigMapStep.onSuccess restart version (from ino spec) "
609598
+ info.getDomain().getRestartVersion());
610599
LOGGER.finest("ReadSituConfigMapStep.onSuccess restart version from cm result "
611600
+ domainRestartVersion);
612-
LOGGER.finest("ReadSituConfigMapStep.onSuccess image spec hash from cm result "
613-
+ modelInImageSpecHash);
614601

615602
if (topologyYaml != null) {
616603

617604
if (domainRestartVersion != null) {
618605
packet.put(ProcessingConstants.DOMAIN_RESTART_VERSION, domainRestartVersion);
619606
}
620607

621-
if (modelInImageSpecHash != null) {
622-
packet.put(ProcessingConstants.DOMAIN_INPUTS_HASH, modelInImageSpecHash);
623-
}
624-
625608
ConfigMapHelper.DomainTopology domainTopology =
626609
ConfigMapHelper.parseDomainTopologyYaml(topologyYaml);
627610
if (domainTopology != null) {

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

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -66,41 +66,13 @@ private static boolean runIntrospector(Packet packet, DomainPresenceInfo info) {
6666
LOGGER.fine("runIntrospector topology: " + topology);
6767
LOGGER.fine("runningServersCount: " + runningServersCount(info));
6868
LOGGER.fine("creatingServers: " + creatingServers(info));
69-
return topology == null || isBringingUpNewDomain(info) || isModelInImageUpdate(packet, info);
69+
return topology == null || isBringingUpNewDomain(info);
7070
}
7171

7272
private static boolean isBringingUpNewDomain(DomainPresenceInfo info) {
7373
return runningServersCount(info) == 0 && creatingServers(info);
7474
}
7575

76-
private static boolean isModelInImageUpdate(Packet packet, DomainPresenceInfo info) {
77-
if (info.getDomain().getDomainHomeSourceType().equals("FromModel")) {
78-
79-
final String currentPodRestartVersion = info.getDomain().getRestartVersion();
80-
final String configMapRestartVersion = (String) packet.get(ProcessingConstants.DOMAIN_RESTART_VERSION);
81-
final String configMapSpecHash = (String) packet.get(ProcessingConstants.DOMAIN_INPUTS_HASH);
82-
83-
LOGGER.finest("JobHelper.isModelInImageUpdate currentPodRestartVersion " + currentPodRestartVersion);
84-
LOGGER.finest("JobHelper.isModelInImageUpdate configMapRestartVersion " + configMapRestartVersion);
85-
86-
// If either one is set, check for differences and decide to run intropsect job
87-
88-
if (currentPodRestartVersion != null
89-
&& !currentPodRestartVersion.equals(configMapRestartVersion)) {
90-
LOGGER.fine("JobHelper: currentPodRestartVersion version different from configmap");
91-
return true;
92-
}
93-
94-
if (configMapRestartVersion != null
95-
&& !configMapRestartVersion.equals(currentPodRestartVersion)) {
96-
LOGGER.fine("JobHelper: configMapRestartVersion version different from configmap");
97-
return true;
98-
}
99-
100-
}
101-
return false;
102-
}
103-
10476
private static int runningServersCount(DomainPresenceInfo info) {
10577
return ManagedServersUpStep.getRunningServers(info).size();
10678
}

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

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -243,11 +243,7 @@ protected V1PodSpec createPodSpec(TuningParameters tuningParameters) {
243243
.serviceAccountName(info.getDomain().getSpec().getServiceAccountName())
244244
.addVolumesItem(new V1Volume().name(SECRETS_VOLUME).secret(getSecretsVolume()))
245245
.addVolumesItem(
246-
new V1Volume().name(SCRIPTS_VOLUME).configMap(getConfigMapVolumeSource()))
247-
.addVolumesItem(
248-
new V1Volume()
249-
.name("mii" + KubernetesConstants.INTROSPECTOR_CONFIG_MAP_NAME_SUFFIX)
250-
.configMap(getIntrospectMD5VolumeSource()));
246+
new V1Volume().name(SCRIPTS_VOLUME).configMap(getConfigMapVolumeSource()));
251247

252248
podSpec.setImagePullSecrets(info.getDomain().getSpec().getImagePullSecrets());
253249

@@ -274,12 +270,7 @@ protected V1PodSpec createPodSpec(TuningParameters tuningParameters) {
274270
protected V1Container createContainer(TuningParameters tuningParameters) {
275271
V1Container container = super.createContainer(tuningParameters)
276272
.addVolumeMountsItem(readOnlyVolumeMount(SECRETS_VOLUME, SECRETS_MOUNT_PATH))
277-
.addVolumeMountsItem(readOnlyVolumeMount(SCRIPTS_VOLUME, SCRIPTS_MOUNTS_PATH))
278-
.addVolumeMountsItem(
279-
volumeMount(
280-
"mii" + KubernetesConstants.INTROSPECTOR_CONFIG_MAP_NAME_SUFFIX,
281-
"/weblogic-operator/introspectormii")
282-
.readOnly(false));
273+
.addVolumeMountsItem(readOnlyVolumeMount(SCRIPTS_VOLUME, SCRIPTS_MOUNTS_PATH));
283274

284275
for (V1VolumeMount additionalVolumeMount : getAdditionalVolumeMounts()) {
285276
container.addVolumeMountsItem(additionalVolumeMount);
@@ -330,15 +321,6 @@ private V1ConfigMapVolumeSource getConfigMapVolumeSource() {
330321
.defaultMode(ALL_READ_AND_EXECUTE);
331322
}
332323

333-
protected V1ConfigMapVolumeSource getIntrospectMD5VolumeSource() {
334-
V1ConfigMapVolumeSource result =
335-
new V1ConfigMapVolumeSource()
336-
.name(getDomainUid() + KubernetesConstants.INTROSPECTOR_CONFIG_MAP_NAME_SUFFIX)
337-
.defaultMode(ALL_READ_AND_EXECUTE);
338-
result.setOptional(true);
339-
return result;
340-
}
341-
342324
private V1SecretVolumeSource getOverrideSecretVolumeSource(String name) {
343325
return new V1SecretVolumeSource().secretName(name).defaultMode(420);
344326
}
@@ -375,12 +357,4 @@ public NextAction onSuccess(Packet packet, CallResponse<V1Job> callResponse) {
375357
return doNext(packet);
376358
}
377359
}
378-
379-
protected V1ConfigMapVolumeSource getWdtConfigMapVolumeSource(String name) {
380-
return new V1ConfigMapVolumeSource().name(name).defaultMode(ALL_READ_AND_EXECUTE);
381-
}
382-
383-
protected V1ConfigMapVolumeSource getOpssKeyWalletVolumeSource(String name) {
384-
return new V1ConfigMapVolumeSource().name(name).defaultMode(ALL_READ_AND_EXECUTE);
385-
}
386360
}

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import static oracle.kubernetes.operator.helpers.StepContextConstants.SCRIPTS_MOUNTS_PATH;
2020
import static oracle.kubernetes.operator.helpers.StepContextConstants.SCRIPTS_VOLUME;
2121
import static oracle.kubernetes.operator.helpers.StepContextConstants.SIT_CONFIG_MAP_VOLUME;
22-
import static oracle.kubernetes.operator.helpers.StepContextConstants.WDT_CONFIG_MAP_VOLUME;
2322

2423
class PodDefaults {
2524
static final String K8S_SERVICE_ACCOUNT_MOUNT_PATH =
@@ -62,14 +61,6 @@ private static String getConfigMapName(String domainUid) {
6261
return domainUid + INTROSPECTOR_CONFIG_MAP_NAME_SUFFIX;
6362
}
6463

65-
private static V1Volume createWdtConfigMapVolume(String domainUid) {
66-
return createVolume(getWdtConfigMapVolumeName(domainUid), getConfigMapName(domainUid));
67-
}
68-
69-
private static String getWdtConfigMapVolumeName(String domainUid) {
70-
return WDT_CONFIG_MAP_VOLUME;
71-
}
72-
7364
static List<V1VolumeMount> getStandardVolumeMounts(String domainUid) {
7465
List<V1VolumeMount> mounts = new ArrayList<>();
7566
mounts.add(createScriptsVolumeMount());
@@ -90,10 +81,6 @@ private static V1VolumeMount createSitConfigVolumeMount(String domainUid) {
9081
return volumeMount(getSitConfigMapVolumeName(domainUid), "/weblogic-operator/introspector");
9182
}
9283

93-
private static V1VolumeMount createWdtConfigVolumeMount(String domainUid) {
94-
return volumeMount(getWdtConfigMapVolumeName(domainUid), "/weblogic-operator/introspector");
95-
}
96-
9784
private static V1VolumeMount readOnlyVolumeMount(String volumeName, String mountPath) {
9885
return volumeMount(volumeName, mountPath).readOnly(true);
9986
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,12 @@ public abstract class PodStepContext extends BasePodStepContext {
7474
private final Step conflictStep;
7575
private V1Pod podModel;
7676
private String domainRestartVersion;
77-
private String domainImageName;
7877

7978
PodStepContext(Step conflictStep, Packet packet) {
8079
this.conflictStep = conflictStep;
8180
info = packet.getSpi(DomainPresenceInfo.class);
8281
domainTopology = (WlsDomainConfig) packet.get(ProcessingConstants.DOMAIN_TOPOLOGY);
8382
domainRestartVersion = (String)packet.get(ProcessingConstants.DOMAIN_RESTART_VERSION);
84-
domainImageName = (String)packet.get(ProcessingConstants.DOMAIN_INPUTS_HASH);
8583
scan = (WlsServerConfig) packet.get(ProcessingConstants.SERVER_SCAN);
8684
}
8785

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ public interface StepContextConstants {
99
static final String SCRIPTS_VOLUME = "weblogic-domain-cm-volume";
1010
static final String DEBUG_CM_VOLUME = "weblogic-domain-debug-cm-volume";
1111
static final String SIT_CONFIG_MAP_VOLUME = "weblogic-domain-introspect-cm-volume";
12-
static final String WDT_CONFIG_MAP_VOLUME = "weblogic-domain-introspect-wdt-cm-volume";
13-
static final String STORAGE_VOLUME = "weblogic-domain-storage-volume";
1412
static final String SECRETS_MOUNT_PATH = "/weblogic-operator/secrets";
1513
static final String SCRIPTS_MOUNTS_PATH = "/weblogic-operator/scripts";
1614
static final String OVERRIDE_SECRETS_MOUNT_PATH = "/weblogic-operator/config-overrides-secrets";

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

Lines changed: 0 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@ traceTiming "POD '${SERVICE_NAME}' MAIN START"
1616

1717
trace "Starting WebLogic Server '${SERVER_NAME}'."
1818

19-
source ${SCRIPTPATH}/modelInImage.sh
20-
21-
if [ $? -ne 0 ]; then
22-
trace SEVERE "Error sourcing modelInImage.sh" && exit 1
23-
fi
24-
2519
exportInstallHomes
2620

2721
#
@@ -147,103 +141,11 @@ function copySitCfg() {
147141
fi
148142
}
149143

150-
# prepare mii server
151-
152-
function prepareMIIServer() {
153-
154-
trace "Model-in-Image: Creating domain home."
155-
156-
# primordial domain contain the basic structures, security and other fmwconfig templated info
157-
# domainzip only contains the domain configuration (config.xml jdbc/ jms/)
158-
# Both are needed for the complete domain reconstruction
159-
160-
if [ ! -f /weblogic-operator/introspector/primordial_domainzip.secure ] ; then
161-
trace SEVERE "Domain Source Type is FromModel, the primordial model archive is missing, cannot start server"
162-
return 1
163-
fi
164-
165-
if [ ! -f /weblogic-operator/introspector/domainzip.secure ] ; then
166-
trace SEVERE "Domain type is FromModel, the domain configuration archive is missing, cannot start server"
167-
return 1
168-
fi
169-
170-
trace "Model-in-Image: Restoring primordial domain"
171-
cd / || return 1
172-
base64 -d /weblogic-operator/introspector/primordial_domainzip.secure > /tmp/domain.tar.gz || return 1
173-
tar -xzf /tmp/domain.tar.gz || return 1
174-
175-
trace "Model-in-Image: Restore domain secret"
176-
# decrypt the SerializedSystemIni first
177-
if [ -f ${RUNTIME_ENCRYPTION_SECRET_PASSWORD} ] ; then
178-
MII_PASSPHRASE=$(cat ${RUNTIME_ENCRYPTION_SECRET_PASSWORD})
179-
else
180-
trace SEVERE "Domain Source Type is 'FromModel' which requires specifying a runtimeEncryptionSecret " \
181-
"in your domain resource and deploying this secret with a 'password' key, but the secret does not have this key."
182-
return 1
183-
fi
184-
encrypt_decrypt_domain_secret "decrypt" ${DOMAIN_HOME} ${MII_PASSPHRASE}
185-
186-
# restore the config zip
187-
#
188-
trace "Model-in-Image: Restore domain config"
189-
cd / || return 1
190-
base64 -d /weblogic-operator/introspector/domainzip.secure > /tmp/domain.tar.gz || return 1
191-
tar -xzf /tmp/domain.tar.gz || return 1
192-
chmod +x ${DOMAIN_HOME}/bin/*.sh ${DOMAIN_HOME}/*.sh || return 1
193-
194-
# restore the archive apps and libraries
195-
#
196-
trace "Model-in-Image: Restoring apps and libraries"
197-
198-
mkdir -p ${DOMAIN_HOME}/lib
199-
if [ $? -ne 0 ] ; then
200-
trace SEVERE "Domain Source Type is FromModel, cannot create ${DOMAIN_HOME}/lib "
201-
return 1
202-
fi
203-
204-
for file in $(sort_files ${IMG_ARCHIVES_ROOTDIR} "*.zip")
205-
do
206-
# expand the archive domain libraries to the domain lib
207-
cd ${DOMAIN_HOME}/lib || return 1
208-
${JAVA_HOME}/bin/jar xf ${IMG_ARCHIVES_ROOTDIR}/${file} wlsdeploy/domainLibraries/
209-
210-
if [ $? -ne 0 ] ; then
211-
trace SEVERE "Domain Source Type is FromModel, error in extracting domain libs ${IMG_ARCHIVES_ROOTDIR}/${file}"
212-
return 1
213-
fi
214-
215-
# expand the archive apps and shared lib to the wlsdeploy/* directories
216-
# the config.xml is referencing them from that path
217-
218-
cd ${DOMAIN_HOME} || return 1
219-
${JAVA_HOME}/bin/jar xf ${IMG_ARCHIVES_ROOTDIR}/${file} wlsdeploy/
220-
221-
if [ $? -ne 0 ] ; then
222-
trace SEVERE "Domain Source Type is FromModel, error in extracting application archive ${IMG_ARCHIVES_ROOTDIR}/${file}"
223-
return 1
224-
fi
225-
done
226-
return 0
227-
}
228-
229144
# trace env vars and dirs before export.*Home calls
230145

231146
traceEnv before
232147
traceDirs before
233148

234-
traceTiming "POD '${SERVICE_NAME}' MII UNZIP START"
235-
236-
if [ -f /weblogic-operator/introspector/domainzip.secure ]; then
237-
prepareMIIServer
238-
if [ $? -ne 0 ] ; then
239-
trace SEVERE "Domain Source Type is FromModel, unable to start the server, check other error messages in the log"
240-
exitOrLoop
241-
fi
242-
243-
fi
244-
245-
traceTiming "POD '${SERVICE_NAME}' MII UNZIP COMPLETE"
246-
247149
#
248150
# Configure startup mode
249151
#

0 commit comments

Comments
 (0)