Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions docs/disconnected-cincinnati-operator.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ You can follow [this doc](https://docs.openshift.com/container-platform/4.5/oper
11. Deploy the Cincinnati Operator

~~~sh
NAMESPACE=cincinnati-operator
NAMESPACE=example-namespace
oc create ns $NAMESPACE
cat <<EOF | oc -n $NAMESPACE create -f -
apiVersion: operators.coreos.com/v1alpha1
Expand Down Expand Up @@ -207,11 +207,11 @@ You might want to review the documentation around disconnected registries to lea
* Option 1: OpenShift Release Image and Release Content in different paths (release under ocp4/release, content under ocp4)

~~~sh
cat <<EOF | oc -n cincinnati-operator create -f -
cat <<EOF | oc -n "${NAMESPACE}" create -f -
apiVersion: cincinnati.openshift.io/v1beta1
kind: Cincinnati
metadata:
name: disconnected-cincinnati
name: example-name
spec:
replicas: 1
registry: "${DISCONNECTED_REGISTRY}"
Expand All @@ -222,11 +222,11 @@ You might want to review the documentation around disconnected registries to lea
* Option 2: OpenShift Release Image and Release Content in the same path (ocp4), release image copied to a new namespace in the registry (openshiftreleases)

~~~sh
cat <<EOF | oc -n cincinnati-operator create -f -
cat <<EOF | oc -n "${NAMESPACE}" create -f -
apiVersion: cincinnati.openshift.io/v1beta1
kind: Cincinnati
metadata:
name: disconnected-cincinnati
name: example-name
spec:
replicas: 1
registry: "${DISCONNECTED_REGISTRY}"
Expand All @@ -237,7 +237,7 @@ You might want to review the documentation around disconnected registries to lea
3. Check the cincinnati service

~~~sh
curl --header 'Accept:application/json' http://$(oc -n cincinnati-operator get route disconnected-cincinnati-policy-engine-route -o jsonpath='{.spec.host}')/api/upgrades_info/v1/graph\?channel=stable-4.5 | jq
curl --header 'Accept:application/json' http://$(oc -n "${NAMESPACE}" get route example-name-policy-engine-route -o jsonpath='{.spec.host}')/api/upgrades_info/v1/graph\?channel=stable-4.5 | jq
~~~

> **OUTPUT**
Expand Down Expand Up @@ -281,7 +281,7 @@ You might want to review the documentation around disconnected registries to lea
5. Patch the ClusterVersion to use our Cincinnati instance rather than the public one

~~~sh
CINCINNATI_ROUTE=$(oc -n cincinnati-operator get route disconnected-cincinnati-policy-engine-route -o jsonpath=http://'{.spec.host}'/api/upgrades_info/v1/graph)
CINCINNATI_ROUTE=$(oc -n "${NAMESPACE}" get route example-name-policy-engine-route -o jsonpath=http://'{.spec.host}'/api/upgrades_info/v1/graph)
PATCH="{\"spec\":{\"upstream\":\"${CINCINNATI_ROUTE}\"}}"
oc patch clusterversion version -p $PATCH --type merge
~~~
Expand Down Expand Up @@ -313,7 +313,7 @@ You can print the graph for a specific channel in your Cincinnati instance using
sudo dnf install -y graphviz
curl -O https://raw.githubusercontent.com/openshift/cincinnati/master/hack/graph.sh
chmod +x graph.sh
curl --header 'Accept:application/json' http://disconnected-cincinnati-policy-engine-cincinnati-operator.apps.mgmt-hub.e2e.bos.redhat.com/api/upgrades_info/v1/graph\?channel=stable-4.5 | ./graph.sh | dot -Tpng > graph.png
curl --header 'Accept:application/json' "http://example-name-policy-engine-${NAMESPACE}.apps.mgmt-hub.e2e.bos.redhat.com/api/upgrades_info/v1/graph?channel=stable-4.5" | ./graph.sh | dot -Tpng > graph.png
~~~

## Mirror the release images
Expand Down
3 changes: 2 additions & 1 deletion docs/graph-data-init-container.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ For the example above:
apiVersion: cincinnati.openshift.io/v1beta1
kind: Cincinnati
metadata:
name: example-cincinnati
name: example-name
namespace: example-namespace
spec:
replicas: 1
registry: "quay.io"
Expand Down