Skip to content

Commit a8dcc29

Browse files
authored
fix: Find out operator subscription name and namespace (#2803)
Signed-off-by: Anatolii Bazko <abazko@redhat.com>
1 parent e03c13c commit a8dcc29

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

antora.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ asciidoc:
8787
prod-operator-index: registry.access.redhat.com/redhat/community-operator-index:v{ocp4-ver}
8888
prod-operator-package-name: eclipse-che
8989
prod-operator: che-operator
90-
prod-operator-subscription: eclipse-che
9190
prod-prev-short: Che
9291
prod-prev-id-short: che
9392
prod-prev-ver: "previous minor version"

modules/administration-guide/pages/concealing-editors-definitions.adoc

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -63,24 +63,25 @@ CHE_EDITOR_CONCEAL_CONFIGMAP_NAME=che-conceal-$CHE_EDITOR_CONCEAL_FILE_NAME
6363
--from-literal=$CHE_EDITOR_CONCEAL_FILE_NAME=""
6464
----
6565

66-
. Find out the Operator subscription namespace (if it exists):
66+
. Find out the Operator subscription name and namespace (if it exists):
6767
+
6868
[source,subs="+attributes"]
6969
----
70-
SUBSCRIPTION_NAMESPACE=$({orch-cli} get subscription \
70+
SUBSCRIPTION=$({orch-cli} get subscriptions \
7171
--all-namespaces \
72-
--field-selector=metadata.name={prod-operator-subscription} \
73-
--output jsonpath='{.items[0].metadata.namespace}' 2>/dev/null
74-
)
72+
--output json \
73+
| jq -r '.items[] | select(.spec.name=="{prod-operator-package-name}")')
74+
SUBSCRIPTION_NAMESPACE=$(echo $SUBSCRIPTION | jq -r '.metadata.namespace')
75+
SUBSCRIPTION_NAME=$(echo $SUBSCRIPTION | jq -r '.metadata.name')
7576
----
7677

7778
. Patch the {kubernetes} resource to mount the ConfigMap with the empty editor definition. The resource to patch depends on the existence of the Operator subscription. If the subscription exists, then the subscription should be patched. If not, patch the Operator deployment:
7879
+
7980
[source,subs="+attributes"]
8081
----
8182
if [[ -n $SUBSCRIPTION_NAMESPACE ]]; then
82-
if [[ $({orch-cli} get subscription {prod-operator-subscription} --namespace $SUBSCRIPTION_NAMESPACE --output jsonpath='{.spec.config}') == "" ]]; then
83-
{orch-cli} patch subscription {prod-operator-subscription} \
83+
if [[ $({orch-cli} get subscription $SUBSCRIPTION_NAME --namespace $SUBSCRIPTION_NAMESPACE --output jsonpath='{.spec.config}') == "" ]]; then
84+
{orch-cli} patch subscription $SUBSCRIPTION_NAME \
8485
--namespace $SUBSCRIPTION_NAMESPACE \
8586
--type json \
8687
--patch '[{
@@ -90,8 +91,8 @@ if [[ -n $SUBSCRIPTION_NAMESPACE ]]; then
9091
}]'
9192
fi
9293
93-
if [[ $({orch-cli} get subscription {prod-operator-subscription} --namespace $SUBSCRIPTION_NAMESPACE --output jsonpath='{.spec.config.volumes}') == "" ]]; then
94-
{orch-cli} patch subscription {prod-operator-subscription} \
94+
if [[ $({orch-cli} get subscription $SUBSCRIPTION_NAME --namespace $SUBSCRIPTION_NAMESPACE --output jsonpath='{.spec.config.volumes}') == "" ]]; then
95+
{orch-cli} patch subscription $SUBSCRIPTION_NAME \
9596
--namespace $SUBSCRIPTION_NAMESPACE \
9697
--type json \
9798
--patch '[{
@@ -101,8 +102,8 @@ if [[ -n $SUBSCRIPTION_NAMESPACE ]]; then
101102
}]'
102103
fi
103104
104-
if [[ $({orch-cli} get subscription {prod-operator-subscription} --namespace $SUBSCRIPTION_NAMESPACE --output jsonpath='{.spec.config.volumeMounts}') == "" ]]; then
105-
{orch-cli} patch subscription {prod-operator-subscription} \
105+
if [[ $({orch-cli} get subscription $SUBSCRIPTION_NAME --namespace $SUBSCRIPTION_NAMESPACE --output jsonpath='{.spec.config.volumeMounts}') == "" ]]; then
106+
{orch-cli} patch subscription $SUBSCRIPTION_NAME \
106107
--namespace $SUBSCRIPTION_NAMESPACE \
107108
--type json \
108109
--patch '[{
@@ -112,7 +113,7 @@ if [[ -n $SUBSCRIPTION_NAMESPACE ]]; then
112113
}]'
113114
fi
114115
115-
{orch-cli} patch subscription {prod-operator-subscription} \
116+
{orch-cli} patch subscription $SUBSCRIPTION_NAME \
116117
--namespace $SUBSCRIPTION_NAMESPACE \
117118
--type json \
118119
--patch '[{

0 commit comments

Comments
 (0)