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

Commit 332395c

Browse files
authored
Merge branch 'master' into pr/hyperkit-as-default-31
2 parents 56ccf44 + 95b8a00 commit 332395c

File tree

5 files changed

+37
-9
lines changed

5 files changed

+37
-9
lines changed

etc/scripts/catalog.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/usr/bin/env bash
22

3-
DIR=$(cd $(dirname "$0")/../../olm-catalog && pwd)
4-
5-
NAME="knative-operators"
6-
NAMEDISPLAY="Knative Operators"
3+
DIR=${DIR:-$(cd $(dirname "$0")/../../olm-catalog && pwd)}
4+
NAME=${NAME:-knative-operators}
5+
x=( $(echo $NAME | tr '-' ' ') )
6+
DISPLAYNAME=${DISPLAYNAME:=${x[*]^}}
77

88
indent() {
99
INDENT=" "
@@ -34,7 +34,7 @@ metadata:
3434
name: $NAME
3535
spec:
3636
configMap: $NAME
37-
displayName: $NAMEDISPLAY
37+
displayName: $DISPLAYNAME
3838
publisher: Red Hat
3939
sourceType: internal
4040
EOF

etc/scripts/install-on-minishift.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if minishift status | head -1 | grep "Running" >/dev/null; then
99
exit 1
1010
fi
1111

12-
set -x
12+
set -ex
1313

1414
OPENSHIFT_VERSION=${OPENSHIFT_VERSION:-v3.11.0}
1515
MEMORY=${MEMORY:-10GB}

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}

knative-operators.catalogsource.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4598,6 +4598,18 @@ data:
45984598
- deletecollection
45994599
- patch
46004600
- watch
4601+
- apiGroups:
4602+
- build.knative.dev
4603+
resources:
4604+
- builds
4605+
verbs:
4606+
- get
4607+
- list
4608+
- create
4609+
- update
4610+
- delete
4611+
- patch
4612+
- watch
46014613
- apiGroups:
46024614
- networking.istio.io
46034615
resources:

olm-catalog/knative-serving.v0.4.1.clusterserviceversion.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,18 @@ spec:
177177
- deletecollection
178178
- patch
179179
- watch
180+
- apiGroups:
181+
- build.knative.dev
182+
resources:
183+
- builds
184+
verbs:
185+
- get
186+
- list
187+
- create
188+
- update
189+
- delete
190+
- patch
191+
- watch
180192
- apiGroups:
181193
- networking.istio.io
182194
resources:

0 commit comments

Comments
 (0)