@@ -55,7 +55,7 @@ function extract_nodeselector() {
5555
5656# node selectors
5757fluentd_nodeselector=$( extract_nodeselector $FLUENTD_NODESELECTOR )
58- es_nodeselectory =$( extract_nodeselector $ES_NODESELECTOR )
58+ es_nodeselector =$( extract_nodeselector $ES_NODESELECTOR )
5959es_ops_nodeselector=$( extract_nodeselector $ES_OPS_NODESELECTOR )
6060kibana_nodeselector=$( extract_nodeselector $KIBANA_NODESELECTOR )
6161kibana_ops_nodeselector=$( extract_nodeselector $KIBANA_OPS_NODESELECTOR )
@@ -219,7 +219,7 @@ es_ops_params=$(join , \
219219
220220if [[ -n " ${ES_NODESELECTOR} " ]]; then
221221 sed " /serviceAccountName/ i\
222- \ $es_nodeselector " templates/es.yaml | oc process -v " ${es_params} " -f - | oc create -f -
222+ \ ${ es_nodeselector} " templates/es.yaml | oc process -v " ${es_params} " -f - | oc create -f -
223223else
224224 oc process -f templates/es.yaml -v " ${es_params} " | oc create -f -
225225fi
@@ -229,7 +229,7 @@ es_ops_host=${es_host}
229229
230230if [[ -n " ${KIBANA_NODESELECTOR} " ]]; then
231231 sed " /serviceAccountName/ i\
232- \ ${kibana_nodeselecto } " templates/kibana.yaml | oc process -v " OAP_PUBLIC_MASTER_URL=${public_master_url} ,OAP_MASTER_URL=${master_url} " | oc create -f -
232+ \ ${kibana_nodeselector } " templates/kibana.yaml | oc process -v " OAP_PUBLIC_MASTER_URL=${public_master_url} ,OAP_MASTER_URL=${master_url} " | oc create -f -
233233else
234234 oc process -f templates/kibana.yaml -v " OAP_PUBLIC_MASTER_URL=${public_master_url} ,OAP_MASTER_URL=${master_url} " | oc create -f -
235235fi
270270
271271if [[ -n " ${FLUENTD_NODESELECTOR} " ]]; then
272272 sed " /serviceAccountName/ i\
273- \ $fluentd_nodeselector " templates/fluentd.yaml | oc process -v " ES_HOST=${es_host} ,OPS_HOST=${es_ops_host} ,MASTER_URL=${master_url} ,IMAGE_PREFIX=${image_prefix} ,IMAGE_VERSION=${image_version} " -f - | oc create -f -
273+ \ ${ fluentd_nodeselector} " templates/fluentd.yaml | oc process -v " ES_HOST=${es_host} ,OPS_HOST=${es_ops_host} ,MASTER_URL=${master_url} ,IMAGE_PREFIX=${image_prefix} ,IMAGE_VERSION=${image_version} " -f - | oc create -f -
274274else
275275 oc process -f templates/fluentd.yaml -v " ES_HOST=${es_host} ,OPS_HOST=${es_ops_host} ,MASTER_URL=${master_url} ,IMAGE_PREFIX=${image_prefix} ,IMAGE_VERSION=${image_version} " | oc create -f -
276276fi
0 commit comments