Skip to content
This repository was archived by the owner on Aug 2, 2019. It is now read-only.

Commit ec60ae6

Browse files
committed
Stop-gap fix for SRVCOM-424 until upstream updates its manifests
We're riding the bleeding edge right now
1 parent 90e637f commit ec60ae6

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

etc/scripts/installation-functions.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,12 @@ function install_olm {
173173
mkdir -p "$REPO_DIR"
174174
rm -rf "$OLM_DIR"
175175
git clone https://github.com/operator-framework/operator-lifecycle-manager "$OLM_DIR"
176-
# pushd $OLM_DIR; git checkout f474ec872ca7b1dd; popd
177176

177+
# When they update their images in the manifests, we should pin to
178+
# that sha and remove the sed's
179+
180+
# pushd $OLM_DIR; git checkout 9ba3512c; popd
181+
sed -i "s/v1alpha2/v1/g" $OLM_DIR/deploy/upstream/manifests/latest/*operatorgroup*
178182
sed -i "s|quay.io/operator-framework/olm@sha256:4b7dec341fc754fdd2c8784ca7d81747ebbb2b87866b9e61ebbebc8c5614cfdc|quay.io/openshift/origin-operator-lifecycle-manager|g" $OLM_DIR/deploy/upstream/manifests/latest/0000_50_olm_06-olm-operator.deployment.yaml $OLM_DIR/deploy/upstream/manifests/latest/0000_50_olm_07-catalog-operator.deployment.yaml $OLM_DIR/deploy/upstream/manifests/latest/0000_50_olm_10-olm-operators.configmap.yaml
179183

180184
for i in "$OLM_DIR"/deploy/upstream/manifests/latest/*.crd.yaml; do $CMD apply -f $i; done
@@ -209,7 +213,7 @@ function install_istio {
209213
$CMD create ns istio-operator
210214
if check_operatorgroups; then
211215
cat <<-EOF | $CMD apply -f -
212-
apiVersion: operators.coreos.com/v1alpha2
216+
apiVersion: operators.coreos.com/v1
213217
kind: OperatorGroup
214218
metadata:
215219
name: istio-operator
@@ -287,7 +291,7 @@ function install_knative {
287291
fi
288292
if check_operatorgroups; then
289293
cat <<-EOF | $CMD apply -f -
290-
apiVersion: operators.coreos.com/v1alpha2
294+
apiVersion: operators.coreos.com/v1
291295
kind: OperatorGroup
292296
metadata:
293297
name: ${COMPONENT}

0 commit comments

Comments
 (0)