Skip to content

Commit d03b194

Browse files
author
jmccormick2001
committed
add CCP_IMAGE_PREFIX check into quickstart.sh, update the pgo version to 3.3.0-rc4
1 parent 95a054e commit d03b194

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

apiservermsgs/common.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717

1818
import ()
1919

20-
const PGO_VERSION = "3.3.0"
20+
const PGO_VERSION = "3.3.0-rc4"
2121

2222
// Ok status
2323
const Ok = "ok"

examples/quickstart.sh

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,15 @@ else
7474
echo "setting CO_IMAGE_PREFIX to " $CO_IMAGE_PREFIX
7575
fi
7676
echo "user has entered "$CO_IMAGE_PREFIX " for the operator image prefix"| tee -a $LOG
77+
echo -n "enter container-suite image prefix ["$CCP_IMAGE_PREFIX"]"
78+
read REPLY
79+
if [[ "$REPLY" != "" ]]; then
80+
echo "setting CCP_IMAGE_PREFIX="$REPLY
81+
export CCP_IMAGE_PREFIX=$REPLY
82+
else
83+
echo "setting CCP_IMAGE_PREFIX to " $CCP_IMAGE_PREFIX
84+
fi
85+
echo "user has entered "$CCP_IMAGE_PREFIX " for the container-suite image prefix"| tee -a $LOG
7786

7887
echo "Testing for dependencies..." | tee -a $LOG
7988

@@ -183,7 +192,8 @@ echo ""
183192
echo "Setting up pgo storage configuration for the selected storageclass..." | tee -a $LOG
184193
cp $COROOT/examples/pgo.yaml.storageclass $COROOT/conf/apiserver/pgo.yaml
185194
sed --in-place=.bak 's/standard/'"$STORAGE_CLASS"'/' $COROOT/conf/apiserver/pgo.yaml
186-
sed --in-place=.bak 's/crunchydata/'"$CO_IMAGE_PREFIX"'/' $COROOT/conf/apiserver/pgo.yaml
195+
sed --in-place=.bak 's/COImagePrefix: crunchydata/'"COImagePrefix: $CO_IMAGE_PREFIX"'/' $COROOT/conf/apiserver/pgo.yaml
196+
sed --in-place=.bak 's/CCPImagePrefix: crunchydata/'"CCPImagePrefix: $CCP_IMAGE_PREFIX"'/' $COROOT/conf/apiserver/pgo.yaml
187197
sed --in-place=.bak 's/centos7/'"$CO_BASEOS"'/' $COROOT/conf/apiserver/pgo.yaml
188198
sed --in-place=.bak 's/demo/'"$CO_NAMESPACE"'/' $COROOT/deploy/cluster-rbac.yaml
189199
sed --in-place=.bak 's/demo/'"$CO_NAMESPACE"'/' $COROOT/deploy/rbac.yaml

0 commit comments

Comments
 (0)