Skip to content

OWLS-86630 - scalingAction.sh needs adjustment in finding latest API version #2130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 6, 2021
Merged

OWLS-86630 - scalingAction.sh needs adjustment in finding latest API version #2130

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95ee381
Use /apis instead of apis/apiextensions.k8s.io/v1beta1/customresource…
alai8 Jan 5, 2021
1a580c5
fixes issue in get_domain_api_version when using jq
alai8 Jan 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions src/scripts/scaling/scalingAction.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,29 +102,32 @@ port=$(echo "${STATUS}" | python cmds-$$.py)
# Retrieve the api version of the deployed Custom Resource Domain
function get_domain_api_version() {
# Retrieve Custom Resource Definition for WebLogic domain
local CRD=$(curl \
local APIS=$(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)
$kubernetes_master/apis)
if [ $? -ne 0 ]
then
trace "Failed to retrieve Custom Resource Definition for WebLogic domain"
trace "CRD: $CRD"
trace "Failed to retrieve list of APIs from Kubernetes cluster"
trace "APIS: $APIS"
exit 1
fi

# Find domain version
local domain_api_version
if [ -x "$(command -v jq)" ]; then
domain_api_version=$(echo "${CRD}" | jq -r '.spec.version')
local extractVersionCmd="(.groups[] | select (.name == \"weblogic.oracle\") | .preferredVersion.version)"
domain_api_version=$(echo "${APIS}" | jq -r "${extractVersionCmd}")
else
cat > cmds-$$.py << INPUT
import sys, json
print(json.load(sys.stdin)["spec"]["version"])
for i in json.load(sys.stdin)["groups"]:
if i["name"] == "weblogic.oracle":
print(i["preferredVersion"]["version"])
INPUT
domain_api_version=`echo ${CRD} | python cmds-$$.py`
domain_api_version=`echo ${APIS} | python cmds-$$.py`
fi
echo "$domain_api_version"
}
Expand Down Expand Up @@ -249,7 +252,7 @@ import sys, json
for i in json.load(sys.stdin)["items"]:
j = i["status"]["clusters"]
for index, cs in enumerate(j):
if j[index]["clusterName"] == "$clusterName"
if j[index]["clusterName"] == "$clusterName":
print j[index]["minimumReplicas"]
INPUT
minReplicas=`echo ${DOMAIN} | python cmds-$$.py`
Expand Down Expand Up @@ -438,16 +441,16 @@ in_cluster_startup=$(is_defined_in_clusters "$DOMAIN")
current_replica_count=$(get_replica_count "$in_cluster_startup" "$DOMAIN")
trace "current number of managed servers is $current_replica_count"

# Cleanup cmds-$$.py
[ -e cmds-$$.py ] && rm cmds-$$.py

# Calculate new managed server count
new_ms=$(calculate_new_ms_count "$scaling_action" "$current_replica_count" "$scaling_size")

# Verify the requested new managed server count is not less than
# configured minimum replica count for the cluster
verify_minimum_ms_count_for_cluster "$new_ms" "$DOMAIN" "$wls_cluster_name"

# Cleanup cmds-$$.py
[ -e cmds-$$.py ] && rm cmds-$$.py

# Create the scaling request body
request_body=$(get_request_body "$new_ms")

Expand Down Expand Up @@ -490,4 +493,4 @@ then
fi

# Cleanup generated operator PEM file
[ -e $pem_filename ] && rm $pem_filename
[ -e $pem_filename ] && rm $pem_filename