Skip to content

Commit

Permalink
fix: Avoid running node setup on hosted control plane
Browse files Browse the repository at this point in the history
Signed-off-by: Denilson Nastacio <[email protected]>
  • Loading branch information
nastacio committed Jun 17, 2023
1 parent 57c82ab commit 5b679cf
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
4 changes: 2 additions & 2 deletions config/cloudpaks/cp4d/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.5.1
version: 0.5.2

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
appVersion: 4.6.5
appVersion: 4.6.6
5 changes: 4 additions & 1 deletion config/cloudpaks/cp4d/templates/0090-sync-cluster-setup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,11 @@ spec:
OPENSHIFT_TYPE=self-managed
esac
hypershift_deployment=$(oc get Infrastructure cluster \
-o jsonpath='{.metadata.labels.hypershift\.openshift\.io/managed}')
# https://www.ibm.com/docs/en/cloud-paks/cp-data/4.6.x?topic=settings-changing-cri-o-container
if [ "${OPENSHIFT_TYPE}" != "roks" ]; then
if [ "${OPENSHIFT_TYPE}" != "roks" ] && [ -z "${hypershift_deployment}" ]; then
if [[ ${COMPONENTS} =~ cognos_analytics ]] \
|| [[ ${COMPONENTS} =~ dv ]] \
|| [[ ${COMPONENTS} =~ db2 ]] \
Expand Down

0 comments on commit 5b679cf

Please sign in to comment.