Skip to content

Commit 4868a14

Browse files
authored
Merge pull request kruize#1334 from msvinaykumar/setLocalTrue
set kruize local to true
2 parents 0273075 + 8ca51b8 commit 4868a14

File tree

12 files changed

+31
-6
lines changed

12 files changed

+31
-6
lines changed

manifests/crc/BYODB-installation/minikube/kruize-crc-minikube.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ data:
3333
"savetodb": "true",
3434
"dbdriver": "jdbc:postgresql://",
3535
"plots": "true",
36-
"local": "false",
36+
"local": "true",
3737
"logAllHttpReqAndResp": "true",
3838
"recommendationsURL" : "http://kruize.monitoring.svc.cluster.local:8080/generateRecommendations?experiment_name=%s",
3939
"experimentsURL" : "http://kruize.monitoring.svc.cluster.local:8080/createExperiment",

manifests/crc/BYODB-installation/openshift/kruize-crc-openshift.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ data:
4646
"savetodb": "true",
4747
"dbdriver": "jdbc:postgresql://",
4848
"plots": "true",
49-
"local": "false",
49+
"local": "true",
5050
"logAllHttpReqAndResp": "true",
5151
"recommendationsURL" : "http://kruize.openshift-tuning.svc.cluster.local:8080/generateRecommendations?experiment_name=%s",
5252
"experimentsURL" : "http://kruize.openshift-tuning.svc.cluster.local:8080/createExperiment",

manifests/crc/default-db-included-installation/aks/kruize-crc-aks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ data:
9797
"savetodb": "true",
9898
"dbdriver": "jdbc:postgresql://",
9999
"plots": "true",
100-
"local": "false",
100+
"local": "true",
101101
"logAllHttpReqAndResp": "true",
102102
"recommendationsURL" : "http://kruize.monitoring.svc.cluster.local:8080/generateRecommendations?experiment_name=%s",
103103
"experimentsURL" : "http://kruize.monitoring.svc.cluster.local:8080/createExperiment",

manifests/crc/default-db-included-installation/minikube/kruize-crc-minikube.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ data:
111111
"savetodb": "true",
112112
"dbdriver": "jdbc:postgresql://",
113113
"plots": "true",
114-
"local": "false",
114+
"local": "true",
115115
"logAllHttpReqAndResp": "true",
116116
"recommendationsURL" : "http://kruize.monitoring.svc.cluster.local:8080/generateRecommendations?experiment_name=%s",
117117
"experimentsURL" : "http://kruize.monitoring.svc.cluster.local:8080/createExperiment",

manifests/crc/default-db-included-installation/openshift/kruize-crc-openshift.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ data:
105105
"savetodb": "true",
106106
"dbdriver": "jdbc:postgresql://",
107107
"plots": "true",
108-
"local": "false",
108+
"local": "true",
109109
"logAllHttpReqAndResp": "true",
110110
"recommendationsURL" : "http://kruize.openshift-tuning.svc.cluster.local:8080/generateRecommendations?experiment_name=%s",
111111
"experimentsURL" : "http://kruize.openshift-tuning.svc.cluster.local:8080/createExperiment",

src/main/java/com/autotune/operator/KruizeDeploymentInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public class KruizeDeploymentInfo {
7777
public static Boolean settings_save_to_db;
7878
public static String em_only_mode;
7979
public static Integer bulk_update_results_limit = 100;
80-
public static Boolean local = false;
80+
public static Boolean local = true;
8181
public static Boolean log_http_req_resp = false;
8282
public static String recommendations_url;
8383
public static String experiments_url;

tests/scripts/common/common_functions.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1902,6 +1902,22 @@ function kruize_local_patch() {
19021902
fi
19031903
}
19041904

1905+
#
1906+
# "local" flag is turned off for RM.
1907+
#
1908+
function kruize_remote_patch() {
1909+
CRC_DIR="./manifests/crc/default-db-included-installation"
1910+
KRUIZE_CRC_DEPLOY_MANIFEST_OPENSHIFT="${CRC_DIR}/openshift/kruize-crc-openshift.yaml"
1911+
KRUIZE_CRC_DEPLOY_MANIFEST_MINIKUBE="${CRC_DIR}/minikube/kruize-crc-minikube.yaml"
1912+
1913+
1914+
if [ ${cluster_type} == "minikube" ]; then
1915+
sed -i 's/"local": "true"/"local": "false"/' ${KRUIZE_CRC_DEPLOY_MANIFEST_MINIKUBE}
1916+
elif [ ${cluster_type} == "openshift" ]; then
1917+
sed -i 's/"local": "true"/"local": "false"/' ${KRUIZE_CRC_DEPLOY_MANIFEST_OPENSHIFT}
1918+
fi
1919+
}
1920+
19051921
#
19061922
# Modify "serviceName" and "namespace" datasource manifest fields based on input parameters
19071923
#

tests/scripts/remote_monitoring_tests/fault_tolerant_tests/remote_monitoring_fault_tolerant_tests.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ KRUIZE_SETUP_LOG="${LOG_DIR}/kruize_setup.log"
100100

101101
# Setup kruize
102102
echo "Setting up kruize..." | tee -a ${LOG}
103+
kruize_remote_patch
103104
pushd ${KRUIZE_REPO} > /dev/null
104105
echo "./deploy.sh -c ${CLUSTER_TYPE} -i ${KRUIZE_IMAGE} -m ${target} -t >> ${KRUIZE_SETUP_LOG}" | tee -a ${LOG}
105106
./deploy.sh -c ${CLUSTER_TYPE} -i ${KRUIZE_IMAGE} -m ${target} -t >> ${KRUIZE_SETUP_LOG} 2>&1

tests/scripts/remote_monitoring_tests/remote_monitoring_tests.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ function remote_monitoring_tests() {
6161
if [ ${skip_setup} -eq 0 ]; then
6262
echo "Setting up kruize..." | tee -a ${LOG}
6363
echo "${KRUIZE_SETUP_LOG}"
64+
echo "setting local=false"
65+
kruize_remote_patch
6466
setup "${KRUIZE_POD_LOG}" >> ${KRUIZE_SETUP_LOG} 2>&1
6567
echo "Setting up kruize...Done" | tee -a ${LOG}
6668

tests/scripts/remote_monitoring_tests/scale_test/remote_monitoring_scale_test.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,8 @@ KRUIZE_SERVICE_LOG="${LOG_DIR}/kruize_service.log"
123123

124124
# Setup kruize
125125
echo "Setting up kruize..." | tee -a ${LOG}
126+
echo "setting local=false"
127+
kruize_remote_patch
126128
pushd ${KRUIZE_REPO} > /dev/null
127129
echo "./deploy.sh -c ${CLUSTER_TYPE} -i ${KRUIZE_IMAGE} -m ${target} -t >> ${KRUIZE_SETUP_LOG}" | tee -a ${LOG}
128130
./deploy.sh -c ${CLUSTER_TYPE} -i ${KRUIZE_IMAGE} -m ${target} -t >> ${KRUIZE_SETUP_LOG} 2>&1

0 commit comments

Comments
 (0)