Skip to content

Commit 5e981ca

Browse files
moreautmoreaut
committed
Checkpoint k8s artifact renaming work
1 parent 553191e commit 5e981ca

File tree

6 files changed

+33
-33
lines changed

6 files changed

+33
-33
lines changed

‎kubernetes/internal/create-weblogic-domain-job-template.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -528,9 +528,9 @@ spec:
528528
- mountPath: /u01/weblogic
529529
name: create-weblogic-domain-job-cm-volume
530530
- mountPath: /shared
531-
name: pv-storage
531+
name: weblogic-domain-storage-volume
532532
- mountPath: /weblogic-operator/secrets
533-
name: secrets
533+
name: weblogic-credentials-volume
534534
command: ["/bin/sh"]
535535
args: ["/u01/weblogic/create-domain-job.sh"]
536536
env:
@@ -540,10 +540,10 @@ spec:
540540
- name: create-weblogic-domain-job-cm-volume
541541
configMap:
542542
name: %DOMAIN_UID%-create-weblogic-domain-job-cm
543-
- name: pv-storage
543+
- name: weblogic-domain-storage-volume
544544
persistentVolumeClaim:
545545
claimName: %DOMAIN_UID%-weblogic-domain-pvc
546-
- name: secrets
546+
- name: weblogic-credentials-volume
547547
secret:
548548
secretName: %WEBLOGIC_CREDENTIALS_SECRET_NAME%
549549
%WEBLOGIC_IMAGE_PULL_SECRET_PREFIX%imagePullSecrets:

‎site/creating-domain.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,9 @@ spec:
212212
- mountPath: /u01/weblogic
213213
name: create-weblogic-domain-job-cm-volume
214214
- mountPath: /shared
215-
name: pv-storage
215+
name: weblogic-domain-storage-volume
216216
- mountPath: /var/run/secrets-domain1
217-
name: secrets
217+
name: weblogic-credentials-volume
218218
command: ["/bin/sh"]
219219
args: ["/u01/weblogic/create-domain-job.sh"]
220220
env:
@@ -224,10 +224,10 @@ spec:
224224
- name: create-weblogic-domain-job-cm-volume
225225
configMap:
226226
name: domain1-create-weblogic-domain-job-cm
227-
- name: pv-storage
227+
- name: weblogic-domain-storage-volume
228228
persistentVolumeClaim:
229229
claimName: domain1-pv001-claim
230-
- name: secrets
230+
- name: weblogic-credentials-volume
231231
secret:
232232
weblogicCredentialsSecretName: domain1-weblogic-credentials
233233

‎site/name-changes.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ The following input properties, which used to have default values, now must be u
180180
| volume & mount | operator-config-volume | weblogic-operator-cm-volume |
181181
| volume & mount | operator-secrets-volume | weblogic-operator-secrets-volume |
182182
| volume & mount | config-map-scripts | create-weblogic-domain-job-cm-volume |
183-
| n volume & mount | pv-storage | weblogic-domain-storage-volume |
184-
| n volume & mount | secrets | weblogic-credentials-volume |
185-
| n volume & mount | scripts | weblogic-domain-cm-volume |
183+
| volume & mount | pv-storage | weblogic-domain-storage-volume |
184+
| volume & mount | secrets | weblogic-credentials-volume |
185+
| volume & mount | scripts | weblogic-domain-cm-volume |
186186

187187
Note: The input properties for controlling the domain's persistent volume, persistent volume claim and storage class names have been removed. These names are now derived from the domain uid.
188188

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -234,18 +234,18 @@ protected V1Pod computeAdminPodConfig(Packet packet) {
234234
container.setLifecycle(lifecycle);
235235

236236
V1VolumeMount volumeMount = new V1VolumeMount();
237-
volumeMount.setName("pv-storage");
237+
volumeMount.setName("weblogic-domain-storage-volume");
238238
volumeMount.setMountPath("/shared");
239239
container.addVolumeMountsItem(volumeMount);
240240

241241
V1VolumeMount volumeMountSecret = new V1VolumeMount();
242-
volumeMountSecret.setName("secrets");
242+
volumeMountSecret.setName("weblogic-credentials-volume");
243243
volumeMountSecret.setMountPath("/weblogic-operator/secrets");
244244
volumeMountSecret.setReadOnly(true);
245245
container.addVolumeMountsItem(volumeMountSecret);
246246

247247
V1VolumeMount volumeMountScripts = new V1VolumeMount();
248-
volumeMountScripts.setName("scripts");
248+
volumeMountScripts.setName("weblogic-domain-cm-volume");
249249
volumeMountScripts.setMountPath("/weblogic-operator/scripts");
250250
volumeMountScripts.setReadOnly(true);
251251
container.addVolumeMountsItem(volumeMountScripts);
@@ -296,22 +296,22 @@ protected V1Pod computeAdminPodConfig(Packet packet) {
296296

297297
if (!info.getClaims().getItems().isEmpty()) {
298298
V1Volume volume = new V1Volume();
299-
volume.setName("pv-storage");
299+
volume.setName("weblogic-domain-storage-volume");
300300
V1PersistentVolumeClaimVolumeSource pvClaimSource = new V1PersistentVolumeClaimVolumeSource();
301301
pvClaimSource.setClaimName(info.getClaims().getItems().iterator().next().getMetadata().getName());
302302
volume.setPersistentVolumeClaim(pvClaimSource);
303303
podSpec.addVolumesItem(volume);
304304
}
305305

306306
V1Volume volumeSecret = new V1Volume();
307-
volumeSecret.setName("secrets");
307+
volumeSecret.setName("weblogic-credentials-volume");
308308
V1SecretVolumeSource secret = new V1SecretVolumeSource();
309309
secret.setSecretName(spec.getAdminSecret().getName());
310310
volumeSecret.setSecret(secret);
311311
podSpec.addVolumesItem(volumeSecret);
312312

313313
V1Volume volumeDomainConfigMap = new V1Volume();
314-
volumeDomainConfigMap.setName("scripts");
314+
volumeDomainConfigMap.setName("weblogic-domain-cm-volume");
315315
V1ConfigMapVolumeSource cm = new V1ConfigMapVolumeSource();
316316
cm.setName(KubernetesConstants.DOMAIN_CONFIG_MAP_NAME);
317317
cm.setDefaultMode(0555); // read and execute
@@ -650,18 +650,18 @@ protected V1Pod computeManagedPodConfig(Packet packet) {
650650
container.setLifecycle(lifecycle);
651651

652652
V1VolumeMount volumeMount = new V1VolumeMount();
653-
volumeMount.setName("pv-storage");
653+
volumeMount.setName("weblogic-domain-storage-volume");
654654
volumeMount.setMountPath("/shared");
655655
container.addVolumeMountsItem(volumeMount);
656656

657657
V1VolumeMount volumeMountSecret = new V1VolumeMount();
658-
volumeMountSecret.setName("secrets");
658+
volumeMountSecret.setName("weblogic-credentials-volume");
659659
volumeMountSecret.setMountPath("/weblogic-operator/secrets");
660660
volumeMountSecret.setReadOnly(true);
661661
container.addVolumeMountsItem(volumeMountSecret);
662662

663663
V1VolumeMount volumeMountScripts = new V1VolumeMount();
664-
volumeMountScripts.setName("scripts");
664+
volumeMountScripts.setName("weblogic-domain-cm-volume");
665665
volumeMountScripts.setMountPath("/weblogic-operator/scripts");
666666
volumeMountScripts.setReadOnly(true);
667667
container.addVolumeMountsItem(volumeMountScripts);
@@ -694,22 +694,22 @@ protected V1Pod computeManagedPodConfig(Packet packet) {
694694

695695
if (!info.getClaims().getItems().isEmpty()) {
696696
V1Volume volume = new V1Volume();
697-
volume.setName("pv-storage");
697+
volume.setName("weblogic-domain-storage-volume");
698698
V1PersistentVolumeClaimVolumeSource pvClaimSource = new V1PersistentVolumeClaimVolumeSource();
699699
pvClaimSource.setClaimName(info.getClaims().getItems().iterator().next().getMetadata().getName());
700700
volume.setPersistentVolumeClaim(pvClaimSource);
701701
podSpec.addVolumesItem(volume);
702702
}
703703

704704
V1Volume volumeSecret = new V1Volume();
705-
volumeSecret.setName("secrets");
705+
volumeSecret.setName("weblogic-credentials-volume");
706706
V1SecretVolumeSource secret = new V1SecretVolumeSource();
707707
secret.setSecretName(spec.getAdminSecret().getName());
708708
volumeSecret.setSecret(secret);
709709
podSpec.addVolumesItem(volumeSecret);
710710

711711
V1Volume volumeDomainConfigMap = new V1Volume();
712-
volumeDomainConfigMap.setName("scripts");
712+
volumeDomainConfigMap.setName("weblogic-domain-cm-volume");
713713
V1ConfigMapVolumeSource cm = new V1ConfigMapVolumeSource();
714714
cm.setName(KubernetesConstants.DOMAIN_CONFIG_MAP_NAME);
715715
cm.setDefaultMode(0555); // read and execute

‎src/test/java/oracle/kubernetes/operator/create/CreateDomainGeneratedFilesBaseTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,21 +173,21 @@ protected V1Job getExpectedCreateWeblogicDomainJob() {
173173
.name("create-weblogic-domain-job-cm-volume")
174174
.mountPath("/u01/weblogic"))
175175
.addVolumeMountsItem(newVolumeMount()
176-
.name("pv-storage")
176+
.name("weblogic-domain-storage-volume")
177177
.mountPath("/shared"))
178178
.addVolumeMountsItem(newVolumeMount()
179-
.name("secrets")
179+
.name("weblogic-credentials-volume")
180180
.mountPath("/weblogic-operator/secrets")))
181181
.addVolumesItem(newVolume()
182182
.name("create-weblogic-domain-job-cm-volume")
183183
.configMap(newConfigMapVolumeSource()
184184
.name(getInputs().getDomainUID() + "-create-weblogic-domain-job-cm")))
185185
.addVolumesItem(newVolume()
186-
.name("pv-storage")
186+
.name("weblogic-domain-storage-volume")
187187
.persistentVolumeClaim(newPersistentVolumeClaimVolumeSource()
188188
.claimName(getInputs().getWeblogicDomainPersistentVolumeClaimName())))
189189
.addVolumesItem(newVolume()
190-
.name("secrets")
190+
.name("weblogic-credentials-volume")
191191
.secret(newSecretVolumeSource()
192192
.secretName(getInputs().getWeblogicCredentialsSecretName()))))));
193193
}

‎src/test/java/oracle/kubernetes/operator/create/PodHelperConfigTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ private V1Pod getDesiredManagedServerPodConfigForDefaults(String image, String i
372372
private void setDesiredPersistentVolumeClaim(V1Pod pod) {
373373
pod.getSpec()
374374
.getVolumes().add(0, newVolume() // needs to be first in the list
375-
.name("pv-storage")
375+
.name("weblogic-domain-storage-volume")
376376
.persistentVolumeClaim(newPersistentVolumeClaimVolumeSource()
377377
.claimName(WEBLOGIC_DOMAIN_PERSISTENT_VOLUME_CLAIM_NAME)));
378378
}
@@ -445,20 +445,20 @@ private V1Pod getDesiredBaseServerPodConfigForDefaults(String image, String imag
445445
.name("ADMIN_PASSWORD")
446446
.value(null))
447447
.addVolumeMountsItem(newVolumeMount() // TBD - why is the mount created if the volume doesn't exist?
448-
.name("pv-storage")
448+
.name("weblogic-domain-storage-volume")
449449
.mountPath("/shared"))
450450
.addVolumeMountsItem(newVolumeMount()
451-
.name("secrets")
451+
.name("weblogic-credentials-volume")
452452
.mountPath("/weblogic-operator/secrets"))
453453
.addVolumeMountsItem(newVolumeMount()
454-
.name("scripts")
454+
.name("weblogic-domain-cm-volume")
455455
.mountPath("/weblogic-operator/scripts")))
456456
.addVolumesItem(newVolume()
457-
.name("secrets")
457+
.name("weblogic-credentials-volume")
458458
.secret(newSecretVolumeSource()
459459
.secretName(WEBLOGIC_CREDENTIALS_SECRET_NAME)))
460460
.addVolumesItem(newVolume()
461-
.name("scripts")
461+
.name("weblogic-domain-cm-volume")
462462
.configMap(newConfigMapVolumeSource()
463463
.name("weblogic-domain-cm")
464464
.defaultMode(365))));

0 commit comments

Comments
 (0)