Merge branch 'develop' of https://github.com/oracle/weblogic-kubernetes-operator into april_cleanup_corrected

Author: russgold

README.md

@@ -161,7 +161,7 @@ Please refer to [Shutting down a domain](site/shutdown-domain.md) for informatio
 
 ## Load balancing with an Ingress controller or a web server
 
-You can choose a load balancer provider for your WebLogic domains running in a Kubernetes cluster. Please refer to Load balancing with Voyager Ingress Controller, [Load balancing with Traefik Ingress Controller](site/traefik.md), and [Load balancing with Apache Web Server](site/apache.md) for information about the current capabilities and setup instructions for each of the supported load balancers.
+You can choose a load balancer provider for your WebLogic domains running in a Kubernetes cluster. Please refer to Load balancing with Voyager Ingress Controller, [Load balancing with Traefik Ingress Controller](site/traefik.md), and [Load balancing with Apache HTTP Server](site/apache.md) for information about the current capabilities and setup instructions for each of the supported load balancers.
 
 
 [comment]: # (Exporting operator logs to ELK.  The operator provides an option to export its log files to the ELK stack. Please refer to [ELK integration]site/elk.md for information about this capability.)

kubernetes/create-weblogic-domain-inputs.yaml

@@ -1,6 +1,9 @@
 # Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
 # 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
+
 # Port number for admin server
 adminPort: 7001
 

kubernetes/create-weblogic-operator-inputs.yaml

@@ -1,6 +1,9 @@
 # Copyright 2017, 2018 Oracle Corporation and/or its affiliates.  All rights reserved.
 # 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
+
 # The name of the service account that the operator will use to
 # make requests to the Kubernetes API server.
 # The name must be lowercase

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

@@ -6,6 +6,7 @@ metadata:
   name: %DOMAIN_UID%-create-weblogic-domain-job-cm
   namespace: %NAMESPACE%
   labels:
+    weblogic.resourceVersion: domain-v1
     weblogic.domainUID: %DOMAIN_UID%
     weblogic.domainName: %DOMAIN_NAME%
 data:
@@ -266,6 +267,7 @@ spec:
   template:
     metadata:
       labels:
+        weblogic.resourceVersion: domain-v1
         weblogic.domainUID: %DOMAIN_UID%
         weblogic.domainName: %DOMAIN_NAME%
         app: %DOMAIN_UID%-create-weblogic-domain-job

kubernetes/internal/create-weblogic-domain.sh

@@ -107,6 +107,16 @@ function initAndValidateOutputDir {
     domain-custom-resource.yaml
 }
 
+#
+# Function to validate the version of the inputs file
+#
+function validateVersion {
+  local requiredVersion='create-weblogic-domain-inputs-v1'
+  if [ "${version}" != "${requiredVersion}" ]; then
+    validationError "Invalid version: \"${version}\".  Must be ${requiredVersion}."
+  fi
+}
+
 #
 # Function to ensure the domain uid is lowercase
 #
@@ -376,7 +386,8 @@ function initialize {
     weblogicCredentialsSecretName \
     namespace \
     javaOptions \
-    t3PublicAddress
+    t3PublicAddress \
+    version
 
   validateIntegerInputParamsSpecified \
     adminPort \
@@ -393,6 +404,7 @@ function initialize {
     exposeAdminT3Channel \
     exposeAdminNodePort
 
+  validateVersion
   validateDomainUid
   validateNamespace
   validateClusterName

kubernetes/internal/create-weblogic-operator.sh

@@ -117,10 +117,12 @@ function initialize {
   # Parse the common inputs file
   parseCommonInputs
 
-  validateInputParamsSpecified serviceAccount namespace targetNamespaces weblogicOperatorImage
+  validateInputParamsSpecified version serviceAccount namespace targetNamespaces weblogicOperatorImage
 
   validateBooleanInputParamsSpecified elkIntegrationEnabled
 
+  validateVersion
+
   validateServiceAccount
 
   validateNamespace
@@ -203,6 +205,16 @@ function validateImagePullPolicy {
   fi
 }
 
+#
+# Function to validate the version of the inputs file
+#
+function validateVersion {
+  local requiredVersion='create-weblogic-operator-inputs-v1'
+  if [ "${version}" != "${requiredVersion}" ]; then
+    validationError "Invalid version: \"${version}\".  Must be ${requiredVersion}."
+  fi
+}
+
 #
 # Function to validate the service account is lowercase
 #

kubernetes/internal/domain-custom-resource-template.yaml

@@ -9,6 +9,7 @@ metadata:
   name: %DOMAIN_UID%
   namespace: %NAMESPACE%
   labels:
+    weblogic.resourceVersion: domain-v1
     weblogic.domainUID: %DOMAIN_UID%
     weblogic.domainName: %DOMAIN_NAME%
 spec:

kubernetes/internal/generate-security-policy.sh

@@ -67,6 +67,7 @@ kind: Namespace
 metadata:
   name: ${NAMESPACE}
   labels:
+    weblogic.resourceVersion: operator-v1
     weblogic.operatorName: ${NAMESPACE}
 ---
 #
@@ -78,6 +79,7 @@ metadata:
   namespace: ${NAMESPACE}
   name: ${ACCOUNT_NAME}
   labels:
+    weblogic.resourceVersion: operator-v1
     weblogic.operatorName: ${NAMESPACE}
 ---
 EOF
@@ -91,6 +93,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: weblogic-operator-cluster-role
   labels:
+    weblogic.resourceVersion: operator-v1
     weblogic.operatorName: ${NAMESPACE}
 rules:
 - apiGroups: [""]
@@ -123,6 +126,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: weblogic-operator-cluster-role-nonresource
   labels:
+    weblogic.resourceVersion: operator-v1
     weblogic.operatorName: ${NAMESPACE}
 rules:
 - nonResourceURLs: ["/version/*"]
@@ -136,6 +140,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: ${NAMESPACE}-operator-rolebinding
   labels:
+    weblogic.resourceVersion: operator-v1
     weblogic.operatorName: ${NAMESPACE}
 subjects:
 - kind: ServiceAccount
@@ -152,6 +157,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: ${NAMESPACE}-operator-rolebinding-nonresource
   labels:
+    weblogic.resourceVersion: operator-v1
     weblogic.operatorName: ${NAMESPACE}
 subjects:
 - kind: ServiceAccount
@@ -168,6 +174,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: ${NAMESPACE}-operator-rolebinding-discovery
   labels:
+    weblogic.resourceVersion: operator-v1
     weblogic.operatorName: ${NAMESPACE}
 subjects:
 - kind: ServiceAccount
@@ -184,6 +191,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: ${NAMESPACE}-operator-rolebinding-auth-delegator
   labels:
+    weblogic.resourceVersion: operator-v1
     weblogic.operatorName: ${NAMESPACE}
 subjects:
 - kind: ServiceAccount
@@ -203,6 +211,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: weblogic-operator-namespace-role
   labels:
+    weblogic.resourceVersion: operator-v1
     weblogic.operatorName: ${NAMESPACE}
 rules:
 - apiGroups: [""]
@@ -245,6 +254,7 @@ metadata:
   name: weblogic-operator-rolebinding
   namespace: ${i}
   labels:
+    weblogic.resourceVersion: operator-v1
     weblogic.operatorName: ${NAMESPACE}
 subjects:
 - kind: ServiceAccount

kubernetes/internal/voyager-ingress-template.yaml

@@ -4,6 +4,7 @@ metadata:
   name: %DOMAIN_UID%-voyager
   namespace: %NAMESPACE%
   labels:
+    weblogic.resourceVersion: voyager-load-balancer-v1
     weblogic.domainUID: %DOMAIN_UID%
     weblogic.domainName: %DOMAIN_NAME%
   annotations:
@@ -27,6 +28,7 @@ metadata:
   namespace: %NAMESPACE%
   labels:
     app: %DOMAIN_UID%-voyager-stats
+    weblogic.resourceVersion: voyager-load-balancer-v1
     weblogic.domainUID: %DOMAIN_UID%
     weblogic.domainName: %DOMAIN_NAME%
 spec:

kubernetes/internal/weblogic-domain-apache-security-template.yaml

@@ -4,6 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: %DOMAIN_UID%-apache-webtier
   labels:
+    weblogic.resourceVersion: apache-load-balancer-v1
     weblogic.domainUID: %DOMAIN_UID%
     weblogic.domainName: %DOMAIN_NAME%
 rules:
@@ -32,6 +33,7 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: %DOMAIN_UID%-apache-webtier
   labels:
+    weblogic.resourceVersion: apache-load-balancer-v1
     weblogic.domainUID: %DOMAIN_UID%
     weblogic.domainName: %DOMAIN_NAME%
 roleRef: