From 0d3cd494b4ed3a7f7a64ca6d0fd5c51c022aa5bd Mon Sep 17 00:00:00 2001 From: "aravind.est" Date: Wed, 18 Jun 2025 16:30:08 +0100 Subject: [PATCH] Fix rAppmanager installation to work with latest policy helm charts Installation scripts updated to work with latest policy helm charts. Issue-ID: INT-170 Change-Id: I619f2543de80fd3a5aeff538e5aba00837234b67 Signed-off-by: aravind.est --- scripts/install/install-acm.sh | 9 +++++++-- scripts/install/install-kserve.sh | 7 ++++--- scripts/install/uninstall-all.sh | 6 +++--- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/scripts/install/install-acm.sh b/scripts/install/install-acm.sh index b6162a2..9db3be0 100755 --- a/scripts/install/install-acm.sh +++ b/scripts/install/install-acm.sh @@ -24,7 +24,8 @@ ENABLE_COMPONENTS=(policy-models-simulator policy-clamp-runtime-acm policy-clamp DISABLE_COMPONENTS=(policy-api policy-pap policy-apex-pdp policy-pdpd-cl policy-xacml-pdp policy-distribution policy-clamp-ac-pf-ppnt policy-clamp-ac-http-ppnt) ACM_VALUES_FILE="docker/helm/policy/values.yaml" -A1PMS_CONFIGURATION_FILE="docker/helm/policy/components/policy-clamp-ac-a1pms-ppnt/resources/config/A1pmsParticipantParameters.yaml" +A1PMS_CONFIGURATION_FILE="docker/helm/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml" +POLICY_RUNTIME_CONFIGURATION_FILE="docker/helm/policy/components/policy-clamp-runtime-acm/values.yaml" K8S_CONFIGURATION_FILE="docker/helm/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml" K8S_VERSIONS_FILE="docker/compose/get-k8s-versions.sh" KAFKA_DIR="docker/helm/cp-kafka" @@ -37,7 +38,7 @@ CHART_REPO_GET_URI=${CHART_REPO_GET_URI:-'http://'$IP_ADDRESS':8879/charts'} function wait_for_pods_to_be_running() { while [[ $TIME -lt 2000 ]]; do - NONRTRIC_PODS=$(kubectl get pods -n default --field-selector=status.phase!=Running,status.phase!=Succeeded --no-headers) + NONRTRIC_PODS=$(kubectl get pods -n default --field-selector=status.phase!=Running,status.phase!=Succeeded,status.phase!=Failed --no-headers) if [[ -z "$NONRTRIC_PODS" ]]; then echo "All Components are running." kubectl get pods -n default @@ -91,6 +92,10 @@ yq eval '.a1pms.baseUrl="'$A1PMS_HOST'"' -i $A1PMS_CONFIGURATION_FILE echo "Updating the k8s participant repo list" yq eval '.repoList.helm.repos += {"repoName":"local","address":"'$CHART_REPO_GET_URI'"}' -i $K8S_CONFIGURATION_FILE +echo "Updating Policy Runtime timeout configuration" +yq eval '.runtime.participantParameters.maxStatusWaitMs=900000' -i $POLICY_RUNTIME_CONFIGURATION_FILE +yq eval '.runtime.participantParameters.maxOperationWaitMs=990000' -i $POLICY_RUNTIME_CONFIGURATION_FILE + echo "Building policy helm charts..." helm dependency build docker/helm/policy/ diff --git a/scripts/install/install-kserve.sh b/scripts/install/install-kserve.sh index 0753e4f..9bf0eb4 100755 --- a/scripts/install/install-kserve.sh +++ b/scripts/install/install-kserve.sh @@ -2,6 +2,7 @@ # ============LICENSE_START=============================================== # Copyright (C) 2023 Nordix Foundation. All rights reserved. +# Copyright (C) 2023-2025 OpenInfra Foundation Europe. All rights reserved. # ======================================================================== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -51,9 +52,9 @@ if [ -z "$KSERVE_CRD_RESPONSE" ]; then done echo "Waiting for cert-manager to get initialized..." - echo "Installing Kserve v0.10.0 ..." - kubectl apply -f https://github.com/kserve/kserve/releases/download/v0.10.0/kserve.yaml - kubectl apply -f https://github.com/kserve/kserve/releases/download/v0.10.0/kserve-runtimes.yaml + echo "Installing Kserve v0.11.2 ..." + kubectl apply -f https://github.com/kserve/kserve/releases/download/v0.11.2/kserve.yaml + kubectl apply -f https://github.com/kserve/kserve/releases/download/v0.11.2/kserve-runtimes.yaml echo "Patching Kserve ..." kubectl patch configmap/inferenceservice-config -n kserve --type=strategic -p '{"data": {"deploy": "{\"defaultDeploymentMode\": \"RawDeployment\"}"}}' echo "Kserve installation completed." diff --git a/scripts/install/uninstall-all.sh b/scripts/install/uninstall-all.sh index 3963254..892f357 100755 --- a/scripts/install/uninstall-all.sh +++ b/scripts/install/uninstall-all.sh @@ -2,7 +2,7 @@ # ============LICENSE_START=============================================== # Copyright (C) 2023 Nordix Foundation. All rights reserved. -# Copyright (C) 2024 OpenInfra Foundation Europe. All rights reserved. +# Copyright (C) 2024-2025 OpenInfra Foundation Europe. All rights reserved. # ======================================================================== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -32,8 +32,8 @@ echo "Uninstalling NONRTRIC Components..." sudo dep/bin/undeploy-nonrtric echo "Uninstalling Kserve Components..." -kubectl delete -f https://github.com/kserve/kserve/releases/download/v0.10.0/kserve.yaml -kubectl delete -f https://github.com/kserve/kserve/releases/download/v0.10.0/kserve-runtimes.yaml +kubectl delete -f https://github.com/kserve/kserve/releases/download/v0.11.2/kserve.yaml +kubectl delete -f https://github.com/kserve/kserve/releases/download/v0.11.2/kserve-runtimes.yaml kubectl delete -f https://github.com/cert-manager/cert-manager/releases/download/v1.12.0/cert-manager.yaml kubectl delete ns cert-manager helm uninstall istiod -n istio-system -- 2.16.6