Merge branch 'master' of https://github.com/oracle/weblogic-kubernetes-operator into prepare-doc-for-release

Author: markxnelson

site/shutdown-domain.md

@@ -3,10 +3,10 @@
 To shut down a domain, issue the following command:
 
 ```
-kubectl delete domain DOMAINUID
+kubectl delete domain DOMAINUID -n NAMESPACE
 ```
 
-Replace `DOMAINUID` with the UID of the target domain.
+Replace `DOMAINUID` with the UID of the target domain and `NAMESPACE` with the namespace it is running in.
 
 This command will remove the domain custom resource for the target domain.  The operator will be notified that the custom resource has been removed, and it will initiate the following actions:
 
@@ -15,3 +15,15 @@ This command will remove the domain custom resource for the target domain.  The
 *	Remove any services associated with the domain.
 
 The operator will not delete any of the content on the persistent volume.  This command simply shuts down the domain; it does not remove it.
+
+If the load balancer option was selected, there may also be one or more load balancer deployments in the namespace that can be removed.  For example, if there was one cluster in the domain, a command similar to this would be used to remove the load balancer for that cluster:
+
+```
+kubectl delete deployment domain1-cluster-1-traefik -n domain1
+```
+
+If there is only one domain in the namespace, then just deleting the namespace might be a faster option:
+
+```
+kubectl delete namespace NAMESPACE
+```

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

@@ -147,7 +147,7 @@ public HealthCheckHelper(ClientHolder client, String operatorNamespace, Collecti
     namespaceAccessChecks.put(AuthorizationProxy.Resource.ingresses, ingressOperations);
     namespaceAccessChecks.put(AuthorizationProxy.Resource.networkpolicies, networkPoliciesOperations);
     clusterAccessChecks.put(AuthorizationProxy.Resource.customresourcedefinitions, crudOperations);
-    
+
     clusterAccessChecks.put(AuthorizationProxy.Resource.domains, domainOperations);
 
     // Readonly resources
@@ -248,7 +248,9 @@ private void verifyK8sVersion() throws ApiException {
           // git version is of the form v1.7.5
           // Check the 3rd part of the version.
           String[] splitVersion = gitVersion.split("\\.");
-          if (Integer.parseInt(splitVersion[2]) < 5) {
+          // issue-36: gitVersion can be not just "v1.7.9" but also values like "v1.7.9+coreos.0" 
+          splitVersion = splitVersion[2].split("\\+");
+          if (Integer.parseInt(splitVersion[0]) < 5) {
             k8sMinVersion = false;
           }
         }