Skip to content

Commit bec5b54

Browse files
committed
Merge branch 'fix-k8s-api-network-restart-error-main' into 'main'
make similar schema changes for failure reason as 4.2. The domain status... See merge request weblogic-cloud/weblogic-kubernetes-operator!4838
2 parents 069c5ac + 9988be1 commit bec5b54

File tree

4 files changed

+20
-2
lines changed

4 files changed

+20
-2
lines changed

documentation/domains/Domain.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@
238238
"DomainInvalid",
239239
"Introspection",
240240
"Kubernetes",
241+
"KubernetesNetworkException",
241242
"ServerPod",
242243
"PersistentVolumeClaim",
243244
"ReplicasTooHigh",

kubernetes/crd/domain-crd.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apiVersion: apiextensions.k8s.io/v1
55
kind: CustomResourceDefinition
66
metadata:
77
annotations:
8-
weblogic.sha256: e4626e3261b99eff534ce168959340a97dde723c1d087f298f937e5a3bdaad57
8+
weblogic.sha256: f0099ddeeff5ad74913cb7d156f09a2a169240b761245b8ee4a79b87da29d7d6
99
name: domains.weblogic.oracle
1010
spec:
1111
group: weblogic.oracle
@@ -10731,6 +10731,7 @@ spec:
1073110731
- DomainInvalid
1073210732
- Introspection
1073310733
- Kubernetes
10734+
- KubernetesNetworkException
1073410735
- ServerPod
1073510736
- PersistentVolumeClaim
1073610737
- ReplicasTooHigh

operator/src/main/java/oracle/kubernetes/operator/calls/ResponseStep.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import oracle.kubernetes.operator.work.Packet;
2323
import oracle.kubernetes.operator.work.Step;
2424
import oracle.kubernetes.weblogic.domain.model.DomainCondition;
25+
import oracle.kubernetes.weblogic.domain.model.DomainFailureReason;
2526
import oracle.kubernetes.weblogic.domain.model.DomainResource;
2627
import org.apache.commons.lang3.StringUtils;
2728

@@ -43,6 +44,7 @@
4344
import static oracle.kubernetes.operator.calls.RequestStep.accessContinue;
4445
import static oracle.kubernetes.weblogic.domain.model.DomainConditionType.FAILED;
4546
import static oracle.kubernetes.weblogic.domain.model.DomainFailureReason.KUBERNETES;
47+
import static oracle.kubernetes.weblogic.domain.model.DomainFailureReason.KUBERNETES_NETWORK_EXCEPTION;
4648

4749
/**
4850
* Step to receive response of Kubernetes API server call.
@@ -190,7 +192,14 @@ private void addDomainFailureStatus(Packet packet, V1Status status) {
190192

191193
private void updateFailureStatus(
192194
@Nonnull DomainResource domain, V1Status status) {
193-
DomainCondition condition = new DomainCondition(FAILED).withReason(KUBERNETES)
195+
DomainFailureReason reason = KUBERNETES;
196+
if (status != null) {
197+
LOGGER.fine("updateFailureStatus: " + status);
198+
if (Integer.valueOf(HTTP_UNAVAILABLE).equals(status.getCode())) {
199+
reason = KUBERNETES_NETWORK_EXCEPTION;
200+
}
201+
}
202+
DomainCondition condition = new DomainCondition(FAILED).withReason(reason)
194203
.withMessage(status.toString());
195204
addFailureStatus(domain, condition);
196205
}

operator/src/main/java/oracle/kubernetes/weblogic/domain/model/DomainFailureReason.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,13 @@ public String getEventError() {
7373
return KUBERNETES_EVENT_ERROR;
7474
}
7575
},
76+
@SerializedName("KubernetesNetworkException")
77+
KUBERNETES_NETWORK_EXCEPTION("KubernetesNetworkException") {
78+
@Override
79+
public String getEventError() {
80+
return KUBERNETES_EVENT_ERROR;
81+
}
82+
},
7683
@SerializedName("ServerPod")
7784
SERVER_POD("ServerPod") {
7885
@Override

0 commit comments

Comments
 (0)