DS-47568: updating base images based on cp4d asset version of the rem…

RemoteDataPlane/deploy_operator.sh

@@ -2,9 +2,9 @@ OPERATOR_REGISTRY="icr.io/cpopen"
 OPERATOR_DIGEST="sha256:c0af884eca4c68411f53a00dfb4bd486092c99977e161ef47ac1ed0602fb5e20"
 kubernetesCLI="oc"
 
-supportedVersions="5.0.0 5.0.1 5.0.2 5.0.3 5.1.0"
-assetVersions="500 501 502 503 510"
-imageDigests="sha256:c0af884eca4c68411f53a00dfb4bd486092c99977e161ef47ac1ed0602fb5e20 sha256:e21e3503e6f7e212109d104a4ef5a505ee0ca172d77eda9f65174bb104b8be07 sha256:c2c27cf0826e1f96aa523ec68374680ce1f7f8f4cc5512c28962933b22aabbfe sha256:0797ab7ed8d6c9aa644a6ca9468b279248d8deaf8afdf905464d44f4dd1824c3 sha256:07327f8ce59d24990a00b45ea1b2393b64b1d299130372855b9de4ed69e608e2"
+supportedVersions="5.0.0 5.0.1 5.0.2 5.0.3 5.1.0 5.1.1"
+assetVersions="500 501 502 503 510 511"
+imageDigests="sha256:c0af884eca4c68411f53a00dfb4bd486092c99977e161ef47ac1ed0602fb5e20 sha256:e21e3503e6f7e212109d104a4ef5a505ee0ca172d77eda9f65174bb104b8be07 sha256:c2c27cf0826e1f96aa523ec68374680ce1f7f8f4cc5512c28962933b22aabbfe sha256:0797ab7ed8d6c9aa644a6ca9468b279248d8deaf8afdf905464d44f4dd1824c3 sha256:07327f8ce59d24990a00b45ea1b2393b64b1d299130372855b9de4ed69e608e2 sha256:be24dd5fb73e40177810a0ff71ee885ddf0883ab3f8b790a6620a705848406c5"
 version="5.0.0"
 
 verify_args() {

RemoteEngine/docker/dsengine.sh

@@ -64,6 +64,10 @@ CURL_CMD="curl"
 FORCE_RENEW='false'
 PROXY_CACERT_LOCATION="/px-storage/proxy.pem"
 
+supported_versions="5.1.0 5.1.1"
+asset_versions="510 511"
+px_runtime_digests="sha256:73180ec11026587bd4c04b3b7991834724085dd3a7a235ca93445e1c055b20ea sha256:3000c8a98cef44be354cad92ea7790d075f3fed7b7cde69c9d59f1d52f25499a"
+
 bold=$(tput bold)
 normal=$(tput sgr0)
 
@@ -699,9 +703,35 @@ retrieve_latest_px_version_from_runtime() {
     #echo "Getting PX Version to access Container Registry"
     #PX_VERSION=$($CURL_CMD -s -X GET -H "Authorization: Bearer $ACCESS_TOKEN" -H 'accept: application/json;charset=utf-8' "${GATEWAY_URL}/data_intg/v3/flows_runtime/remote_engine/versions" | jq -r '.versions[0].image_digests.px_runtime')
     #echo "Retrieved px-runtime digest = $PX_VERSION"
-    # set fixed version for 5.1.0
-    PX_VERSION="sha256:73180ec11026587bd4c04b3b7991834724085dd3a7a235ca93445e1c055b20ea"
-    echo "Retrieved px-runtime digest = $PX_VERSION"
+    check_version_for_cp4d
+}
+
+# retrieve asset version from cp4d to determine which digest to use
+check_version_for_cp4d() {
+  asset_version=$($CURL_CMD -s "${GATEWAY_URL}/data_intg/v3/assets/version")
+
+  versionsArray=(${supported_versions})
+  assetVersionsArray=(${asset_versions})
+  pxruntimeArray=(${px_runtime_digests})
+
+  if [ ${#versionsArray[@]} -ne ${#assetVersionsArray[@]} ]; then
+    echo "Mismatch size for '${supportedVersions}' and '${assetVersions}'"
+    exit 1
+  fi
+  arraylength=${#versionsArray[@]}
+
+  for (( i=0; i<${arraylength}; i++ ));
+  do
+    assetVersion="${assetVersionsArray[$i]}\.[0-9]+\.[0-9]+"
+    echo "${asset_version}" | grep -E "${assetVersion}" &> /dev/null
+    if [[ $? -eq 0 ]]; then
+      version="${versionsArray[$i]}"
+      PX_VERSION="${pxruntimeArray[$i]}"
+      echo "Version determined from control plane: $version"
+      echo "Retrieved px-runtime digest: $PX_VERSION"
+      break;
+    fi
+  done
 }
 
 get_all_px_versions_from_runtime() {

RemoteEngine/kubernetes/launch.sh

@@ -33,6 +33,12 @@ px_runtime_digest="sha256:7b1a21a5ddacb157ba3e27729c493769f344a70ad4ae64fc7d4501
 px_compute_digest="sha256:dc3236055473b2e45d22162bbbd8c2d12888d2b8fac8d803bd275965cbf1cc22"
 operator_digest="sha256:99e45f8f94834d8f0ed2e9dbba9724bd79726eb292c0f2cef30844c072e178dc"
 
+supported_versions="5.1.0 5.1.1"
+asset_versions="510 511"
+operator_digests="sha256:4d4e0e4355f2e24522880fd3a5ce2b0300096586d929a9d762b011dcfbdbec84 sha256:be24dd5fb73e40177810a0ff71ee885ddf0883ab3f8b790a6620a705848406c5"
+px_runtime_digests="sha256:73180ec11026587bd4c04b3b7991834724085dd3a7a235ca93445e1c055b20ea sha256:3000c8a98cef44be354cad92ea7790d075f3fed7b7cde69c9d59f1d52f25499a"
+px_compute_digests="sha256:f7b7bc0bb8f92ba6d621ac5891524fa8f33f080468cae87d542ddc78d49ea1b8 sha256:eb9979137e0c724b0087246757666c662e1d430c5590a1a9e674f887be62f699"
+
 # default username for icr.io when using apikey
 username="iamapikey"
 service_id="iamapikey"
@@ -726,10 +732,7 @@ generate_access_token() {
 
 # retrieve px image digests from ds-runtime for cp4d
 retrieve_px_image_digests_for_cp4d() {
-  # use fixed image digests for the initial 5.1.0 release
-  operator_digest="sha256:4d4e0e4355f2e24522880fd3a5ce2b0300096586d929a9d762b011dcfbdbec84"
-  px_runtime_digest="sha256:73180ec11026587bd4c04b3b7991834724085dd3a7a235ca93445e1c055b20ea"
-  px_compute_digest="sha256:f7b7bc0bb8f92ba6d621ac5891524fa8f33f080468cae87d542ddc78d49ea1b8"
+  check_version_for_cp4d
   if [[ "$DOCKER_REGISTRY" == "icr.io" ]]; then
     OPERATOR_REGISTRY="icr.io/cpopen"
     DOCKER_REGISTRY_PREFIX="cp.icr.io/cp/cpd"
@@ -770,6 +773,40 @@ retrieve_px_image_digests_for_cp4d() {
   # fi
 }
 
+# retrieve asset version from cp4d to determine which digests to use
+check_version_for_cp4d() {
+  asset_version=$($CURL_CMD -s "https://${DS_GATEWAY}/data_intg/v3/assets/version")
+
+  versionsArray=(${supported_versions})
+  assetVersionsArray=(${asset_versions})
+  operatorArray=(${operator_digests})
+  pxruntimeArray=(${px_runtime_digests})
+  pxcomputeArray=(${px_compute_digests})
+
+  if [ ${#versionsArray[@]} -ne ${#assetVersionsArray[@]} ]; then
+    echo "Mismatch size for '${supportedVersions}' and '${assetVersions}'"
+    exit 1
+  fi
+  arraylength=${#versionsArray[@]}
+
+  for (( i=0; i<${arraylength}; i++ ));
+  do
+    assetVersion="${assetVersionsArray[$i]}\.[0-9]+\.[0-9]+"
+    echo "${asset_version}" | grep -E "${assetVersion}" &> /dev/null
+    if [[ $? -eq 0 ]]; then
+      version="${versionsArray[$i]}"
+      operator_digest="${operatorArray[$i]}"
+      px_runtime_digest="${pxruntimeArray[$i]}"
+      px_compute_digest="${pxcomputeArray[$i]}"
+      echo "Version determined from control plane: $version"
+      echo "Retrieved operator digest: $operator_digest"
+      echo "Retrieved px-runtime digest: $px_runtime_digest"
+      echo "Retrieved px-compute digest: $px_compute_digest"
+      break;
+    fi
+  done
+}
+
 # retrieve px image digests from ds-runtime
 retrieve_px_image_digests() {
   if [ -z $api_key ]; then