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

Commit 3231d3e

Browse files
committed
Taking a shot at OperatorGroups
Trying to get something reasonable to show up on the console. Not sure this is it, exactly. Also applying the OLM CRD's slightly differently after noticing some of the manifests don't end with a linefeed, so cat'ing them together won't work.
1 parent 190bbaf commit 3231d3e

File tree

1 file changed

+25
-2
lines changed

1 file changed

+25
-2
lines changed

etc/scripts/install-functions.sh

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ function install_olm {
2929
mkdir -p "$REPO_DIR"
3030
rm -rf "$OLM_DIR"
3131
git clone https://github.com/operator-framework/operator-lifecycle-manager "$OLM_DIR"
32-
cat "$OLM_DIR"/deploy/okd/manifests/latest/*.crd.yaml | oc apply -f -
33-
sleep 1
32+
for i in "$OLM_DIR"/deploy/okd/manifests/latest/*.crd.yaml; do oc apply -f $i; done
3433
find "$OLM_DIR/deploy/okd/manifests/latest/" -type f ! -name "*crd.yaml" | sort | xargs cat | oc create -f -
3534
wait_for_all_pods openshift-operator-lifecycle-manager
3635
# perms required by the OLM console: $OLM_DIR/scripts/run_console_local.sh
@@ -54,6 +53,12 @@ function install_istio {
5453
channel: alpha
5554
name: maistra
5655
source: maistra-operators
56+
---
57+
apiVersion: operators.coreos.com/v1alpha2
58+
kind: OperatorGroup
59+
metadata:
60+
name: istio-operator
61+
namespace: istio-operator
5762
EOF
5863
wait_for_all_pods istio-operator
5964

@@ -102,6 +107,12 @@ function install_knative_build {
102107
name: knative-build
103108
startingCSV: knative-build.${KNATIVE_BUILD_VERSION}
104109
channel: alpha
110+
---
111+
apiVersion: operators.coreos.com/v1alpha2
112+
kind: OperatorGroup
113+
metadata:
114+
name: knative-build
115+
namespace: knative-build
105116
EOF
106117
}
107118

@@ -119,6 +130,12 @@ function install_knative_serving {
119130
name: knative-serving
120131
startingCSV: knative-serving.${KNATIVE_SERVING_VERSION}
121132
channel: alpha
133+
---
134+
apiVersion: operators.coreos.com/v1alpha2
135+
kind: OperatorGroup
136+
metadata:
137+
name: knative-serving
138+
namespace: knative-serving
122139
EOF
123140
}
124141

@@ -136,5 +153,11 @@ function install_knative_eventing {
136153
name: knative-eventing
137154
startingCSV: knative-eventing.${KNATIVE_EVENTING_VERSION}
138155
channel: alpha
156+
---
157+
apiVersion: operators.coreos.com/v1alpha2
158+
kind: OperatorGroup
159+
metadata:
160+
name: knative-eventing
161+
namespace: knative-eventing
139162
EOF
140163
}

0 commit comments

Comments
 (0)