Skip to content

Commit 8d6a845

Browse files
moreautmoreaut
committed
Checkpoint k8s artifact renaming work
1 parent ac825c1 commit 8d6a845

15 files changed

+37
-54
lines changed

‎docs/apidocs/constant-values.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ <h2 title="oracle.kubernetes">oracle.kubernetes.*</h2>
202202
<!-- -->
203203
</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="https://docs.oracle.com/javase/9/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
204204
<th class="colSecond" scope="row"><code><a href="oracle/kubernetes/operator/KubernetesConstants.html#DOMAIN_CONFIG_MAP_NAME">DOMAIN_CONFIG_MAP_NAME</a></code></th>
205-
<td class="colLast"><code>"weblogic-domain-config-map"</code></td>
205+
<td class="colLast"><code>"weblogic-domain-cm"</code></td>
206206
</tr>
207207
<tr class="altColor">
208208
<td class="colFirst"><a name="oracle.kubernetes.operator.KubernetesConstants.DOMAIN_GROUP">

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
apiVersion: v1
44
kind: ConfigMap
55
metadata:
6-
name: %DOMAIN_UID%-create-weblogic-domain-job-config-map
6+
name: %DOMAIN_UID%-create-weblogic-domain-job-cm
77
namespace: %NAMESPACE%
88
labels:
99
weblogic.domainUID: %DOMAIN_UID%
@@ -519,7 +519,7 @@ spec:
519519
spec:
520520
restartPolicy: Never
521521
containers:
522-
- name: domain-job
522+
- name: create-weblogic-domain-job
523523
image: store/oracle/weblogic:12.2.1.3
524524
imagePullPolicy: IfNotPresent
525525
ports:
@@ -539,7 +539,7 @@ spec:
539539
volumes:
540540
- name: config-map-scripts
541541
configMap:
542-
name: %DOMAIN_UID%-create-weblogic-domain-job-config-map
542+
name: %DOMAIN_UID%-create-weblogic-domain-job-cm
543543
- name: pv-storage
544544
persistentVolumeClaim:
545545
claimName: %DOMAIN_UID%-weblogic-domain-pvc

‎kubernetes/internal/traefik-template.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@ spec:
7272
volumes:
7373
- name: config
7474
configMap:
75-
name: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik-config-map
75+
name: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik-cm
7676
---
7777
apiVersion: v1
7878
kind: ConfigMap
7979
metadata:
80-
name: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik-config-map
80+
name: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik-cm
8181
namespace: %NAMESPACE%
8282
labels:
8383
app: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik

‎kubernetes/internal/weblogic-operator-template.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
apiVersion: v1
1212
kind: ConfigMap
1313
metadata:
14-
name: weblogic-operator-config-map
14+
name: weblogic-operator-cm
1515
namespace: %NAMESPACE%
1616
data:
1717
serviceaccount: %ACCOUNT_NAME%
@@ -104,7 +104,7 @@ spec:
104104
volumes:
105105
- name: operator-config-volume
106106
configMap:
107-
name: weblogic-operator-config-map
107+
name: weblogic-operator-cm
108108
- name: operator-secrets-volume
109109
secret:
110110
secretName: weblogic-operator-secrets

‎site/creating-domain.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ spec:
203203
spec:
204204
restartPolicy: Never
205205
containers:
206-
- name: domain-job
206+
- name: create-weblogic-domain-job
207207
image: store/oracle/weblogic:12.2.1.3
208208
imagePullPolicy: IfNotPresent
209209
ports:
@@ -223,7 +223,7 @@ spec:
223223
volumes:
224224
- name: config-map-scripts
225225
configMap:
226-
name: domain1-create-weblogic-domain-job-config-map
226+
name: domain1-create-weblogic-domain-job-cm
227227
- name: pv-storage
228228
persistentVolumeClaim:
229229
claimName: domain1-pv001-claim

‎site/installation.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ The spec section provides details for the container that the operator will execu
216216
volumes:
217217
- name: operator-config-volume
218218
configMap:
219-
name: weblogic-operator-config-map
219+
name: weblogic-operator-cm
220220
- name: operator-secrets-volume
221221
secret:
222222
weblogicCredentialsSecretName: weblogic-operator-secrets
@@ -279,7 +279,7 @@ This section creates a ConfigMap that passes configuration information to the op
279279
apiVersion: v1
280280
kind: ConfigMap
281281
metadata:
282-
name: weblogic-operator-config-map
282+
name: weblogic-operator-cm
283283
namespace: weblogic-operator
284284
data:
285285
serviceaccount: weblogic-operator

‎site/name-changes.md‎

Lines changed: 11 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -167,37 +167,20 @@ The following input properties, which used to have default values, now must be u
167167
| persistent volume claim | ${domainUid}-${persistenceVolumeClaim} or ${persistenceVolumeClaim} | ${domainUID}-weblogic-domain-pvc |
168168
| storage class name | ${domainUid} or ${persistenceStorageClass} | ${domainUID-weblogic-domain-storage-class |
169169
| job | domain-${domainUid}-job | ${domainUID}-create-weblogic-domain-job |
170+
| container | domain-job | create-weblogic-domain-job |
170171
| container | ${d.domainUID}-${d.clusterName, lower case}-traefik | traefik |
171-
| config map | operator-config-map | weblogic-operator-config-map |
172-
| config map | ${domainUid}-${clusterName, lower case}-traefik | ${domainUID}-${clusterName, lower case}-traefik-config-map |
173-
| config map | domain-${domainUid}-scripts | ${domainUID}-create-weblogic-domain-job-config-map |
172+
| config map | operator-config-map | weblogic-operator-cm |
173+
| config map | ${domainUid}-${clusterName, lower case}-traefik | ${domainUID}-${clusterName, lower case}-traefik-cm |
174+
| config map | domain-${domainUid}-scripts | ${domainUID}-create-weblogic-domain-job-cm |
175+
| config map | weblogic-domain-config-map | weblogic-domain-cm |
174176
| secret | operator-secrets | weblogic-operator-secrets |
175177
| port | rest-https | rest |
176-
| n volume | operator-config-volume | weblogic-operator-config-map-volume |
177-
| n volume | operator-secrets-volume | weblogic-operator-secrets-volume |
178-
| n volume | config-map-scripts | create-weblogic-domain-job-config-map-volume |
179-
| n volume | pv-storage | weblogic-domain-storage-volume |
180-
| n volume | secrets | weblogic-credentials-volume |
181-
| n volume | scripts | weblogic-domain-config-map-volume |
182-
183-
Temp note: weblogic-domain-config-map is created on the fly by ConfigMapHelper.java. It's referenced by weblogic-domain-config-map-volume.
184-
185-
TBD - we're appending type to:
186-
- config maps
187-
- secrets
188-
- pvs (global)
189-
- pvcs
190-
- storage classes
191-
- jobs
192-
but not to:
193-
- namespaces (global)
194-
- deployments
195-
- pods
196-
- services
197-
- service accounts
198-
- ports
199-
- maybe volumes
200-
- maybe volume mounts
178+
| n volume & mount | operator-config-volume | weblogic-operator-cm-volume |
179+
| n volume & mount | operator-secrets-volume | weblogic-operator-secrets-volume |
180+
| n volume & mount | config-map-scripts | create-weblogic-domain-job-cm-volume |
181+
| n volume & mount | pv-storage | weblogic-domain-storage-volume |
182+
| n volume & mount | secrets | weblogic-credentials-volume |
183+
| n volume & mount | scripts | weblogic-domain-cm-volume |
201184

202185
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.
203186

‎src/integration-tests/bash/cleanup.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ function orderlyDelete {
207207
kubectlDeleteF "${USER_PROJECTS_DIR}/weblogic-domains/${curdomain}/traefik.yaml"
208208
kubectlDeleteF "${USER_PROJECTS_DIR}/weblogic-domains/${curdomain}/traefik-security.yaml"
209209

210-
echo @@ Deleting configmap ${curdomain}-create-weblogic-domain-job-config-map in namespace $curns
211-
kubectl -n $curns delete cm ${curdomain}-create-weblogic-domain-job-config-map --ignore-not-found
210+
echo @@ Deleting configmap ${curdomain}-create-weblogic-domain-job-cm in namespace $curns
211+
kubectl -n $curns delete cm ${curdomain}-create-weblogic-domain-job-cm --ignore-not-found
212212

213213
kubectl -n $curns delete deploy ${curdomain}-cluster-1-traefik --ignore-not-found=true
214214
kubectl -n $curns delete service ${curdomain}-cluster-1-traefik --ignore-not-found=true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ public interface KubernetesConstants {
2525

2626
public static final String CONTAINER_NAME = "weblogic-server";
2727

28-
public static final String DOMAIN_CONFIG_MAP_NAME = "weblogic-domain-config-map";
28+
public static final String DOMAIN_CONFIG_MAP_NAME = "weblogic-domain-cm";
2929

3030
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ protected V1Job getExpectedCreateWeblogicDomainJob() {
159159
.spec(newPodSpec()
160160
.restartPolicy("Never")
161161
.addContainersItem(newContainer()
162-
.name("domain-job")
162+
.name("create-weblogic-domain-job")
163163
.image("store/oracle/weblogic:12.2.1.3")
164164
.imagePullPolicy("IfNotPresent")
165165
.addCommandItem("/bin/sh")
@@ -181,7 +181,7 @@ protected V1Job getExpectedCreateWeblogicDomainJob() {
181181
.addVolumesItem(newVolume()
182182
.name("config-map-scripts")
183183
.configMap(newConfigMapVolumeSource()
184-
.name(getInputs().getDomainUID() + "-create-weblogic-domain-job-config-map")))
184+
.name(getInputs().getDomainUID() + "-create-weblogic-domain-job-cm")))
185185
.addVolumesItem(newVolume()
186186
.name("pv-storage")
187187
.persistentVolumeClaim(newPersistentVolumeClaimVolumeSource()
@@ -231,7 +231,7 @@ protected V1ConfigMap getExpectedCreateWeblogicDomainJobConfigMap() {
231231
return
232232
newConfigMap()
233233
.metadata(newObjectMeta()
234-
.name(getInputs().getDomainUID() + "-create-weblogic-domain-job-config-map")
234+
.name(getInputs().getDomainUID() + "-create-weblogic-domain-job-cm")
235235
.namespace(getInputs().getNamespace())
236236
.putLabelsItem("weblogic.domainUID", getInputs().getDomainUID()))
237237
.putDataItem(PROPERTY_UTILITY_SH, "")
@@ -485,7 +485,7 @@ protected ExtensionsV1beta1Deployment getExpectedTraefikDeployment() {
485485
.addVolumesItem(newVolume()
486486
.name("config")
487487
.configMap(newConfigMapVolumeSource()
488-
.name(getTraefikScope() + "-config-map"))))));
488+
.name(getTraefikScope() + "-cm"))))));
489489
}
490490

491491
@Test
@@ -513,7 +513,7 @@ protected V1ConfigMap getExpectedTraefikConfigMap() {
513513
return
514514
newConfigMap()
515515
.metadata(newObjectMeta()
516-
.name(getTraefikScope() + "-config-map")
516+
.name(getTraefikScope() + "-cm")
517517
.namespace(getInputs().getNamespace())
518518
.putLabelsItem("weblogic.domainUID", getInputs().getDomainUID())
519519
.putLabelsItem("weblogic.clusterName", getClusterNameLC())

0 commit comments

Comments
 (0)