Skip to content

Commit 03650b6

Browse files
committed
Backport no longer generating domain validation failure for missing image pull secrets
1 parent 6c976f0 commit 03650b6

File tree

2 files changed

+0
-17
lines changed

2 files changed

+0
-17
lines changed

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import io.kubernetes.client.openapi.models.V1Container;
2424
import io.kubernetes.client.openapi.models.V1ContainerPort;
2525
import io.kubernetes.client.openapi.models.V1EnvVar;
26-
import io.kubernetes.client.openapi.models.V1LocalObjectReference;
2726
import io.kubernetes.client.openapi.models.V1ObjectMeta;
2827
import io.kubernetes.client.openapi.models.V1PodSpec;
2928
import io.kubernetes.client.openapi.models.V1SecretReference;
@@ -1293,9 +1292,6 @@ private void checkReservedIntrospectorVariables(BaseConfiguration configuration,
12931292

12941293
private void addMissingSecrets(KubernetesResourceLookup resourceLookup) {
12951294
verifySecretExists(resourceLookup, getWebLogicCredentialsSecretName(), SecretType.WebLogicCredentials);
1296-
for (V1LocalObjectReference reference : getImagePullSecrets()) {
1297-
verifySecretExists(resourceLookup, reference.getName(), SecretType.ImagePull);
1298-
}
12991295
for (String secretName : getConfigOverrideSecrets()) {
13001296
verifySecretExists(resourceLookup, secretName, SecretType.ConfigOverride);
13011297
}
@@ -1324,10 +1320,6 @@ && getOpssWalletPasswordSecret() == null) {
13241320

13251321
}
13261322

1327-
private List<V1LocalObjectReference> getImagePullSecrets() {
1328-
return spec.getImagePullSecrets();
1329-
}
1330-
13311323
@SuppressWarnings("SameParameterValue")
13321324
private void verifySecretExists(KubernetesResourceLookup resources, String secretName, SecretType type) {
13331325
if (secretName != null && !resources.isSecretExists(secretName, getNamespace())) {

operator/src/test/java/oracle/kubernetes/weblogic/domain/model/DomainValidationTest.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -586,15 +586,6 @@ void whenBadWebLogicCredentialsSecretNamespaceSpecified_reportError() {
586586
contains(stringContainsInOrder("Bad namespace", "badNamespace")));
587587
}
588588

589-
@Test
590-
void whenImagePullSecretSpecifiedButDoesNotExist_reportError() {
591-
configureDomain(domain).withDefaultImagePullSecret(new V1LocalObjectReference().name("no-such-secret"));
592-
593-
assertThat(domain.getValidationFailures(resourceLookup),
594-
contains(stringContainsInOrder("ImagePull", "no-such-secret", "not found", NS)));
595-
596-
}
597-
598589
@Test
599590
void whenImagePullSecretExists_dontReportError() {
600591
resourceLookup.defineResource("a-secret", KubernetesResourceType.Secret, NS);

0 commit comments

Comments
 (0)