Skip to content

Commit d021560

Browse files
committed
Merge branch 'cherry-pick-8a12e0b0' into 'release/4.0'
Backport to 4.0: Removed hard coded disable istio sidecar injection in introspector pod See merge request weblogic-cloud/weblogic-kubernetes-operator!4199
2 parents a954166 + aea5853 commit d021560

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/CommonMiiTestUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1243,7 +1243,7 @@ public static void verifyIntrospectorRuns(String domainUid, String domainNamespa
12431243

12441244
logger.info("Introspector pod log START");
12451245
String introspectorLog = assertDoesNotThrow(() -> getPodLog(introspectorPodName,
1246-
domainNamespace, null, null, null, true), "Could not get introspector pod log");
1246+
domainNamespace, domainUid + "-introspector", null, null, true), "Could not get introspector pod log");
12471247
logger.info(introspectorLog);
12481248
logger.info("Introspector pod log END");
12491249
checkPodDoesNotExist(introspectorPodName, domainUid, domainNamespace);

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,8 +398,6 @@ private V1ObjectMeta createPodTemplateMetadata() {
398398
.putLabelsItem(LabelConstants.CREATEDBYOPERATOR_LABEL, "true")
399399
.putLabelsItem(LabelConstants.DOMAINUID_LABEL, getDomainUid())
400400
.putLabelsItem(LabelConstants.JOBNAME_LABEL, createJobName(getDomainUid()));
401-
// always set it to false
402-
metadata.putAnnotationsItem("sidecar.istio.io/inject", "false");
403401
return metadata;
404402
}
405403

0 commit comments

Comments
 (0)