From 749071f4a2328efe9090531b83e2e43a8024cc15 Mon Sep 17 00:00:00 2001 From: msvinaykumar Date: Mon, 9 Dec 2024 15:40:03 +0530 Subject: [PATCH] incorporated review comments Signed-off-by: msvinaykumar --- .../minikube/kruize-crc-minikube.yaml | 1 - .../openshift/kruize-crc-openshift.yaml | 1 - .../aks/kruize-crc-aks.yaml | 1 - .../minikube/kruize-crc-minikube.yaml | 1 - .../openshift/kruize-crc-openshift.yaml | 1 - tests/scripts/common/common_functions.sh | 13 ------------- 6 files changed, 18 deletions(-) diff --git a/manifests/crc/BYODB-installation/minikube/kruize-crc-minikube.yaml b/manifests/crc/BYODB-installation/minikube/kruize-crc-minikube.yaml index d7da66483..3b7cce4f1 100644 --- a/manifests/crc/BYODB-installation/minikube/kruize-crc-minikube.yaml +++ b/manifests/crc/BYODB-installation/minikube/kruize-crc-minikube.yaml @@ -33,7 +33,6 @@ data: "savetodb": "true", "dbdriver": "jdbc:postgresql://", "plots": "true", - "local": "true", "logAllHttpReqAndResp": "true", "recommendationsURL" : "http://kruize.monitoring.svc.cluster.local:8080/generateRecommendations?experiment_name=%s", "experimentsURL" : "http://kruize.monitoring.svc.cluster.local:8080/createExperiment", diff --git a/manifests/crc/BYODB-installation/openshift/kruize-crc-openshift.yaml b/manifests/crc/BYODB-installation/openshift/kruize-crc-openshift.yaml index 81dcf9214..052d267df 100644 --- a/manifests/crc/BYODB-installation/openshift/kruize-crc-openshift.yaml +++ b/manifests/crc/BYODB-installation/openshift/kruize-crc-openshift.yaml @@ -46,7 +46,6 @@ data: "savetodb": "true", "dbdriver": "jdbc:postgresql://", "plots": "true", - "local": "true", "logAllHttpReqAndResp": "true", "recommendationsURL" : "http://kruize.openshift-tuning.svc.cluster.local:8080/generateRecommendations?experiment_name=%s", "experimentsURL" : "http://kruize.openshift-tuning.svc.cluster.local:8080/createExperiment", diff --git a/manifests/crc/default-db-included-installation/aks/kruize-crc-aks.yaml b/manifests/crc/default-db-included-installation/aks/kruize-crc-aks.yaml index 2541a16ca..3d21a4acc 100644 --- a/manifests/crc/default-db-included-installation/aks/kruize-crc-aks.yaml +++ b/manifests/crc/default-db-included-installation/aks/kruize-crc-aks.yaml @@ -97,7 +97,6 @@ data: "savetodb": "true", "dbdriver": "jdbc:postgresql://", "plots": "true", - "local": "true", "logAllHttpReqAndResp": "true", "recommendationsURL" : "http://kruize.monitoring.svc.cluster.local:8080/generateRecommendations?experiment_name=%s", "experimentsURL" : "http://kruize.monitoring.svc.cluster.local:8080/createExperiment", diff --git a/manifests/crc/default-db-included-installation/minikube/kruize-crc-minikube.yaml b/manifests/crc/default-db-included-installation/minikube/kruize-crc-minikube.yaml index 0e2a0c8ed..ff2557dc8 100644 --- a/manifests/crc/default-db-included-installation/minikube/kruize-crc-minikube.yaml +++ b/manifests/crc/default-db-included-installation/minikube/kruize-crc-minikube.yaml @@ -111,7 +111,6 @@ data: "savetodb": "true", "dbdriver": "jdbc:postgresql://", "plots": "true", - "local": "true", "isROSEnabled": "false", "logAllHttpReqAndResp": "true", "recommendationsURL" : "http://kruize.monitoring.svc.cluster.local:8080/generateRecommendations?experiment_name=%s", diff --git a/manifests/crc/default-db-included-installation/openshift/kruize-crc-openshift.yaml b/manifests/crc/default-db-included-installation/openshift/kruize-crc-openshift.yaml index a1da660e7..863d2a696 100644 --- a/manifests/crc/default-db-included-installation/openshift/kruize-crc-openshift.yaml +++ b/manifests/crc/default-db-included-installation/openshift/kruize-crc-openshift.yaml @@ -105,7 +105,6 @@ data: "savetodb": "true", "dbdriver": "jdbc:postgresql://", "plots": "true", - "local": "true", "isROSEnabled": "false", "logAllHttpReqAndResp": "true", "recommendationsURL" : "http://kruize.openshift-tuning.svc.cluster.local:8080/generateRecommendations?experiment_name=%s", diff --git a/tests/scripts/common/common_functions.sh b/tests/scripts/common/common_functions.sh index 977dde70f..cc0f329ce 100755 --- a/tests/scripts/common/common_functions.sh +++ b/tests/scripts/common/common_functions.sh @@ -1894,13 +1894,6 @@ function kruize_local_patch() { CRC_DIR="./manifests/crc/default-db-included-installation" KRUIZE_CRC_DEPLOY_MANIFEST_OPENSHIFT="${CRC_DIR}/openshift/kruize-crc-openshift.yaml" KRUIZE_CRC_DEPLOY_MANIFEST_MINIKUBE="${CRC_DIR}/minikube/kruize-crc-minikube.yaml" - - - if [ ${cluster_type} == "minikube" ]; then - sed -i 's/"local": "false"/"local": "true"/' ${KRUIZE_CRC_DEPLOY_MANIFEST_MINIKUBE} - elif [ ${cluster_type} == "openshift" ]; then - sed -i 's/"local": "false"/"local": "true"/' ${KRUIZE_CRC_DEPLOY_MANIFEST_OPENSHIFT} - fi } # @@ -1914,8 +1907,6 @@ function kruize_remote_patch() { if [ ${cluster_type} == "minikube" ]; then - #sed -i 's/"isROSEnabled": "false"/"isROSEnabled": "true"/' ${KRUIZE_CRC_DEPLOY_MANIFEST_MINIKUBE} - #sed -i 's/"local": "true"/"local": "false"/' ${KRUIZE_CRC_DEPLOY_MANIFEST_MINIKUBE} if grep -q '"isROSEnabled": "false"' ${KRUIZE_CRC_DEPLOY_MANIFEST_MINIKUBE}; then echo "match found" sed -i 's/"isROSEnabled": "false"/"isROSEnabled": "true"/' ${KRUIZE_CRC_DEPLOY_MANIFEST_MINIKUBE} @@ -1923,14 +1914,10 @@ function kruize_remote_patch() { echo "Error: Match not found" >&2 exit 1 fi - #sed -i '/"local": "false"/a \ \ \ \ "isROSEnabled": "true",' ${KRUIZE_CRC_DEPLOY_MANIFEST_MINIKUBE} elif [ ${cluster_type} == "openshift" ]; then - #sed -i 's/"isROSEnabled": "false"/"isROSEnabled": "true"/' ${KRUIZE_CRC_DEPLOY_MANIFEST_OPENSHIFT} - #sed -i 's/"local": "true"/"local": "false"/' ${KRUIZE_CRC_DEPLOY_MANIFEST_OPENSHIFT} sed -i 's/"isROSEnabled": "false"/"isROSEnabled": "true"/' ${KRUIZE_CRC_DEPLOY_MANIFEST_OPENSHIFT} sed -i 's/\([[:space:]]*\)\(storage:\)[[:space:]]*[0-9]\+Mi/\1\2 1Gi/' ${KRUIZE_CRC_DEPLOY_MANIFEST_OPENSHIFT} sed -i 's/\([[:space:]]*\)\(memory:\)[[:space:]]*".*"/\1\2 "2Gi"/; s/\([[:space:]]*\)\(cpu:\)[[:space:]]*".*"/\1\2 "2"/' ${KRUIZE_CRC_DEPLOY_MANIFEST_OPENSHIFT} - #sed -i '/"local": "false"/a \ \ \ \ "isROSEnabled": "true",' ${KRUIZE_CRC_DEPLOY_MANIFEST_OPENSHIFT} fi }