Merge pull request #989 from oracle/owls-73066

OWLS-73066 - - WLDF SCALING IS NOT WORKING ON OPERATOR JENKINS RUN

Author: rjeberhard

src/scripts/scaling/scalingAction.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2017, 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+# Copyright 2017, 2019, 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.
 
 echo "called scalingAction.sh" >> scalingAction.log
@@ -117,8 +117,25 @@ INPUT
 port=`echo ${STATUS} | python cmds.py`
 echo "port: $port" >> scalingAction.log
 
+# Retrieve Custom Resource Definition for WebLogic domain
+CRD=`curl -v --cacert /var/run/secrets/kubernetes.io/serviceaccount/ca.crt -H "Authorization: Bearer $(cat /var/run/secrets/kubernetes.io/serviceaccount/token)" -X GET $kubernetes_master/apis/apiextensions.k8s.io/v1beta1/customresourcedefinitions/domains.weblogic.oracle`
+if [ $? -ne 0 ]
+  then
+    echo "Failed to retrieve Custom Resource Definition for WebLogic domain" >> scalingAction.log
+    echo "CRD: $CRD" >> scalingAction.log
+    exit 1
+fi
+
+# Find domain version
+cat > cmds.py << INPUT
+import sys, json
+print(json.load(sys.stdin)["spec"]["version"])
+INPUT
+domain_api_version=`echo ${CRD} | python cmds.py`
+echo "domain_api_version: $domain_api_version" >> scalingAction.log
+
 # Reteive Custom Resource Domain 
-DOMAIN=`curl -v --cacert /var/run/secrets/kubernetes.io/serviceaccount/ca.crt -H "Authorization: Bearer $(cat /var/run/secrets/kubernetes.io/serviceaccount/token)" $kubernetes_master/apis/weblogic.oracle/v2/namespaces/$wls_domain_namespace/domains/$domain_uid`
+DOMAIN=`curl -v --cacert /var/run/secrets/kubernetes.io/serviceaccount/ca.crt -H "Authorization: Bearer $(cat /var/run/secrets/kubernetes.io/serviceaccount/token)" $kubernetes_master/apis/weblogic.oracle/$domain_api_version/namespaces/$wls_domain_namespace/domains/$domain_uid`
 if [ $? -ne 0 ]
   then
     echo "Failed to retrieve WebLogic Domain Custom Resource Definition" >> scalingAction.log