Skip to content

Commit 39dfa0e

Browse files
committed
Merge pull request #93 from ewolinetz/fix_rfe_62
adding missing -f - for oc process when doing sed
2 parents 31296d0 + 428dc65 commit 39dfa0e

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

deployment/run.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,14 +229,14 @@ es_ops_host=${es_host}
229229

230230
if [[ -n "${KIBANA_NODESELECTOR}" ]]; then
231231
sed "/serviceAccountName/ i\
232-
\ ${kibana_nodeselector}" 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}" -f - | oc create -f -
233233
else
234234
oc process -f templates/kibana.yaml -v "OAP_PUBLIC_MASTER_URL=${public_master_url},OAP_MASTER_URL=${master_url}" | oc create -f -
235235
fi
236236

237237
if [[ -n "${CURATOR_NODESELECTOR}" ]]; then
238238
sed "/serviceAccountName/ i\
239-
\ ${curator_nodeselector}" templates/curator.yaml | oc process -v "ES_HOST=${es_host},MASTER_URL=${master_url},CURATOR_DEPLOY_NAME=curator"| oc create -f -
239+
\ ${curator_nodeselector}" templates/curator.yaml | oc process -v "ES_HOST=${es_host},MASTER_URL=${master_url},CURATOR_DEPLOY_NAME=curator" -f - | oc create -f -
240240
else
241241
oc process -f templates/curator.yaml -v "ES_HOST=${es_host},MASTER_URL=${master_url},CURATOR_DEPLOY_NAME=curator"| oc create -f -
242242
fi
@@ -254,14 +254,14 @@ if [ "${ENABLE_OPS_CLUSTER}" == true ]; then
254254

255255
if [[ -n "${KIBANA_OPS_NODESELECTOR}" ]]; then
256256
sed "/serviceAccountName/ i\
257-
\ ${kibana_ops_nodeselector}" templates/kibana.yaml | oc process -v "OAP_PUBLIC_MASTER_URL=${public_master_url},OAP_MASTER_URL=${master_url},KIBANA_DEPLOY_NAME=kibana-ops,ES_HOST=${es_ops_host}" | oc create -f -
257+
\ ${kibana_ops_nodeselector}" templates/kibana.yaml | oc process -v "OAP_PUBLIC_MASTER_URL=${public_master_url},OAP_MASTER_URL=${master_url},KIBANA_DEPLOY_NAME=kibana-ops,ES_HOST=${es_ops_host}" -f - | oc create -f -
258258
else
259259
oc process -f templates/kibana.yaml -v "OAP_PUBLIC_MASTER_URL=${public_master_url},OAP_MASTER_URL=${master_url},KIBANA_DEPLOY_NAME=kibana-ops,ES_HOST=logging-es-ops" | oc create -f -
260260
fi
261261

262262
if [[ -n "${CURATOR_OPS_NODESELECTOR}" ]]; then
263263
sed "/serviceAccountName/ i\
264-
\ ${curator_ops_nodeselector}" templates/curator.yaml | oc process -v "ES_HOST=${es_ops_host},MASTER_URL=${master_url},CURATOR_DEPLOY_NAME=curator-ops"| oc create -f -
264+
\ ${curator_ops_nodeselector}" templates/curator.yaml | oc process -v "ES_HOST=${es_ops_host},MASTER_URL=${master_url},CURATOR_DEPLOY_NAME=curator-ops" -f - | oc create -f -
265265
else
266266
oc process -f templates/curator.yaml -v "ES_HOST=${es_ops_host},MASTER_URL=${master_url},CURATOR_DEPLOY_NAME=curator-ops"| oc create -f -
267267
fi

0 commit comments

Comments
 (0)