Conversation
…Jobs for WML, Spark, SPSS
…stead of lt(semver,semver)
…fore namespace-scoped helm install
… for Helm 5.3.1+ installs
…I groups for Helm install
- Gate OperandRegistry/OperandConfig to < 5.3.1 to prevent OLM resource drift when services are installed via Helm - Gate spark-hb-control-plane patch job to < 5.3.1; OLM-managed deployment does not exist in Helm install model - Add CRD establishment wait inside WSL install_component() between cluster-scoped apply and namespace-scoped helm upgrade to prevent race condition - Extend Helm Job --wait timeout from 30m to 60m for WML, SPSS and Spark to match WSL and avoid premature timeout on loaded clusters
* Added CPD 5.3.1 gitops support * [minor] Fix CatalogSources template - add CPD 5.3.1 block (MASCORE-15507) * For CPD 5.3.1 services are installed via Helm * MASCORE-15507: Fix WSL Helm Job - install deps in sequence; add Helm Jobs for WML, Spark, SPSS * MASCORE-15507: Pass cpd_product_version to WSL, Spark, SPSS ArgoCD Applications * MASCORE-15507: Fix heredoc in WSL Helm Job - use printf to avoid YAML/shell conflict * Fix semver comparison - use toString to handle unquoted cpd_product_version value * MASCORE-15507: skip OLM CCS/OpenSearch post-sync patching for CPD 5.3.1+ * MASCORE-15507: bump job version to v2 to force new job name after script change * minor update * changes undo * MASCORE-15507: gate CCS/datarefinery/ws-runtimes OLM subscriptions behind < 5.3.1 * MASCORE-15507: fix semver comparison syntax - use .Compare pattern instead of lt(semver,semver) * MASCORE-15507: install cluster-scoped chart first to register CRDs before namespace-scoped helm install * MASCORE-15507: grant cpd-sa cluster-level CRD/ClusterRole permissions for Helm 5.3.1+ installs * MASCORE-15507: expand cpd-sa ClusterRole with escalate, roles, CPD API groups for Helm install * MASCORE-15507: pin cli image to digest instead of :latest in Helm install jobs * adding temp changes for facilities * undone postbackflow.sh script * MASCORE-15507: fix CPD 5.3.1 Helm service install correctness - Gate OperandRegistry/OperandConfig to < 5.3.1 to prevent OLM resource drift when services are installed via Helm - Gate spark-hb-control-plane patch job to < 5.3.1; OLM-managed deployment does not exist in Helm install model - Add CRD establishment wait inside WSL install_component() between cluster-scoped apply and namespace-scoped helm upgrade to prevent race condition - Extend Helm Job --wait timeout from 30m to 60m for WML, SPSS and Spark to match WSL and avoid premature timeout on loaded clusters --------- Co-authored-by: Sakshi Singhroha <Sakshi.Singhroha@ibm.com> Co-authored-by: Nikita Kumble <nikitakumble@gmail.com>
… Jobs Static-named ArgoCD sync hook Jobs (install-wsl-helm, install-wml-helm, install-spss-helm, install-spark-helm) were failing with: 'spec.template: Invalid value ... field is immutable' This happens when an old Job with the same name exists from a prior sync and ArgoCD tries to patch it. Since Job spec.template is immutable, the patch is rejected. Fix: add HookFailed to hook-delete-policy on all four Jobs so ArgoCD deletes the Job on both success AND failure, ensuring no stale Job exists when the next sync runs.
The wait loop was polling for: opensearchclusters.opensearch.cloudpackopen.ibm.com (does not exist) The actual CRD name registered by the IBM OpenSearch Helm chart is: clusters.opensearch.cloudpackopen.ibm.com This caused the WSL Helm Job to always timeout after 5 minutes at the OpenSearch step, blocking CCS, DataRefinery, WS-Runtimes and WSL from ever installing.
…f oc wait oc wait exits immediately with error if the resource does not exist. The CCS CR (ccs-cr) is created by the CCS operator after Helm installs it, so it is not immediately present. Replace oc wait with a polling loop using --ignore-not-found, same pattern used for all other CRD waits in this script. Polls every 30s up to 60 minutes.
…fter CCS Helm install
…us for CCS CR readiness
…reated at waves 085/110
…d all MAS app install Applications for complete automated deprovisioning - Add post-delete-finalizer to 100-ibm-sls-app.yaml and 130-ibm-mas-suite-app.yaml - Add post-delete-finalizer to all app-install Applications (Manage, Facilities, Assist, IoT, Health, Monitor, Optimizer, Predict) - New: 08-postdelete-delete-suite-cr.yaml — PostDelete Job to force-remove Suite CR (core.mas.ibm.com/v1) - New: 08-postdelete-delete-licenseservice-cr.yaml — PostDelete Job to force-remove LicenseService CR (sls.ibm.com/v1) - Extend RBAC Role/ClusterRole in 01-postdelete-crs-resources.yaml to cover apps.mas.ibm.com, core.mas.ibm.com, and sls.ibm.com so PostDelete SA can patch/delete all required CRs across namespaces
This reverts commit 5c919c3.
…b2u scripts
- Parameterise SCHEMA in files/facilities/runstats_volatile.sh via { db2_schema } placeholder
so the periodic runstats cron job targets the correct schema on the pod
- Parameterise TRIDATA_DATA/TRIDATA_INDX tablespace names in
files/facilities/create-tablespaces.sh.j2 with { db2_schema }_DATA/_INDX placeholders
so tablespaces are created with names matching the configured schema
- Update the sed command for create-tablespaces.sh.j2 in 07-postsync-setup-db2_Job.yaml
to substitute { db2_schema } at template-time (was only substituting db2_dbname)
- Replace plain cp of runstats_volatile.sh in 07-postsync-setup-db2_Job.yaml with a sed
call so the { db2_schema } placeholder is resolved before the script reaches the pod
- Add DB2_SCHEMA env-driven variable in files/grant_check.sh (defaults to TRIDATA) and
replace hardcoded 'TRIDATA' in the syscat.SCHEMATA IN-list so the recurring grant
cron job discovers and maintains roles for non-standard schema names
Mascore 10022
…b2u scripts
- Parameterise SCHEMA in files/facilities/runstats_volatile.sh via { db2_schema } placeholder
so the periodic runstats cron job targets the correct schema on the pod
- Parameterise TRIDATA_DATA/TRIDATA_INDX tablespace names in
files/facilities/create-tablespaces.sh.j2 with { db2_schema }_DATA/_INDX placeholders
so tablespaces are created with names matching the configured schema
- Update the sed command for create-tablespaces.sh.j2 in 07-postsync-setup-db2_Job.yaml
to substitute { db2_schema } at template-time (was only substituting db2_dbname)
- Replace plain cp of runstats_volatile.sh in 07-postsync-setup-db2_Job.yaml with a sed
call so the { db2_schema } placeholder is resolved before the script reaches the pod
- Add DB2_SCHEMA env-driven variable in files/grant_check.sh (defaults to TRIDATA) and
replace hardcoded 'TRIDATA' in the syscat.SCHEMATA IN-list so the recurring grant
cron job discovers and maintains roles for non-standard schema names
Mascore 10022
MASCORE-10022: add facilities_db2_schema to values, make RDS path fully configurable
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
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.
No description provided.