Skip to content

Commit f7e4556

Browse files
rjeberhardrjeberhard
committed
Review comments
1 parent 29cedf5 commit f7e4556

File tree

4 files changed

+4
-58
lines changed

4 files changed

+4
-58
lines changed

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

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import oracle.kubernetes.operator.logging.LoggingFacade;
2323
import oracle.kubernetes.operator.logging.LoggingFactory;
2424
import oracle.kubernetes.operator.logging.MessageKeys;
25+
import oracle.kubernetes.operator.steps.DefaultResponseStep;
2526
import oracle.kubernetes.operator.wlsconfig.WlsClusterConfig;
2627
import oracle.kubernetes.operator.wlsconfig.WlsDomainConfig;
2728
import oracle.kubernetes.operator.wlsconfig.WlsServerConfig;
@@ -682,19 +683,7 @@ private static Step getRereadDomainConflictStep(
682683
.readDomainAsync(
683684
meta.getName(),
684685
meta.getNamespace(),
685-
new ResponseStep<Domain>(next) {
686-
@Override
687-
public NextAction onFailure(
688-
Packet packet,
689-
ApiException e,
690-
int statusCode,
691-
Map<String, List<String>> responseHeaders) {
692-
if (statusCode == CallBuilder.NOT_FOUND) {
693-
return doNext(packet);
694-
}
695-
return super.onFailure(packet, e, statusCode, responseHeaders);
696-
}
697-
686+
new DefaultResponseStep<Domain>(next) {
698687
@Override
699688
public NextAction onSuccess(
700689
Packet packet,

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

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import static com.google.common.base.Strings.isNullOrEmpty;
88
import static oracle.kubernetes.operator.LabelConstants.forDomainUid;
99

10-
import io.kubernetes.client.ApiException;
1110
import io.kubernetes.client.models.V1ConfigMapVolumeSource;
1211
import io.kubernetes.client.models.V1Container;
1312
import io.kubernetes.client.models.V1ContainerPort;
@@ -532,19 +531,7 @@ public NextAction apply(Packet packet) {
532531
new CallBuilder()
533532
.withLabelSelectors(forDomainUid(domainUID))
534533
.listPersistentVolumeAsync(
535-
new ResponseStep<V1PersistentVolumeList>(getNext()) {
536-
@Override
537-
public NextAction onFailure(
538-
Packet packet,
539-
ApiException e,
540-
int statusCode,
541-
Map<String, List<String>> responseHeaders) {
542-
if (statusCode == CallBuilder.NOT_FOUND) {
543-
return onSuccess(packet, null, statusCode, responseHeaders);
544-
}
545-
return super.onFailure(packet, e, statusCode, responseHeaders);
546-
}
547-
534+
new DefaultResponseStep<V1PersistentVolumeList>(getNext()) {
548535
@Override
549536
public NextAction onSuccess(
550537
Packet packet,

‎operator/src/test/java/oracle/kubernetes/operator/helpers/AdminPodHelperTest.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ private void verifyAdminPodReplacedWhen(PodMutator mutator) {
7777
V1Pod existingPod = createPodModel();
7878
mutator.mutate(existingPod);
7979
initializeExistingPod(existingPod);
80-
expectListPersistentVolume().returning(createPersistentVolumeList());
8180
expectDeletePod(getPodName()).returning(new V1Status());
8281
expectCreatePod(podWithName(getPodName())).returning(createPodModel());
8382

@@ -102,7 +101,6 @@ public void whenDeleteReportsNotFound_replaceAdminPod() {
102101
(pod, next) -> terminalStep);
103102

104103
initializeExistingPod(getIncompatiblePod());
105-
expectListPersistentVolume().returning(createPersistentVolumeList());
106104
expectDeletePod(getPodName()).failingWithStatus(CallBuilder.NOT_FOUND);
107105
expectCreatePod(podWithName(getPodName())).returning(createPodModel());
108106

@@ -121,7 +119,6 @@ private V1Pod getIncompatiblePod() {
121119
public void whenAdminPodDeletionFails_retryOnFailure() {
122120
testSupport.addRetryStrategy(retryStrategy);
123121
initializeExistingPod(getIncompatiblePod());
124-
expectListPersistentVolume().returning(createPersistentVolumeList());
125122
expectDeletePod(getPodName()).failingWithStatus(401);
126123
expectStepsAfterCreation();
127124

@@ -136,7 +133,6 @@ public void whenAdminPodDeletionFails_retryOnFailure() {
136133
public void whenAdminPodReplacementFails_retryOnFailure() {
137134
testSupport.addRetryStrategy(retryStrategy);
138135
initializeExistingPod(getIncompatiblePod());
139-
expectListPersistentVolume().returning(createPersistentVolumeList());
140136
expectDeletePod(getPodName()).returning(new V1Status());
141137
expectCreatePod(podWithName(getPodName())).failingWithStatus(401);
142138
expectStepsAfterCreation();
@@ -210,13 +206,11 @@ public void whenExistingAdminPodSpecContainerHasWrongEnvFrom_replaceIt() {
210206

211207
@Test
212208
public void whenAdminPodCreated_specHasPodNameAsHostName() {
213-
expectListPersistentVolume().returning(createPersistentVolumeList());
214209
assertThat(getCreatedPod().getSpec().getHostname(), equalTo(getPodName()));
215210
}
216211

217212
@Test
218213
public void whenAdminPodCreated_containerHasStartServerCommand() {
219-
expectListPersistentVolume().returning(createPersistentVolumeList());
220214
assertThat(
221215
getCreatedPodSpecContainer().getCommand(),
222216
contains("/weblogic-operator/scripts/startServer.sh", UID, getServerName(), DOMAIN_NAME));
@@ -225,7 +219,6 @@ public void whenAdminPodCreated_containerHasStartServerCommand() {
225219
@Test
226220
public void whenAdminPodCreated_hasOperatorCertEnvVariable() {
227221
putTuningParameter(INTERNAL_OPERATOR_CERT_FILE_PARAM, CERTFILE);
228-
expectListPersistentVolume().returning(createPersistentVolumeList());
229222
assertThat(
230223
getCreatedPodSpecContainer().getEnv(),
231224
hasEnvVar(INTERNAL_OPERATOR_CERT_ENV_NAME, CERTFILE));
@@ -235,7 +228,6 @@ public void whenAdminPodCreated_hasOperatorCertEnvVariable() {
235228
public void whenDomainPresenceHasNullEnvironmentItems_createAdminPodStartupWithDefaultItems() {
236229
domainPresenceInfo.getDomain().getSpec().setServerStartup(null);
237230

238-
expectListPersistentVolume().returning(createPersistentVolumeList());
239231
assertThat(getCreatedPodSpecContainer().getEnv(), not(empty()));
240232
}
241233

@@ -250,7 +242,6 @@ public void whenDomainPresenceHasEnvironmentItems_createAdminPodStartupWithThem(
250242
.withVar("item2", "value2")
251243
.build());
252244

253-
expectListPersistentVolume().returning(createPersistentVolumeList());
254245
assertThat(
255246
getCreatedPodSpecContainer().getEnv(),
256247
allOf(hasEnvVar("item1", "value1"), hasEnvVar("item2", "value2")));
@@ -267,7 +258,6 @@ public void whenDomainPresenceHasEnvironmentItemsWithVariables_createAdminPodSta
267258
.withVar("item2", "$(SERVER_NAME) is $(ADMIN_NAME):$(ADMIN_PORT)")
268259
.build());
269260

270-
expectListPersistentVolume().returning(createPersistentVolumeList());
271261
assertThat(
272262
getCreatedPodSpecContainer().getEnv(),
273263
allOf(

‎operator/src/test/java/oracle/kubernetes/operator/helpers/PodHelperTestBase.java‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ public void setUp() throws Exception {
130130
mementos.add(TuningParametersStub.install());
131131

132132
testSupport.addDomainPresenceInfo(domainPresenceInfo);
133+
onAdminExpectListPersistentVolume();
133134
}
134135

135136
private String[] getMessageKeys() {
@@ -198,7 +199,6 @@ V1Container getCreatedPodSpecContainer() {
198199

199200
@Test
200201
public void whenNoPod_createIt() {
201-
onAdminExpectListPersistentVolume();
202202
expectCreatePod(podWithName(getPodName())).returning(createPodModel());
203203
expectStepsAfterCreation();
204204

@@ -209,13 +209,11 @@ public void whenNoPod_createIt() {
209209

210210
@Test
211211
public void whenPodCreated_specHasOneContainer() {
212-
onAdminExpectListPersistentVolume();
213212
assertThat(getCreatedPod().getSpec().getContainers(), hasSize(1));
214213
}
215214

216215
@Test
217216
public void whenPodCreatedWithLatestImage_useAlwaysPullPolicy() {
218-
onAdminExpectListPersistentVolume();
219217
defineDomainImage(LATEST_IMAGE);
220218

221219
V1Container v1Container = getCreatedPodSpecContainer();
@@ -229,7 +227,6 @@ public void whenPodCreatedWithLatestImage_useAlwaysPullPolicy() {
229227
public void whenPodCreatedWithVersionedImage_useIfNotPresentPolicy() {
230228
defineDomainImage(VERSIONED_IMAGE);
231229

232-
onAdminExpectListPersistentVolume();
233230
V1Container v1Container = getCreatedPodSpecContainer();
234231

235232
assertThat(v1Container.getImage(), equalTo(VERSIONED_IMAGE));
@@ -238,7 +235,6 @@ public void whenPodCreatedWithVersionedImage_useIfNotPresentPolicy() {
238235

239236
@Test
240237
public void whenPodCreated_containerHasExpectedVolumeMounts() {
241-
onAdminExpectListPersistentVolume();
242238
assertThat(
243239
getCreatedPodSpecContainer().getVolumeMounts(),
244240
containsInAnyOrder(
@@ -249,39 +245,34 @@ public void whenPodCreated_containerHasExpectedVolumeMounts() {
249245

250246
@Test
251247
public void whenPodCreated_lifecyclePreStopHasStopServerCommand() {
252-
onAdminExpectListPersistentVolume();
253248
assertThat(
254249
getCreatedPodSpecContainer().getLifecycle().getPreStop().getExec().getCommand(),
255250
contains("/weblogic-operator/scripts/stopServer.sh", UID, getServerName(), DOMAIN_NAME));
256251
}
257252

258253
@Test
259254
public void whenPodCreated_livenessProbeHasLivenessCommand() {
260-
onAdminExpectListPersistentVolume();
261255
assertThat(
262256
getCreatedPodSpecContainer().getLivenessProbe().getExec().getCommand(),
263257
contains("/weblogic-operator/scripts/livenessProbe.sh", DOMAIN_NAME, getServerName()));
264258
}
265259

266260
@Test
267261
public void whenPodCreated_livenessProbeHasDefinedTuning() {
268-
onAdminExpectListPersistentVolume();
269262
assertThat(
270263
getCreatedPodSpecContainer().getLivenessProbe(),
271264
hasExpectedTuning(LIVENESS_INITIAL_DELAY, LIVENESS_TIMEOUT, LIVENESS_PERIOD));
272265
}
273266

274267
@Test
275268
public void whenPodCreated_readinessProbeHasReadinessCommand() {
276-
onAdminExpectListPersistentVolume();
277269
assertThat(
278270
getCreatedPodSpecContainer().getReadinessProbe().getExec().getCommand(),
279271
contains("/weblogic-operator/scripts/readinessProbe.sh", DOMAIN_NAME, getServerName()));
280272
}
281273

282274
@Test
283275
public void whenPodCreated_readinessProbeHasDefinedTuning() {
284-
onAdminExpectListPersistentVolume();
285276
assertThat(
286277
getCreatedPodSpecContainer().getReadinessProbe(),
287278
hasExpectedTuning(READINESS_INITIAL_DELAY, READINESS_TIMEOUT, READINESS_PERIOD));
@@ -290,7 +281,6 @@ public void whenPodCreated_readinessProbeHasDefinedTuning() {
290281
@SuppressWarnings("unchecked")
291282
@Test
292283
public void whenPodCreated_hasPredefinedEnvVariables() {
293-
onAdminExpectListPersistentVolume();
294284
assertThat(
295285
getCreatedPodSpecContainer().getEnv(),
296286
allOf(
@@ -309,13 +299,11 @@ static Matcher<Iterable<? super V1EnvVar>> hasEnvVar(String name, String value)
309299

310300
@Test
311301
public void whenDomainPresenceLacksClaims_adminPodSpecHasNoDomainStorageVolume() {
312-
onAdminExpectListPersistentVolume();
313302
assertThat(getVolumeWithName(getCreatedPod(), STORAGE_VOLUME_NAME), nullValue());
314303
}
315304

316305
@Test
317306
public void whenDomainPresenceHasClaim_podSpecHasDomainStorageVolume() {
318-
onAdminExpectListPersistentVolume();
319307
domainPresenceInfo
320308
.getClaims()
321309
.addItemsItem(
@@ -328,15 +316,13 @@ public void whenDomainPresenceHasClaim_podSpecHasDomainStorageVolume() {
328316

329317
@Test
330318
public void createdPod_hasCredentialsVolume() {
331-
onAdminExpectListPersistentVolume();
332319
V1Volume credentialsVolume = getVolumeWithName(getCreatedPod(), CREDENTIALS_VOLUME_NAME);
333320

334321
assertThat(credentialsVolume.getSecret().getSecretName(), equalTo(ADMIN_SECRET_NAME));
335322
}
336323

337324
@Test
338325
public void createdPod_hasConfigMapVolume() {
339-
onAdminExpectListPersistentVolume();
340326
V1Volume credentialsVolume = getVolumeWithName(getCreatedPod(), CONFIGMAP_VOLUME_NAME);
341327

342328
assertThat(credentialsVolume.getConfigMap().getName(), equalTo(DOMAIN_CONFIG_MAP_NAME));
@@ -354,7 +340,6 @@ private V1Volume getVolumeWithName(V1Pod pod, String volumeName) {
354340

355341
@Test
356342
public void whenPodCreated_hasExpectedLabels() {
357-
onAdminExpectListPersistentVolume();
358343
assertThat(
359344
getCreatedPod().getMetadata().getLabels(),
360345
allOf(
@@ -367,7 +352,6 @@ public void whenPodCreated_hasExpectedLabels() {
367352

368353
@Test
369354
public void whenPodCreated_hasPrometheusAnnotations() {
370-
onAdminExpectListPersistentVolume();
371355
assertThat(
372356
getCreatedPod().getMetadata().getAnnotations(),
373357
allOf(
@@ -381,7 +365,6 @@ public void whenPodCreated_hasPrometheusAnnotations() {
381365
public void whenPodCreated_containerUsesListenPort() {
382366
V1Container v1Container = getCreatedPodSpecContainer();
383367

384-
onAdminExpectListPersistentVolume();
385368
assertThat(v1Container.getPorts(), hasSize(1));
386369
assertThat(v1Container.getPorts().get(0).getProtocol(), equalTo("TCP"));
387370
assertThat(v1Container.getPorts().get(0).getContainerPort(), equalTo(listenPort));
@@ -426,7 +409,6 @@ protected void onAdminExpectListPersistentVolume() {
426409
@Test
427410
public void whenNoPod_retryOnFailure() {
428411
testSupport.addRetryStrategy(retryStrategy);
429-
onAdminExpectListPersistentVolume();
430412
expectCreatePod(podWithName(getPodName())).failingWithStatus(401);
431413
expectStepsAfterCreation();
432414

@@ -440,7 +422,6 @@ public void whenNoPod_retryOnFailure() {
440422
@Test
441423
public void whenCompliantPodExists_recordIt() {
442424
initializeExistingPod(createPodModel());
443-
onAdminExpectListPersistentVolume();
444425
testSupport.runSteps(getStepFactory(), terminalStep);
445426

446427
assertThat(logRecords, containsFine(getPodExistsMessageKey()));
@@ -551,7 +532,6 @@ V1PodSpec createPodSpec() {
551532

552533
@Test
553534
public void whenDomainPresenceInfoLacksImageName_createdPodUsesDefaultImage() {
554-
onAdminExpectListPersistentVolume();
555535
domainPresenceInfo.getDomain().getSpec().setImage(null);
556536
assertThat(getCreatedPodSpecContainer().getImage(), equalTo(DEFAULT_IMAGE));
557537
}

0 commit comments

Comments
 (0)