Skip to content

Commit e5578dd

Browse files
rjeberhardrjeberhard
committed
Updated probes and config map
1 parent 618794c commit e5578dd

File tree

3 files changed

+53
-15
lines changed

3 files changed

+53
-15
lines changed

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

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ public NextAction apply(Packet packet) {
6767
"# the pod should be restarted. The script checks a WebLogic Server state file which\n" +
6868
"# is updated by the node manager.\n" +
6969
"STATEFILE=/shared/domain/$1/servers/$2/data/nodemanager/$2.state\n" +
70-
"if [ \\`jps -l | grep -c \" weblogic.NodeManager\"\\` -eq 0 ]; then\n" +
70+
"if [ `jps -l | grep -c \" weblogic.NodeManager\"` -eq 0 ]; then\n" +
7171
" exit 1\n" +
7272
"fi\n" +
73-
"if [ -f \\${STATEFILE} ] && [ \\`grep -c \"FAILED_NOT_RESTARTABLE\" \\${STATEFILE}\\` -eq 1 ]; then\n" +
73+
"if [ -f ${STATEFILE} ] && [ `grep -c \"FAILED_NOT_RESTARTABLE\" ${STATEFILE}` -eq 1 ]; then\n" +
7474
" exit 1\n" +
7575
"fi\n" +
7676
"exit 0");
@@ -84,11 +84,11 @@ public NextAction apply(Packet packet) {
8484
"\n" +
8585
"STATEFILE=/shared/domain/$1/servers/$2/data/nodemanager/$2.state\n" +
8686
"\n" +
87-
"if [ \\`jps -l | grep -c \" weblogic.NodeManager\"\\` -eq 0 ]; then\n" +
87+
"if [ `jps -l | grep -c \" weblogic.NodeManager\"` -eq 0 ]; then\n" +
8888
" exit 1\n" +
8989
"fi\n" +
9090
"\n" +
91-
"if [ -f \\${STATEFILE} ] && [ \\`grep -c \"RUNNING\" \\${STATEFILE}\\` -ne 1 ]; then\n" +
91+
"if [ ! -f ${STATEFILE} ] || [ `grep -c \"RUNNING\" ${STATEFILE}` -ne 1 ]; then\n" +
9292
" exit 1\n" +
9393
"fi\n" +
9494
"\n" +
@@ -111,6 +111,12 @@ public NextAction onSuccess(Packet packet, V1ConfigMap result, int statusCode,
111111
Map<String, List<String>> responseHeaders) {
112112
if (result == null) {
113113
Step create = CallBuilder.create().createConfigMapAsync(namespace, cm, new ResponseStep<V1ConfigMap>(next) {
114+
@Override
115+
public NextAction onFailure(Packet packet, ApiException e, int statusCode,
116+
Map<String, List<String>> responseHeaders) {
117+
return super.onFailure(ScriptConfigMapStep.this, packet, e, statusCode, responseHeaders);
118+
}
119+
114120
@Override
115121
public NextAction onSuccess(Packet packet, V1ConfigMap result, int statusCode,
116122
Map<String, List<String>> responseHeaders) {
@@ -130,6 +136,12 @@ public NextAction onSuccess(Packet packet, V1ConfigMap result, int statusCode,
130136
updated.putAll(data);
131137
cm.setData(updated);
132138
Step replace = CallBuilder.create().replaceConfigMapAsync(name, namespace, cm, new ResponseStep<V1ConfigMap>(next) {
139+
@Override
140+
public NextAction onFailure(Packet packet, ApiException e, int statusCode,
141+
Map<String, List<String>> responseHeaders) {
142+
return super.onFailure(ScriptConfigMapStep.this, packet, e, statusCode, responseHeaders);
143+
}
144+
133145
@Override
134146
public NextAction onSuccess(Packet packet, V1ConfigMap result, int statusCode,
135147
Map<String, List<String>> responseHeaders) {

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

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ public NextAction apply(Packet packet) {
223223
volumeDomainConfigMap.setName("scripts");
224224
V1ConfigMapVolumeSource cm = new V1ConfigMapVolumeSource();
225225
cm.setName(KubernetesConstants.DOMAIN_CONFIG_MAP_NAME);
226-
cm.setDefaultMode(555); // read and execute
226+
cm.setDefaultMode(0555); // read and execute
227227
volumeDomainConfigMap.setConfigMap(cm);
228228
podSpec.addVolumesItem(volumeDomainConfigMap);
229229

@@ -249,6 +249,12 @@ public NextAction onSuccess(Packet packet, V1Pod result, int statusCode,
249249
Map<String, List<String>> responseHeaders) {
250250
if (result == null) {
251251
Step create = CallBuilder.create().createPodAsync(namespace, adminPod, new ResponseStep<V1Pod>(next) {
252+
@Override
253+
public NextAction onFailure(Packet packet, ApiException e, int statusCode,
254+
Map<String, List<String>> responseHeaders) {
255+
return super.onFailure(AdminPodStep.this, packet, e, statusCode, responseHeaders);
256+
}
257+
252258
@Override
253259
public NextAction onSuccess(Packet packet, V1Pod result, int statusCode,
254260
Map<String, List<String>> responseHeaders) {
@@ -269,6 +275,7 @@ public NextAction onSuccess(Packet packet, V1Pod result, int statusCode,
269275
} else {
270276
// we need to update the Pod
271277
Step replace = new CyclePodStep(
278+
AdminPodStep.this,
272279
podName, namespace, adminPod, MessageKeys.ADMIN_POD_REPLACED,
273280
weblogicDomainUID, spec.getAsName(), sko, next);
274281
return doNext(replace, packet);
@@ -281,6 +288,7 @@ public NextAction onSuccess(Packet packet, V1Pod result, int statusCode,
281288
}
282289

283290
private static class CyclePodStep extends Step {
291+
private final Step conflictStep;
284292
private final String podName;
285293
private final String namespace;
286294
private final V1Pod newPod;
@@ -289,8 +297,9 @@ private static class CyclePodStep extends Step {
289297
private final String serverName;
290298
private final ServerKubernetesObjects sko;
291299

292-
public CyclePodStep(String podName, String namespace, V1Pod newPod, String messageKey, String weblogicDomainUID, String serverName, ServerKubernetesObjects sko, Step next) {
300+
public CyclePodStep(Step conflictStep, String podName, String namespace, V1Pod newPod, String messageKey, String weblogicDomainUID, String serverName, ServerKubernetesObjects sko, Step next) {
293301
super(next);
302+
this.conflictStep = conflictStep;
294303
this.podName = podName;
295304
this.namespace = namespace;
296305
this.newPod = newPod;
@@ -312,13 +321,19 @@ public NextAction onFailure(Packet packet, ApiException e, int statusCode,
312321
if (statusCode == CallBuilder.NOT_FOUND) {
313322
return onSuccess(packet, null, statusCode, responseHeaders);
314323
}
315-
return super.onFailure(packet, e, statusCode, responseHeaders);
324+
return super.onFailure(conflictStep, packet, e, statusCode, responseHeaders);
316325
}
317326

318327
@Override
319328
public NextAction onSuccess(Packet packet, V1Status result, int statusCode,
320329
Map<String, List<String>> responseHeaders) {
321330
Step create = CallBuilder.create().createPodAsync(namespace, newPod, new ResponseStep<V1Pod>(next) {
331+
@Override
332+
public NextAction onFailure(Packet packet, ApiException e, int statusCode,
333+
Map<String, List<String>> responseHeaders) {
334+
return super.onFailure(conflictStep, packet, e, statusCode, responseHeaders);
335+
}
336+
322337
@Override
323338
public NextAction onSuccess(Packet packet, V1Pod result, int statusCode,
324339
Map<String, List<String>> responseHeaders) {
@@ -573,7 +588,7 @@ public NextAction apply(Packet packet) {
573588
volumeDomainConfigMap.setName("scripts");
574589
V1ConfigMapVolumeSource cm = new V1ConfigMapVolumeSource();
575590
cm.setName(KubernetesConstants.DOMAIN_CONFIG_MAP_NAME);
576-
cm.setDefaultMode(555); // read and execute
591+
cm.setDefaultMode(0555); // read and execute
577592
volumeDomainConfigMap.setConfigMap(cm);
578593
podSpec.addVolumesItem(volumeDomainConfigMap);
579594

@@ -609,6 +624,12 @@ public NextAction onSuccess(Packet packet, V1Pod result, int statusCode,
609624
Map<String, List<String>> responseHeaders) {
610625
if (result == null) {
611626
Step create = CallBuilder.create().createPodAsync(namespace, pod, new ResponseStep<V1Pod>(next) {
627+
@Override
628+
public NextAction onFailure(Packet packet, ApiException e, int statusCode,
629+
Map<String, List<String>> responseHeaders) {
630+
return super.onFailure(ManagedPodStep.this, packet, e, statusCode, responseHeaders);
631+
}
632+
612633
@Override
613634
public NextAction onSuccess(Packet packet, V1Pod result, int statusCode,
614635
Map<String, List<String>> responseHeaders) {
@@ -630,6 +651,7 @@ public NextAction onSuccess(Packet packet, V1Pod result, int statusCode,
630651
// we need to update the Pod
631652
// defer to Pod rolling step
632653
Step replace = new CyclePodStep(
654+
ManagedPodStep.this,
633655
podName, namespace, pod, MessageKeys.MANAGED_POD_REPLACED,
634656
weblogicDomainUID, weblogicServerName, sko, next);
635657
synchronized (packet) {

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public NextAction apply(Packet packet) {
7373
labels.put(LabelConstants.DOMAINUID_LABEL, weblogicDomainUID);
7474
labels.put(LabelConstants.DOMAINNAME_LABEL, weblogicDomainName);
7575
labels.put(LabelConstants.SERVERNAME_LABEL, serverName);
76-
labels.put(LabelConstants.CREATEDBYOPERATOR_LABEL, "");
76+
labels.put(LabelConstants.CREATEDBYOPERATOR_LABEL, "true");
7777
metadata.setLabels(labels);
7878
service.setMetadata(metadata);
7979

@@ -148,6 +148,7 @@ public NextAction onSuccess(Packet packet, V1Service result, int statusCode,
148148
} else {
149149
// we need to update the Service
150150
Step replace = new CycleServiceStep(
151+
ForServerStep.this,
151152
name, namespace, service,
152153
serverName.equals(spec.getAsName()) ? MessageKeys.ADMIN_SERVICE_REPLACED : MessageKeys.MANAGED_SERVICE_REPLACED,
153154
weblogicDomainUID, serverName, sko, next);
@@ -264,7 +265,7 @@ public NextAction onSuccess(Packet packet, V1Service result, int statusCode,
264265
} else {
265266
// we need to cycle the Service
266267
info.getClusters().remove(clusterName);
267-
Step delete = CallBuilder.create().deleteServiceAsync(namespace, name, new ResponseStep<V1Status>(next) {
268+
Step delete = CallBuilder.create().deleteServiceAsync(name, namespace, new ResponseStep<V1Status>(next) {
268269
@Override
269270
public NextAction onFailure(Packet packet, ApiException e, int statusCode,
270271
Map<String, List<String>> responseHeaders) {
@@ -346,6 +347,7 @@ private static boolean validateCurrentService(V1Service build, V1Service current
346347
}
347348

348349
private static class CycleServiceStep extends Step {
350+
private final Step conflictStep;
349351
private final String serviceName;
350352
private final String namespace;
351353
private final V1Service newService;
@@ -355,12 +357,13 @@ private static class CycleServiceStep extends Step {
355357
private final ServerKubernetesObjects sko;
356358
private final String channelName;
357359

358-
public CycleServiceStep(String serviceName, String namespace, V1Service newService, String messageKey, String weblogicDomainUID, String serverName, ServerKubernetesObjects sko, Step next) {
359-
this(serviceName, namespace, newService, messageKey, weblogicDomainUID, serverName, sko, null, next);
360+
public CycleServiceStep(Step conflictStep, String serviceName, String namespace, V1Service newService, String messageKey, String weblogicDomainUID, String serverName, ServerKubernetesObjects sko, Step next) {
361+
this(conflictStep, serviceName, namespace, newService, messageKey, weblogicDomainUID, serverName, sko, null, next);
360362
}
361363

362-
public CycleServiceStep(String serviceName, String namespace, V1Service newService, String messageKey, String weblogicDomainUID, String serverName, ServerKubernetesObjects sko, String channelName, Step next) {
364+
public CycleServiceStep(Step conflictStep, String serviceName, String namespace, V1Service newService, String messageKey, String weblogicDomainUID, String serverName, ServerKubernetesObjects sko, String channelName, Step next) {
363365
super(next);
366+
this.conflictStep = conflictStep;
364367
this.serviceName = serviceName;
365368
this.namespace = namespace;
366369
this.newService = newService;
@@ -385,7 +388,7 @@ public NextAction onFailure(Packet packet, ApiException e, int statusCode,
385388
if (statusCode == CallBuilder.NOT_FOUND) {
386389
return onSuccess(packet, null, statusCode, responseHeaders);
387390
}
388-
return super.onFailure(CycleServiceStep.this, packet, e, statusCode, responseHeaders);
391+
return super.onFailure(conflictStep, packet, e, statusCode, responseHeaders);
389392
}
390393

391394
@Override
@@ -395,7 +398,7 @@ public NextAction onSuccess(Packet packet, V1Status result, int statusCode,
395398
@Override
396399
public NextAction onFailure(Packet packet, ApiException e, int statusCode,
397400
Map<String, List<String>> responseHeaders) {
398-
return super.onFailure(CycleServiceStep.this, packet, e, statusCode, responseHeaders);
401+
return super.onFailure(conflictStep, packet, e, statusCode, responseHeaders);
399402
}
400403

401404
@Override
@@ -531,6 +534,7 @@ public NextAction onSuccess(Packet packet, V1Service result, int statusCode,
531534
} else {
532535
// we need to update the Service
533536
Step replace = new CycleServiceStep(
537+
ForExternalChannelStep.this,
534538
name, namespace, service,
535539
serverName.equals(spec.getAsName()) ? MessageKeys.ADMIN_SERVICE_REPLACED : MessageKeys.MANAGED_SERVICE_REPLACED,
536540
weblogicDomainUID, serverName, sko, networkAccessPoint.getName(), next);

0 commit comments

Comments
 (0)