Checkpoint k8s artifact renaming work

Author: moreaut

kubernetes/internal/create-weblogic-domain.sh

@@ -98,9 +98,10 @@ function initAndValidateOutputDir {
     create-weblogic-domain-inputs.yaml \
     weblogic-domain-persistent-volume.yaml \
     weblogic-domain-persistent-volume-claim.yaml \
+    weblogic-domain-traefik-${clusterName}.yaml \
+    weblogic-domain-traefik-security-${clusterName}.yaml \
     create-weblogic-domain-job.yaml \
-    domain-custom-resource.yaml \
-    traefik.yaml
+    domain-custom-resource.yaml
 }
 
 #
@@ -310,12 +311,12 @@ function initialize {
     validationError "The template file ${dcrInput} for creating the domain custom resource was not found"
   fi
 
-  traefikSecurityInput="${scriptDir}/traefik-security-template.yaml"
+  traefikSecurityInput="${scriptDir}/weblogic-domain-traefik-security-template.yaml"
   if [ ! -f ${traefikSecurityInput} ]; then
     validationError "The file ${traefikSecurityInput} for generating the traefik RBAC was not found"
   fi
 
-  traefikInput="${scriptDir}/traefik-template.yaml"
+  traefikInput="${scriptDir}/weblogic-domain-traefik-template.yaml"
   if [ ! -f ${traefikInput} ]; then
     validationError "The template file ${traefikInput} for generating the traefik deployment was not found"
   fi
@@ -385,8 +386,8 @@ function createYamlFiles {
   domainPVCOutput="${domainOutputDir}/weblogic-domain-persistent-volume-claim.yaml"
   jobOutput="${domainOutputDir}/create-weblogic-domain-job.yaml"
   dcrOutput="${domainOutputDir}/domain-custom-resource.yaml"
-  traefikSecurityOutput="${domainOutputDir}/traefik-security.yaml"
-  traefikOutput="${domainOutputDir}/traefik.yaml"
+  traefikSecurityOutput="${domainOutputDir}/weblogic-domain-traefik-security-${clusterName}.yaml"
+  traefikOutput="${domainOutputDir}/weblogic-domain-traefik-${clusterName}.yaml"
 
   enabledPrefix=""     # uncomment the feature
   disabledPrefix="# "  # comment out the feature

…/internal/traefik-security-template.yaml …ic-domain-traefik-security-template.yamlkubernetes/internal/traefik-security-template.yaml renamed to kubernetes/internal/weblogic-domain-traefik-security-template.yaml kubernetes/internal/traefik-security-template.yaml renamed to kubernetes/internal/weblogic-domain-traefik-security-template.yaml

@@ -91,8 +91,8 @@ The names of several of the generated YAML files have changed.
 | persistent-volume.yaml | weblogic-domain-persistent-volume.yaml |
 | persistent-volume-claim.yaml | weblogic-domain-persistent-volume-claim.yaml |
 | rbac.yaml | weblogic-operator-security.yaml |
-| traefik-deployment.yaml | traefik.yaml |
-| traefik-rbac.yaml | traefik-security.yaml |
+| traefik-deployment.yaml | weblogic-domain-traefik-${clusterName}.yaml |
+| traefik-rbac.yaml | weblogic-domain-traefik-security-${clusterName}.yaml |
 | weblogic-operator.yaml | same |
 
 ## Input File Contents

kubernetes/internal/traefik-template.yaml …al/weblogic-domain-traefik-template.yamlkubernetes/internal/traefik-template.yaml renamed to kubernetes/internal/weblogic-domain-traefik-template.yaml kubernetes/internal/traefik-template.yaml renamed to kubernetes/internal/weblogic-domain-traefik-template.yaml

@@ -204,8 +204,8 @@ function orderlyDelete {
     kubectl -n $curns delete secret ${curdomain}-weblogic-credentials --ignore-not-found
 
     echo @@ Deleting ${curdomain} traefik in namespace $curns
-    kubectlDeleteF "${USER_PROJECTS_DIR}/weblogic-domains/${curdomain}/traefik.yaml" 
-    kubectlDeleteF "${USER_PROJECTS_DIR}/weblogic-domains/${curdomain}/traefik-security.yaml"
+    kubectlDeleteF "${USER_PROJECTS_DIR}/weblogic-domains/${curdomain}/weblogic-domain-traefik-cluster-1.yaml" 
+    kubectlDeleteF "${USER_PROJECTS_DIR}/weblogic-domains/${curdomain}/weblogic-domain-traefik-security-cluster-1.yaml"
 
     echo @@ Deleting configmap ${curdomain}-create-weblogic-domain-job-cm in namespace $curns
     kubectl -n $curns delete cm ${curdomain}-create-weblogic-domain-job-cm  --ignore-not-found

site/name-changes.md

@@ -16,8 +16,6 @@ public class DomainFiles {
   private static final String CREATE_WEBLOGIC_DOMAIN_INPUTS_YAML = "create-weblogic-domain-inputs.yaml";
   private static final String DOMAIN_CUSTOM_RESOURCE_YAML = "domain-custom-resource.yaml";
   private static final String CREATE_WEBLOGIC_DOMAIN_JOB_YAML = "create-weblogic-domain-job.yaml";
-  private static final String TRAEFIK_YAML = "traefik.yaml";
-  private static final String TRAEFIK_SECURITY_YAML = "traefik-security.yaml";
   private static final String WEBLOGIC_DOMAIN_PERSISTENT_VOLUME_YAML = "weblogic-domain-persistent-volume.yaml";
   private static final String WEBLOGIC_DOMAIN_PERSISTENT_VOLUME_CLAIM_YAML = "weblogic-domain-persistent-volume-claim.yaml";
 
@@ -44,11 +42,11 @@ public Path getDomainCustomResourceYamlPath() {
   }
 
   public Path getTraefikYamlPath() {
-    return getWeblogicDomainPath().resolve(TRAEFIK_YAML);
+    return getWeblogicDomainPath().resolve("weblogic-domain-traefik-" + inputs.getClusterName() + ".yaml");
   }
 
   public Path getTraefikSecurityYamlPath() {
-    return getWeblogicDomainPath().resolve(TRAEFIK_SECURITY_YAML);
+    return getWeblogicDomainPath().resolve("weblogic-domain-traefik-security-" + inputs.getClusterName() + ".yaml");
   }
 
   public Path getWeblogicDomainPersistentVolumeYamlPath() {

src/integration-tests/bash/cleanup.sh

@@ -9,7 +9,7 @@
 import io.kubernetes.client.models.V1beta1ClusterRoleBinding;
 
 /**
- * Parses a generated traefik-security.yaml file into a set of typed k8s java objects
+ * Parses a generated weblogic-domain-traefik-security-inputs.getClusterName().yaml file into a set of typed k8s java objects
  */
 public class ParsedTraefikSecurityYaml extends ParsedKubernetesYaml {
 

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

@@ -11,7 +11,7 @@
 import io.kubernetes.client.models.V1ServiceAccount;
 
 /**
- * Parses a generated traefik.yaml file into a set of typed k8s java objects
+ * Parses a generated weblogic-domain-traefik-inputs.getClusterName().yaml file into a set of typed k8s java objects
  */
 public class ParsedTraefikYaml extends ParsedKubernetesYaml {