Skip to content

Commit 29607b1

Browse files
committed
Checkpoint k8s artifact renaming work
1 parent 91af423 commit 29607b1

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

kubernetes/internal/create-weblogic-domain.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ function initAndValidateOutputDir {
9898
create-weblogic-domain-inputs.yaml \
9999
weblogic-domain-persistent-volume.yaml \
100100
weblogic-domain-persistent-volume-claim.yaml \
101-
weblogic-domain-traefik-${clusterName}.yaml \
102-
weblogic-domain-traefik-security-${clusterName}.yaml \
101+
weblogic-domain-traefik-${clusterNameLC}.yaml \
102+
weblogic-domain-traefik-security-${clusterNameLC}.yaml \
103103
create-weblogic-domain-job.yaml \
104104
domain-custom-resource.yaml
105105
}
@@ -386,8 +386,8 @@ function createYamlFiles {
386386
domainPVCOutput="${domainOutputDir}/weblogic-domain-persistent-volume-claim.yaml"
387387
jobOutput="${domainOutputDir}/create-weblogic-domain-job.yaml"
388388
dcrOutput="${domainOutputDir}/domain-custom-resource.yaml"
389-
traefikSecurityOutput="${domainOutputDir}/weblogic-domain-traefik-security-${clusterName}.yaml"
390-
traefikOutput="${domainOutputDir}/weblogic-domain-traefik-${clusterName}.yaml"
389+
traefikSecurityOutput="${domainOutputDir}/weblogic-domain-traefik-security-${clusterNameLC}.yaml"
390+
traefikOutput="${domainOutputDir}/weblogic-domain-traefik-${clusterNameLC}.yaml"
391391

392392
enabledPrefix="" # uncomment the feature
393393
disabledPrefix="# " # comment out the feature

site/name-changes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ The names of several of the generated YAML files have changed.
9191
| persistent-volume.yaml | weblogic-domain-persistent-volume.yaml |
9292
| persistent-volume-claim.yaml | weblogic-domain-persistent-volume-claim.yaml |
9393
| rbac.yaml | weblogic-operator-security.yaml |
94-
| traefik-deployment.yaml | weblogic-domain-traefik-${clusterName}.yaml |
95-
| traefik-rbac.yaml | weblogic-domain-traefik-security-${clusterName}.yaml |
94+
| traefik-deployment.yaml | weblogic-domain-traefik-${clusterName, lower case}.yaml |
95+
| traefik-rbac.yaml | weblogic-domain-traefik-security-${clusterName, lower case}.yaml |
9696
| weblogic-operator.yaml | same |
9797

9898
## Input File Contents

src/test/java/oracle/kubernetes/operator/create/DomainFiles.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ public Path getDomainCustomResourceYamlPath() {
4242
}
4343

4444
public Path getTraefikYamlPath() {
45-
return getWeblogicDomainPath().resolve("weblogic-domain-traefik-" + inputs.getClusterName() + ".yaml");
45+
return getWeblogicDomainPath().resolve("weblogic-domain-traefik-" + inputs.getClusterName().toLowerCase() + ".yaml");
4646
}
4747

4848
public Path getTraefikSecurityYamlPath() {
49-
return getWeblogicDomainPath().resolve("weblogic-domain-traefik-security-" + inputs.getClusterName() + ".yaml");
49+
return getWeblogicDomainPath().resolve("weblogic-domain-traefik-security-" + inputs.getClusterName().toLowerCase() + ".yaml");
5050
}
5151

5252
public Path getWeblogicDomainPersistentVolumeYamlPath() {

src/test/java/oracle/kubernetes/operator/create/ParsedTraefikSecurityYaml.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import io.kubernetes.client.models.V1beta1ClusterRoleBinding;
1010

1111
/**
12-
* Parses a generated weblogic-domain-traefik-security-inputs.getClusterName().yaml file into a set of typed k8s java objects
12+
* Parses a generated weblogic-domain-traefik-security-inputs.getClusterName().toLowerCase().yaml file into a set of typed k8s java objects
1313
*/
1414
public class ParsedTraefikSecurityYaml extends ParsedKubernetesYaml {
1515

src/test/java/oracle/kubernetes/operator/create/ParsedTraefikYaml.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import io.kubernetes.client.models.V1ServiceAccount;
1212

1313
/**
14-
* Parses a generated weblogic-domain-traefik-inputs.getClusterName().yaml file into a set of typed k8s java objects
14+
* Parses a generated weblogic-domain-traefik-inputs.getClusterName().toLowerCase().yaml file into a set of typed k8s java objects
1515
*/
1616
public class ParsedTraefikYaml extends ParsedKubernetesYaml {
1717

0 commit comments

Comments
 (0)