From: saul.gill Date: Wed, 23 Apr 2025 10:54:59 +0000 (+0100) Subject: Add kong pv option and fix acm readiness X-Git-Tag: 0.3.0~6 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=7e01716f61730a976d2747144ba7478e41b515b9;p=nonrtric%2Fplt%2Frappmanager.git Add kong pv option and fix acm readiness Issue-ID: NONRTRIC-1070 Change-Id: Id453ed20f35bbb0f0140dd7e2d84dbf7dcf7f733 Signed-off-by: saul.gill --- diff --git a/scripts/install/install-acm.sh b/scripts/install/install-acm.sh index 491c1de..b6162a2 100755 --- a/scripts/install/install-acm.sh +++ b/scripts/install/install-acm.sh @@ -2,7 +2,7 @@ # ============LICENSE_START=============================================== # Copyright (C) 2023 Nordix Foundation. All rights reserved. -# Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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. @@ -72,6 +72,9 @@ bash $K8S_VERSIONS_FILE echo "Enabling the access for the clusterroles..." kubectl apply -f resources/acm-role-binding.yaml +# Replace the policy docker helm chart readiness with the latest version. +yq eval ".global.image.readiness"=\"onap/oom/readiness:6.1.2\" -i $ACM_VALUES_FILE + for element in "${ENABLE_COMPONENTS[@]}"; do echo "Enabling component $element" yq eval ".$element.enabled"="true" -i $ACM_VALUES_FILE diff --git a/scripts/install/install-nonrtric.sh b/scripts/install/install-nonrtric.sh index 8c84c96..cb17cae 100755 --- a/scripts/install/install-nonrtric.sh +++ b/scripts/install/install-nonrtric.sh @@ -2,7 +2,7 @@ # ============LICENSE_START=============================================== # Copyright (C) 2023 Nordix Foundation. All rights reserved. -# Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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. @@ -56,6 +56,13 @@ if [[ "$1" == "dev" ]]; then yq eval ".dmeparticipant.dmeparticipant.imagePullPolicy=\"Always\"" -i $RECEIPE_FILE fi +# There is no real way to disable the PV through the recipe file because kongstorage is deployed standalone. +# The below command will not work +#yq eval ".kongstorage.kongpv.enabled"="false" -i $RECEIPE_FILE +# So, we have to make the change to disable PV in the values.yaml file of kongstorage directly after pulling it +# from the git repo. This can be set to false if you want to use the default storage class. +yq eval ".kongpv.enabled"="true" -i dep/nonrtric/helm/kongstorage/values.yaml + sudo dep/bin/deploy-nonrtric -f $RECEIPE_FILE while [[ $TIME -lt 2000 ]]; do