Merge branch 'owls-121004' into 'main'

Account for dot in RFC 1123 legal name conversion

See merge request weblogic-cloud/weblogic-kubernetes-operator!4794

Author: rjeberhard

common/src/main/java/oracle/kubernetes/common/utils/CommonUtils.java

@@ -52,7 +52,7 @@ private static boolean useLatestImage(String imageName) {
    * @return nearest DNS-1123 legal name
    */
   public static String toDns1123LegalName(String value) {
-    return value.toLowerCase().replace('_', '-');
+    return value.toLowerCase().replace('_', '-').replace('.', '-');
   }
 
   /**

common/src/main/java/oracle/kubernetes/common/utils/SchemaConversionUtils.java

@@ -1054,18 +1054,14 @@ private void generateClusters(Map<String, Object> domain, List<Map<String, Objec
     }
   }
 
-  public static String toDns1123LegalName(String value) {
-    return value.toLowerCase().replace('_', '-');
-  }
-
   private Map<String, Object> generateCluster(Map<String, Object> domainMeta,
                                               Map<String, Object> existingCluster) {
     Map<String, Object> cluster = new LinkedHashMap<>();
     cluster.put(API_VERSION, "weblogic.oracle/v1");
     cluster.put("kind", "Cluster");
     Map<String, Object> clusterMeta = new LinkedHashMap<>();
     clusterMeta.put("name", domainMeta.get("name") + "-"
-        + toDns1123LegalName((String) existingCluster.get(CLUSTER_NAME)));
+        + CommonUtils.toDns1123LegalName((String) existingCluster.get(CLUSTER_NAME)));
     clusterMeta.put(NAMESPACE, domainMeta.get(NAMESPACE));
     Map<String, Object> labels = new LinkedHashMap<>();
     labels.put("weblogic.createdByOperator", "true");

operator/src/main/java/oracle/kubernetes/operator/helpers/JobStepContext.java

@@ -758,10 +758,10 @@ protected V1Container createPrimaryContainer() {
 
   private String getVolumeName(String resourceName, String type) {
     try {
-      return getLegalVolumeName(resourceName, type);
+      return CommonUtils.toDns1123LegalName(getLegalVolumeName(resourceName, type));
     } catch (Exception ex) {
       LOGGER.severe(MessageKeys.EXCEPTION, ex);
-      return resourceName;
+      return CommonUtils.toDns1123LegalName(resourceName);
     }
   }
 

operator/src/main/java/oracle/kubernetes/operator/helpers/LegalNames.java

@@ -141,7 +141,7 @@ private static String getExternalServiceNameSuffix() {
    * @return nearest DNS-1123 legal name
    */
   public static String toDns1123LegalName(String value) {
-    return value.toLowerCase().replace('_', '-');
+    return value.toLowerCase().replace('_', '-').replace('.', '-');
   }
 
   public static boolean isDns1123LegalName(String value) {

operator/src/test/java/oracle/kubernetes/operator/helpers/DomainIntrospectorJobTest.java

@@ -525,18 +525,18 @@ void whenJobCreatedWithoutInitializeDomainOnPVDefined_dontHaveSecretsVolumeAndMo
 
   @Test
   void whenJobCreatedWithInitializeDomainOnPVCreateDomainCMDefined_hasConfigMapVolumeAndMounts() {
-    V1ConfigMap cm = new V1ConfigMap().metadata(new V1ObjectMeta().name("initPvDomainCM").namespace(NS));
+    V1ConfigMap cm = new V1ConfigMap().metadata(new V1ObjectMeta().name("initpvdomaincm").namespace(NS));
     testSupport.defineResources(cm);
-    getConfigurator().withDomainCreationConfigMap("initPvDomainCM");
+    getConfigurator().withDomainCreationConfigMap("initpvdomaincm");
 
     List<V1Job> jobs = runStepsAndGetJobs();
     V1Job job = jobs.get(0);
 
     assertThat(getJobPodSpec(job).getVolumes(),
-        hasItem(new V1Volume().name("initPvDomainCM-volume").configMap(
-            new V1ConfigMapVolumeSource().name("initPvDomainCM").defaultMode(365))));
+        hasItem(new V1Volume().name("initpvdomaincm-volume").configMap(
+            new V1ConfigMapVolumeSource().name("initpvdomaincm").defaultMode(365))));
     assertThat(getCreatedPodSpecContainers(jobs).get(0).getVolumeMounts(),
-        hasItem(new V1VolumeMount().name("initPvDomainCM-volume")
+        hasItem(new V1VolumeMount().name("initpvdomaincm-volume")
             .mountPath(WDTCONFIGMAP_MOUNT_PATH).readOnly(true)));
   }