OU-1389: update devspace setup #1073
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| #!/usr/bin/env bash | ||
| set -euo pipefail | ||
|
|
||
| echo "Applying UIPlugin CR 'monitoring'..." | ||
| kubectl apply -f - <<EOF | ||
| apiVersion: observability.openshift.io/v1alpha1 | ||
| kind: UIPlugin | ||
| metadata: | ||
| name: monitoring | ||
| namespace: openshift-cluster-observability-operator | ||
| spec: | ||
| type: Monitoring | ||
| monitoring: | ||
| perses: | ||
| enabled: true | ||
| clusterHealthAnalyzer: | ||
| enabled: true | ||
| acm: | ||
| enabled: true | ||
| alertmanager: | ||
| url: "https://alertmanager.open-cluster-management-observability.svc:9095" | ||
| thanosQuerier: | ||
| url: "https://rbac-query-proxy.open-cluster-management-observability.svc:8443" | ||
| EOF | ||
|
|
||
| echo "Waiting for monitoring deployment to become available..." | ||
| kubectl rollout status deployment/monitoring \ | ||
| -n openshift-cluster-observability-operator \ | ||
| --timeout=300s |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| #!/usr/bin/env bash | ||
| set -euo pipefail | ||
|
|
||
| echo "Checking if COO is already installed..." | ||
| if kubectl get deployment -n openshift-cluster-observability-operator observability-operator \ | ||
| >/dev/null 2>&1; then | ||
| echo "COO is already installed, skipping." | ||
| exit 0 | ||
| fi | ||
|
|
||
| echo "Creating namespace openshift-cluster-observability-operator..." | ||
| kubectl create namespace openshift-cluster-observability-operator --dry-run=client -o yaml | kubectl apply -f - | ||
|
|
||
| echo "Creating OperatorGroup..." | ||
| kubectl apply -f - <<EOF | ||
| apiVersion: operators.coreos.com/v1 | ||
| kind: OperatorGroup | ||
| metadata: | ||
| name: observability-operator-group | ||
| namespace: openshift-cluster-observability-operator | ||
| spec: {} | ||
| EOF | ||
|
|
||
| echo "Creating Subscription..." | ||
| kubectl apply -f - <<EOF | ||
| apiVersion: operators.coreos.com/v1alpha1 | ||
| kind: Subscription | ||
| metadata: | ||
| name: cluster-observability-operator | ||
| namespace: openshift-cluster-observability-operator | ||
| spec: | ||
| channel: fast | ||
| name: cluster-observability-operator | ||
| source: redhat-operators | ||
| sourceNamespace: openshift-marketplace | ||
| EOF | ||
|
|
||
| echo "Waiting for COO CSV to reach Succeeded phase (timeout 5m)..." | ||
| SECONDS_ELAPSED=0 | ||
| until \ | ||
| CSV_NAME=$(kubectl get csv -n openshift-cluster-observability-operator \ | ||
| -o jsonpath='{.items[?(@.spec.displayName=="Cluster Observability Operator")].metadata.name}' \ | ||
| 2>/dev/null) && \ | ||
| [[ -n "${CSV_NAME}" ]] && \ | ||
| kubectl get csv -n openshift-cluster-observability-operator "${CSV_NAME}" \ | ||
| -o jsonpath='{.status.phase}' 2>/dev/null | grep -q "^Succeeded$"; do | ||
| if [[ ${SECONDS_ELAPSED} -ge 300 ]]; then | ||
| echo "ERROR: Timed out waiting for COO CSV to succeed." | ||
| exit 1 | ||
| fi | ||
| sleep 5 | ||
| SECONDS_ELAPSED=$((SECONDS_ELAPSED + 5)) | ||
| echo " Waiting... (${SECONDS_ELAPSED}s / 300s)" | ||
| done | ||
|
|
||
| echo "COO installed successfully." |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| #!/usr/bin/env bash | ||
| set -euo pipefail | ||
|
|
||
| echo "Patching ClusterVersion to disable CMO management of monitoring-plugin..." | ||
| oc patch clusterversion version --type json \ | ||
| -p "$(cat ./web/cypress/fixtures/cmo/disable-monitoring.yaml)" | ||
|
|
||
| echo "Scaling down cluster-monitoring-operator in openshift-monitoring..." | ||
| kubectl scale --replicas=0 -n openshift-monitoring deployment/cluster-monitoring-operator | ||
|
PeterYurkovich marked this conversation as resolved.
|
||
|
|
||
| echo "Waiting for cluster-monitoring-operator to scale down..." | ||
| kubectl rollout status deployment/cluster-monitoring-operator \ | ||
| -n openshift-monitoring \ | ||
| --timeout=120s | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| #!/usr/bin/env bash | ||
| set -euo pipefail | ||
|
|
||
| echo "Scaling down observability-operator..." | ||
| kubectl scale --replicas=0 -n openshift-cluster-observability-operator deployment/observability-operator | ||
|
|
||
| echo "Waiting for observability-operator to scale down..." | ||
| kubectl rollout status deployment/observability-operator \ | ||
| -n openshift-cluster-observability-operator \ | ||
| --timeout=120s | ||
|
|
||
| echo "Re-enabling monitoring-console-plugin in Console..." | ||
| # COO removes the plugin from the Console when scaled down — add it back so the | ||
| # devspace container is reachable from the Console frontend. | ||
| PLUGINS=$(oc get console.operator.openshift.io cluster -o jsonpath='{.spec.plugins}' 2>/dev/null) | ||
| if [[ -z "${PLUGINS}" ]]; then | ||
| oc patch console.operator.openshift.io cluster --type=json \ | ||
| -p '[{"op":"add","path":"/spec/plugins","value":["monitoring-console-plugin"]}]' | ||
| elif ! echo "${PLUGINS}" | grep -q "monitoring-console-plugin"; then | ||
| oc patch console.operator.openshift.io cluster --type=json \ | ||
| -p '[{"op":"add","path":"/spec/plugins/-","value":"monitoring-console-plugin"}]' | ||
| else | ||
| echo "monitoring-console-plugin already enabled in Console, skipping." | ||
| fi |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| #!/usr/bin/env bash | ||
| set -euo pipefail | ||
|
|
||
| echo "Restoring ClusterVersion to re-enable CMO management of monitoring-plugin..." | ||
| oc patch clusterversion version --type json \ | ||
| -p '[{"op": "remove", "path": "/spec/overrides"}]' | ||
|
PeterYurkovich marked this conversation as resolved.
|
||
|
|
||
| echo "Scaling up cluster-monitoring-operator in openshift-monitoring..." | ||
| kubectl scale --replicas=1 -n openshift-monitoring deployment/cluster-monitoring-operator | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| #!/usr/bin/env bash | ||
| set -euo pipefail | ||
|
|
||
| echo "Scaling up observability-operator..." | ||
| kubectl scale --replicas=1 -n openshift-cluster-observability-operator deployment/observability-operator |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should we set the I18N_NAMESPACE here as well?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The initial answer to this was no due to the naming of our translation files, but you helped me realize that we can actually improve our build process more. The initial change in the webpack config that this PR contained already performed the first of 2 actions that the
update-plugin-name.shscript performed, and I added the second as well. Now rather than need to run that script before building themonitoring-console-pluginin our dockerfiles we can just set the ENV variable and let webpack take over handling itI've also combined the two ENV variable to just the CONSOLE_PLUGIN_NAME and have the old usage of I18N_NAMESPACE in the webpack file be constructed from the CONSOLE_PLUGIN_NAME.
When we create the next konflux update including these changes we will need to remove the script running and just pass in the ENV