Skip to content

Commit 1660933

Browse files
author
Jeff McCormick
committed
replace envsubst with expenv outside of containers, update bash completion
1 parent b02fbd9 commit 1660933

File tree

6 files changed

+7
-9
lines changed

6 files changed

+7
-9
lines changed

deploy/cleanup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ fi
2121

2222
$CO_CMD $NS delete configmap operator-conf apiserver-conf
2323

24-
#$CO_CMD $NS delete service postgres-operator
24+
$CO_CMD $NS delete service postgres-operator
2525

2626
$CO_CMD $NS delete deployment postgres-operator
2727

deploy/deploy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ $CO_CMD $NS create configmap operator-conf \
3636
--from-file=$COROOT/conf/postgres-operator/pvc-storageclass.json \
3737
--from-file=$COROOT/conf/postgres-operator/cluster/1
3838

39-
envsubst < $DIR/deployment.json | $CO_CMD $NS create -f -
39+
expenv -f $DIR/deployment.json | $CO_CMD $NS create -f -
4040

4141
$CO_CMD $NS create -f $DIR/service.json
4242

docs/operator-docs.asciidoc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,6 @@ sudo chmod o+rwx /etc/kubernetes/admin.conf
7070

7171
=== Create Project and Clone
7272

73-
Install some of the required dependencies:
74-
....
75-
yum -y install git gettext
76-
....
77-
7873
In your .bashrc file, include the following:
7974
....
8075
export GOPATH=$HOME/odev

examples/pgo-bash-completion

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,9 @@ _pgo_create_cluster()
295295
flags+=("--labels=")
296296
two_word_flags+=("-l")
297297
local_nonpersistent_flags+=("--labels=")
298+
flags+=("--metrics")
299+
flags+=("-m")
300+
local_nonpersistent_flags+=("--metrics")
298301
flags+=("--node-name=")
299302
two_word_flags+=("-n")
300303
local_nonpersistent_flags+=("--node-name=")

pv/create-pv-nfs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ do
2323
echo "creating PV crunchy-pv$i"
2424
export COUNTER=$i
2525
$CO_CMD --namespace=$CO_NAMESPACE delete pv crunchy-pv$i
26-
envsubst < $DIR/crunchy-pv-nfs.json | $CO_CMD --namespace=$CO_NAMESPACE create -f -
26+
expenv -f $DIR/crunchy-pv-nfs.json | $CO_CMD --namespace=$CO_NAMESPACE create -f -
2727
done

pv/create-pv.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ do
2323
echo "creating PV crunchy-pv$i"
2424
export COUNTER=$i
2525
$CO_CMD --namespace=$CO_NAMESPACE delete pv crunchy-pv$i
26-
envsubst < $DIR/crunchy-pv.json | $CO_CMD --namespace=$CO_NAMESPACE create -f -
26+
expenv -f $DIR/crunchy-pv.json | $CO_CMD --namespace=$CO_NAMESPACE create -f -
2727
done

0 commit comments

Comments
 (0)