Switch version strings from e.g. operator/v1 to operator-v1 since metadata labels are not allowed to include / characters

moreaut · moreaut · commit 6043eb8b3595 · 2018-05-01T14:57:46.000-04:00
diff --git a/kubernetes/create-weblogic-domain-inputs.yaml b/kubernetes/create-weblogic-domain-inputs.yaml
@@ -2,7 +2,7 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 
 # The version of this inputs file.  Do not modify.
-version: create-weblogic-domain-inputs/v1
+version: create-weblogic-domain-inputs-v1
 
 # Port number for admin server
 adminPort: 7001
diff --git a/kubernetes/create-weblogic-operator-inputs.yaml b/kubernetes/create-weblogic-operator-inputs.yaml
@@ -2,7 +2,7 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 
 # The version of this inputs file.  Do not modify.
-version: create-weblogic-operator-inputs/v1
+version: create-weblogic-operator-inputs-v1
 
 # The name of the service account that the operator will use to
 # make requests to the Kubernetes API server.
diff --git a/kubernetes/internal/create-weblogic-domain-job-template.yaml b/kubernetes/internal/create-weblogic-domain-job-template.yaml
@@ -6,7 +6,7 @@ metadata:
   name: %DOMAIN_UID%-create-weblogic-domain-job-cm
   namespace: %NAMESPACE%
   labels:
-    weblogic.resourceVersion: domain/v1
+    weblogic.resourceVersion: domain-v1
     weblogic.domainUID: %DOMAIN_UID%
     weblogic.domainName: %DOMAIN_NAME%
 data:
@@ -267,7 +267,7 @@ spec:
   template:
     metadata:
       labels:
-        weblogic.resourceVersion: domain/v1
+        weblogic.resourceVersion: domain-v1
         weblogic.domainUID: %DOMAIN_UID%
         weblogic.domainName: %DOMAIN_NAME%
         app: %DOMAIN_UID%-create-weblogic-domain-job
diff --git a/kubernetes/internal/create-weblogic-domain.sh b/kubernetes/internal/create-weblogic-domain.sh
@@ -111,7 +111,7 @@ function initAndValidateOutputDir {
 # Function to validate the version of the inputs file
 #
 function validateVersion {
-  local requiredVersion='create-weblogic-domain-inputs/v1'
+  local requiredVersion='create-weblogic-domain-inputs-v1'
   if [ "${version}" != "${requiredVersion}" ]; then
     validationError "Invalid version: \"${version}\".  Must be ${requiredVersion}."
   fi
diff --git a/kubernetes/internal/create-weblogic-operator.sh b/kubernetes/internal/create-weblogic-operator.sh
@@ -209,7 +209,7 @@ function validateImagePullPolicy {
 # Function to validate the version of the inputs file
 #
 function validateVersion {
-  local requiredVersion='create-weblogic-operator-inputs/v1'
+  local requiredVersion='create-weblogic-operator-inputs-v1'
   if [ "${version}" != "${requiredVersion}" ]; then
     validationError "Invalid version: \"${version}\".  Must be ${requiredVersion}."
   fi
diff --git a/kubernetes/internal/domain-custom-resource-template.yaml b/kubernetes/internal/domain-custom-resource-template.yaml
@@ -9,7 +9,7 @@ metadata:
   name: %DOMAIN_UID%
   namespace: %NAMESPACE%
   labels:
-    weblogic.resourceVersion: domain/v1
+    weblogic.resourceVersion: domain-v1
     weblogic.domainUID: %DOMAIN_UID%
     weblogic.domainName: %DOMAIN_NAME%
 spec:
diff --git a/kubernetes/internal/generate-security-policy.sh b/kubernetes/internal/generate-security-policy.sh
@@ -67,7 +67,7 @@ kind: Namespace
 metadata:
   name: ${NAMESPACE}
   labels:
-    weblogic.resourceVersion: operator/v1
+    weblogic.resourceVersion: operator-v1
     weblogic.operatorName: ${NAMESPACE}
 ---
 #
@@ -79,7 +79,7 @@ metadata:
   namespace: ${NAMESPACE}
   name: ${ACCOUNT_NAME}
   labels:
-    weblogic.resourceVersion: operator/v1
+    weblogic.resourceVersion: operator-v1
     weblogic.operatorName: ${NAMESPACE}
 ---
 EOF
@@ -93,7 +93,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: weblogic-operator-cluster-role
   labels:
-    weblogic.resourceVersion: operator/v1
+    weblogic.resourceVersion: operator-v1
     weblogic.operatorName: ${NAMESPACE}
 rules:
 - apiGroups: [""]
@@ -126,7 +126,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: weblogic-operator-cluster-role-nonresource
   labels:
-    weblogic.resourceVersion: operator/v1
+    weblogic.resourceVersion: operator-v1
     weblogic.operatorName: ${NAMESPACE}
 rules:
 - nonResourceURLs: ["/version/*"]
@@ -140,7 +140,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: ${NAMESPACE}-operator-rolebinding
   labels:
-    weblogic.resourceVersion: operator/v1
+    weblogic.resourceVersion: operator-v1
     weblogic.operatorName: ${NAMESPACE}
 subjects:
 - kind: ServiceAccount
@@ -157,7 +157,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: ${NAMESPACE}-operator-rolebinding-nonresource
   labels:
-    weblogic.resourceVersion: operator/v1
+    weblogic.resourceVersion: operator-v1
     weblogic.operatorName: ${NAMESPACE}
 subjects:
 - kind: ServiceAccount
@@ -174,7 +174,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: ${NAMESPACE}-operator-rolebinding-discovery
   labels:
-    weblogic.resourceVersion: operator/v1
+    weblogic.resourceVersion: operator-v1
     weblogic.operatorName: ${NAMESPACE}
 subjects:
 - kind: ServiceAccount
@@ -191,7 +191,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: ${NAMESPACE}-operator-rolebinding-auth-delegator
   labels:
-    weblogic.resourceVersion: operator/v1
+    weblogic.resourceVersion: operator-v1
     weblogic.operatorName: ${NAMESPACE}
 subjects:
 - kind: ServiceAccount
@@ -211,7 +211,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: weblogic-operator-namespace-role
   labels:
-    weblogic.resourceVersion: operator/v1
+    weblogic.resourceVersion: operator-v1
     weblogic.operatorName: ${NAMESPACE}
 rules:
 - apiGroups: [""]
@@ -254,7 +254,7 @@ metadata:
   name: weblogic-operator-rolebinding
   namespace: ${i}
   labels:
-    weblogic.resourceVersion: operator/v1
+    weblogic.resourceVersion: operator-v1
     weblogic.operatorName: ${NAMESPACE}
 subjects:
 - kind: ServiceAccount
diff --git a/kubernetes/internal/voyager-ingress-template.yaml b/kubernetes/internal/voyager-ingress-template.yaml
@@ -4,7 +4,7 @@ metadata:
   name: %DOMAIN_UID%-voyager
   namespace: %NAMESPACE%
   labels:
-    weblogic.resourceVersion: voyager-load-balancer/v1
+    weblogic.resourceVersion: voyager-load-balancer-v1
     weblogic.domainUID: %DOMAIN_UID%
     weblogic.domainName: %DOMAIN_NAME%
   annotations:
@@ -28,7 +28,7 @@ metadata:
   namespace: %NAMESPACE%
   labels:
     app: %DOMAIN_UID%-voyager-stats
-    weblogic.resourceVersion: voyager-load-balancer/v1
+    weblogic.resourceVersion: voyager-load-balancer-v1
     weblogic.domainUID: %DOMAIN_UID%
     weblogic.domainName: %DOMAIN_NAME%
 spec:
diff --git a/kubernetes/internal/weblogic-domain-apache-security-template.yaml b/kubernetes/internal/weblogic-domain-apache-security-template.yaml
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: %DOMAIN_UID%-apache-webtier
   labels:
-    weblogic.resourceVersion: apache-load-balancer/v1
+    weblogic.resourceVersion: apache-load-balancer-v1
     weblogic.domainUID: %DOMAIN_UID%
     weblogic.domainName: %DOMAIN_NAME%
 rules:
@@ -33,7 +33,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: %DOMAIN_UID%-apache-webtier
   labels:
-    weblogic.resourceVersion: apache-load-balancer/v1
+    weblogic.resourceVersion: apache-load-balancer-v1
     weblogic.domainUID: %DOMAIN_UID%
     weblogic.domainName: %DOMAIN_NAME%
 roleRef:
diff --git a/kubernetes/internal/weblogic-domain-apache-template.yaml b/kubernetes/internal/weblogic-domain-apache-template.yaml
@@ -5,7 +5,7 @@ metadata:
   name: %DOMAIN_UID%-apache-webtier
   namespace: %NAMESPACE%
   labels:
-    weblogic.resourceVersion: apache-load-balancer/v1
+    weblogic.resourceVersion: apache-load-balancer-v1
     weblogic.domainUID: %DOMAIN_UID%
     weblogic.domainName: %DOMAIN_NAME%
     app: apache-webtier
@@ -16,7 +16,7 @@ metadata:
   name: %DOMAIN_UID%-apache-webtier
   namespace: %NAMESPACE%
   labels:
-    weblogic.resourceVersion: apache-load-balancer/v1
+    weblogic.resourceVersion: apache-load-balancer-v1
     weblogic.domainUID: %DOMAIN_UID%
     weblogic.domainName: %DOMAIN_NAME%
     app: apache-webtier
@@ -30,7 +30,7 @@ spec:
   template:
     metadata:
       labels:
-        weblogic.resourceVersion: apache-load-balancer/v1
+        weblogic.resourceVersion: apache-load-balancer-v1
         weblogic.domainUID: %DOMAIN_UID%
         weblogic.domainName: %DOMAIN_NAME%
         app: apache-webtier
@@ -81,7 +81,7 @@ metadata:
   name: %DOMAIN_UID%-apache-webtier
   namespace: %NAMESPACE%
   labels:
-    weblogic.resourceVersion: apache-load-balancer/v1
+    weblogic.resourceVersion: apache-load-balancer-v1
     weblogic.domainUID: %DOMAIN_UID%
     weblogic.domainName: %DOMAIN_NAME%
 spec:
diff --git a/kubernetes/internal/weblogic-domain-pv-template.yaml b/kubernetes/internal/weblogic-domain-pv-template.yaml
@@ -6,7 +6,7 @@ kind: PersistentVolume
 metadata:
   name: %DOMAIN_UID%-weblogic-domain-pv
   labels:
-    weblogic.resourceVersion: domain/v1
+    weblogic.resourceVersion: domain-v1
     weblogic.domainUID: %DOMAIN_UID%
     weblogic.domainName: %DOMAIN_NAME%
 spec:
diff --git a/kubernetes/internal/weblogic-domain-pvc-template.yaml b/kubernetes/internal/weblogic-domain-pvc-template.yaml
@@ -7,7 +7,7 @@ metadata:
   name: %DOMAIN_UID%-weblogic-domain-pvc
   namespace: %NAMESPACE%
   labels:
-    weblogic.resourceVersion: domain/v1
+    weblogic.resourceVersion: domain-v1
     weblogic.domainUID: %DOMAIN_UID%
     weblogic.domainName: %DOMAIN_NAME%
 spec:
diff --git a/kubernetes/internal/weblogic-domain-traefik-security-template.yaml b/kubernetes/internal/weblogic-domain-traefik-security-template.yaml
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik
   labels:
-    weblogic.resourceVersion: traefik-load-balancer/v1
+    weblogic.resourceVersion: traefik-load-balancer-v1
     weblogic.domainUID: %DOMAIN_UID%
     weblogic.domainName: %DOMAIN_NAME%
     weblogic.clusterName: %CLUSTER_NAME%
@@ -34,7 +34,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik
   labels:
-    weblogic.resourceVersion: traefik-load-balancer/v1
+    weblogic.resourceVersion: traefik-load-balancer-v1
     weblogic.domainUID: %DOMAIN_UID%
     weblogic.domainName: %DOMAIN_NAME%
     weblogic.clusterName: %CLUSTER_NAME%
diff --git a/kubernetes/internal/weblogic-domain-traefik-template.yaml b/kubernetes/internal/weblogic-domain-traefik-template.yaml
@@ -5,7 +5,7 @@ metadata:
   name: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik
   namespace: %NAMESPACE%
   labels:
-    weblogic.resourceVersion: traefik-load-balancer/v1
+    weblogic.resourceVersion: traefik-load-balancer-v1
     weblogic.domainUID: %DOMAIN_UID%
     weblogic.domainName: %DOMAIN_NAME%
     weblogic.clusterName: %CLUSTER_NAME%
@@ -16,7 +16,7 @@ metadata:
   name: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik
   namespace: %NAMESPACE%
   labels:
-    weblogic.resourceVersion: traefik-load-balancer/v1
+    weblogic.resourceVersion: traefik-load-balancer-v1
     weblogic.domainUID: %DOMAIN_UID%
     weblogic.domainName: %DOMAIN_NAME%
     weblogic.clusterName: %CLUSTER_NAME%
@@ -29,7 +29,7 @@ spec:
   template:
     metadata:
       labels:
-        weblogic.resourceVersion: traefik-load-balancer/v1
+        weblogic.resourceVersion: traefik-load-balancer-v1
         weblogic.domainUID: %DOMAIN_UID%
         weblogic.domainName: %DOMAIN_NAME%
         weblogic.clusterName: %CLUSTER_NAME%
@@ -85,7 +85,7 @@ metadata:
   name: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik-cm
   namespace: %NAMESPACE%
   labels:
-    weblogic.resourceVersion: traefik-load-balancer/v1
+    weblogic.resourceVersion: traefik-load-balancer-v1
     weblogic.domainUID: %DOMAIN_UID%
     weblogic.domainName: %DOMAIN_NAME%
     weblogic.clusterName: %CLUSTER_NAME%
@@ -109,7 +109,7 @@ metadata:
   name: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik
   namespace: %NAMESPACE%
   labels:
-    weblogic.resourceVersion: traefik-load-balancer/v1
+    weblogic.resourceVersion: traefik-load-balancer-v1
     weblogic.domainUID: %DOMAIN_UID%
     weblogic.domainName: %DOMAIN_NAME%
     weblogic.clusterName: %CLUSTER_NAME%
@@ -130,7 +130,7 @@ metadata:
   name: %DOMAIN_UID%-%CLUSTER_NAME_LC%-traefik-dashboard
   namespace: %NAMESPACE%
   labels:
-    weblogic.resourceVersion: traefik-load-balancer/v1
+    weblogic.resourceVersion: traefik-load-balancer-v1
     weblogic.domainUID: %DOMAIN_UID%
     weblogic.domainName: %DOMAIN_NAME%
     weblogic.clusterName: %CLUSTER_NAME%
diff --git a/kubernetes/internal/weblogic-operator-template.yaml b/kubernetes/internal/weblogic-operator-template.yaml
@@ -14,7 +14,7 @@ metadata:
   name: weblogic-operator-cm
   namespace: %NAMESPACE%
   labels:
-    weblogic.resourceVersion: operator/v1
+    weblogic.resourceVersion: operator-v1
     weblogic.operatorName: %NAMESPACE%
 data:
   serviceaccount: %ACCOUNT_NAME%
@@ -29,7 +29,7 @@ metadata:
   name: weblogic-operator-secrets
   namespace: %NAMESPACE%
   labels:
-    weblogic.resourceVersion: operator/v1
+    weblogic.resourceVersion: operator-v1
     weblogic.operatorName: %NAMESPACE%
 type: Opaque
 data:
@@ -44,14 +44,14 @@ metadata:
   # set the namespace that you want the operator deployed in here
   namespace: %NAMESPACE%
   labels:
-    weblogic.resourceVersion: operator/v1
+    weblogic.resourceVersion: operator-v1
     weblogic.operatorName: %NAMESPACE%
 spec:
   replicas: 1
   template:
     metadata:
      labels:
-        weblogic.resourceVersion: operator/v1
+        weblogic.resourceVersion: operator-v1
         weblogic.operatorName: %NAMESPACE%
         app: weblogic-operator
     spec:
@@ -133,7 +133,7 @@ spec:
 %EXTERNAL_OPERATOR_SERVICE_PREFIX%  name: external-weblogic-operator-svc
 %EXTERNAL_OPERATOR_SERVICE_PREFIX%  namespace: %NAMESPACE%
 %EXTERNAL_OPERATOR_SERVICE_PREFIX%  labels:
-%EXTERNAL_OPERATOR_SERVICE_PREFIX%    weblogic.resourceVersion: operator/v1
+%EXTERNAL_OPERATOR_SERVICE_PREFIX%    weblogic.resourceVersion: operator-v1
 %EXTERNAL_OPERATOR_SERVICE_PREFIX%    weblogic.operatorName: %NAMESPACE%
 %EXTERNAL_OPERATOR_SERVICE_PREFIX%spec:
 %EXTERNAL_OPERATOR_SERVICE_PREFIX%  type: NodePort
@@ -156,7 +156,7 @@ metadata:
   name: internal-weblogic-operator-svc
   namespace: %NAMESPACE%
   labels:
-    weblogic.resourceVersion: operator/v1
+    weblogic.resourceVersion: operator-v1
     weblogic.operatorName: %NAMESPACE%
 spec:
   type: ClusterIP
diff --git a/operator/src/main/java/oracle/kubernetes/operator/VersionConstants.java b/operator/src/main/java/oracle/kubernetes/operator/VersionConstants.java
@@ -4,11 +4,11 @@
 package oracle.kubernetes.operator;
 
 public interface VersionConstants {
-  public static final String CREATE_WEBLOGIC_OPERATOR_INPUTS_V1 = "create-weblogic-operator-inputs/v1";
-  public static final String CREATE_WEBLOGIC_DOMAIN_INPUTS_V1 = "create-weblogic-domain-inputs/v1";
-  public static final String OPERATOR_V1 = "operator/v1";
-  public static final String DOMAIN_V1 = "domain/v1";
-  public static final String VOYAGER_LOAD_BALANCER_V1 = "voyager-load-balancer/v1";
-  public static final String APACHE_LOAD_BALANCER_V1 = "apache-load-balancer/v1";
-  public static final String TRAEFIK_LOAD_BALANCER_V1 = "traefik-load-balancer/v1";
+  public static final String CREATE_WEBLOGIC_OPERATOR_INPUTS_V1 = "create-weblogic-operator-inputs-v1";
+  public static final String CREATE_WEBLOGIC_DOMAIN_INPUTS_V1 = "create-weblogic-domain-inputs-v1";
+  public static final String OPERATOR_V1 = "operator-v1";
+  public static final String DOMAIN_V1 = "domain-v1";
+  public static final String VOYAGER_LOAD_BALANCER_V1 = "voyager-load-balancer-v1";
+  public static final String APACHE_LOAD_BALANCER_V1 = "apache-load-balancer-v1";
+  public static final String TRAEFIK_LOAD_BALANCER_V1 = "traefik-load-balancer-v1";
 }

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ function initAndValidateOutputDir {`
`111`	`111`	`# Function to validate the version of the inputs file`
`112`	`112`	`#`
`113`	`113`	`function validateVersion {`
`114`		`- local requiredVersion='create-weblogic-domain-inputs/v1'`
	`114`	`+ local requiredVersion='create-weblogic-domain-inputs-v1'`
`115`	`115`	`if [ "${version}" != "${requiredVersion}" ]; then`
`116`	`116`	`validationError "Invalid version: \"${version}\". Must be ${requiredVersion}."`
`117`	`117`	`fi`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ function validateImagePullPolicy {`
`209`	`209`	`# Function to validate the version of the inputs file`
`210`	`210`	`#`
`211`	`211`	`function validateVersion {`
`212`		`- local requiredVersion='create-weblogic-operator-inputs/v1'`
	`212`	`+ local requiredVersion='create-weblogic-operator-inputs-v1'`
`213`	`213`	`if [ "${version}" != "${requiredVersion}" ]; then`
`214`	`214`	`validationError "Invalid version: \"${version}\". Must be ${requiredVersion}."`
`215`	`215`	`fi`