diff --git a/README.md b/README.md index f516f9f0..85c7fd44 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ Supported versions: | Cloud Pak for Data | [4.8.0](https://www.ibm.com/docs/en/cloud-paks/cp-data/4.8.x?topic=overview) | Online, specialized installation | | Cloud Pak for Integration | [2023.2](https://www.ibm.com/docs/en/cloud-paks/cp-integration/2023.2) | Online installation | | Cloud Pak for Security | [1.10.15](https://www.ibm.com/docs/en/cloud-paks/cp-security/1.10) | Online installation | -| Cloud Pak for AIOps\* | [4.2.1](https://www.ibm.com/docs/en/cloud-paks/cloud-pak-watson-aiops/4.2.1) | Starter Installation | +| Cloud Pak for AIOps\* | [4.3.0](https://www.ibm.com/docs/en/cloud-paks/cloud-pak-watson-aiops/4.3.0) | Starter Installation | \* Starting with release 4.2.0, Cloud Pak for Watson AIOps was renamed Cloud Pak for AIOps, which required renaming several folders and labels from `cp4waiops` to `cp4aiops`. You can see all changes in [pull request #281](https://github.com/IBM/cloudpak-gitops/pull/281). diff --git a/config/argocd/templates/0200-argocd.yaml b/config/argocd/templates/0200-argocd.yaml index a22f62ff..ae17b401 100644 --- a/config/argocd/templates/0200-argocd.yaml +++ b/config/argocd/templates/0200-argocd.yaml @@ -300,31 +300,6 @@ spec: end end - hs.status = "Progressing" - return hs - - group: core.automation.ibm.com - kind: Cartridge - check: | - hs = {} - - generation = obj.metadata.generation - if obj.status ~= nil then - if obj.status.conditions ~= nil then - for i, condition in ipairs(obj.status.conditions) do - if condition.type == "Ready" and condition.status == "True" then - hs.status = "Healthy" - hs.message = condition.message - return hs - end - if condition.type == "Ready" and condition.reason == "InProgress" then - hs.status = "Progressing" - hs.message = condition.message - return hs - end - end - end - end - hs.status = "Progressing" return hs - group: apiconnect.ibm.com @@ -511,181 +486,6 @@ spec: end end - hs.status = "Progressing" - hs.message = "Unknown" - return hs - - group: noi.ibm.com - kind: NOI - check: | - hs = {} - if obj.status ~= nil then - if obj.status.phase ~= nil then - hs.message = obj.status.phase - if obj.status.phase == "OK" then - hs.status = "Healthy" - elseif obj.status.phase == "Error" then - hs.status = "Degraded" - else - hs.status = "Progressing" - end - return hs - end - end - - hs.status = "Progressing" - hs.message = "Unknown" - return hs - - group: cpd.ibm.com - kind: Ibmcpd - check: | - hs = {} - if obj.status ~= nil then - if obj.status.controlPlaneStatus ~= nil then - hs.message = obj.status.controlPlaneStatus - if obj.status.controlPlaneStatus == "Completed" then - hs.status = "Healthy" - elseif obj.status.controlPlaneStatus == "Failed" then - hs.status = "Degraded" - hs.message = obj.status.controlPlaneStatus - else - hs.status = "Progressing" - end - return hs - end - end - - hs.status = "Progressing" - hs.message = "Unknown" - return hs - - group: db2u.databases.ibm.com - kind: DvService - check: | - hs = {} - if obj.status ~= nil then - if obj.status.reconcileStatus ~= nil then - hs.message = obj.status.reconcileStatus - if obj.status.reconcileStatus == "Completed" then - hs.status = "Healthy" - elseif obj.status.reconcileStatus == "Failed" then - hs.status = "Degraded" - hs.message = obj.status.reconcileStatus - else - hs.status = "Progressing" - end - return hs - end - end - - hs.status = "Progressing" - hs.message = "Unknown" - return hs - - group: rstudio.cpd.ibm.com - kind: RStudioAddon - check: | - hs = {} - if obj.status ~= nil then - if obj.status.rstudioStatus ~= nil then - hs.message = obj.status.rstudioStatus - if obj.status.rstudioStatus == "Completed" then - hs.status = "Healthy" - elseif obj.status.rstudioStatus == "Failed" then - hs.status = "Degraded" - hs.message = obj.status.rstudioStatus - else - hs.status = "Progressing" - end - return hs - end - end - - hs.status = "Progressing" - hs.message = "Unknown" - return hs - - group: wkc.cpd.ibm.com - kind: WKC - check: | - hs = {} - if obj.status ~= nil then - if obj.status.wkcStatus ~= nil then - hs.message = obj.status.wkcStatus - if obj.status.wkcStatus == "Completed" then - hs.status = "Healthy" - elseif obj.status.wkcStatus == "Failed" then - hs.status = "Degraded" - hs.message = obj.status.wkcStatus - else - hs.status = "Progressing" - end - return hs - end - end - - hs.status = "Progressing" - hs.message = "Unknown" - return hs - - group: wml.cpd.ibm.com - kind: WmlBase - check: | - hs = {} - if obj.status ~= nil then - if obj.status.wmlStatus ~= nil then - hs.message = obj.status.wmlStatus - if obj.status.wmlStatus == "Completed" then - hs.status = "Healthy" - elseif obj.status.wmlStatus == "Failed" then - hs.status = "Degraded" - hs.message = obj.status.wmlStatus - else - hs.status = "Progressing" - end - return hs - end - end - - hs.status = "Progressing" - hs.message = "Unknown" - return hs - - group: wos.cpd.ibm.com - kind: WOService - check: | - hs = {} - if obj.status ~= nil then - if obj.status.wosStatus ~= nil then - hs.message = obj.status.wosStatus - if obj.status.wosStatus == "Completed" then - hs.status = "Healthy" - elseif obj.status.wosStatus == "Failed" then - hs.status = "Degraded" - hs.message = obj.status.wosStatus - else - hs.status = "Progressing" - end - return hs - end - end - - hs.status = "Progressing" - hs.message = "Unknown" - return hs - - group: ws.cpd.ibm.com - kind: WS - check: | - hs = {} - if obj.status ~= nil then - if obj.status.wsStatus ~= nil then - hs.message = obj.status.wsStatus - if obj.status.wsStatus == "Completed" then - hs.status = "Healthy" - elseif obj.status.wsStatus == "Failed" then - hs.status = "Degraded" - hs.message = obj.status.wosStatus - else - hs.status = "Progressing" - end - return hs - end - end - hs.status = "Progressing" hs.message = "Unknown" return hs diff --git a/config/cloudpaks/cp4aiops/install-aimgr/Chart.yaml b/config/cloudpaks/cp4aiops/install-aimgr/Chart.yaml index 7f76a9d1..bcd79600 100644 --- a/config/cloudpaks/cp4aiops/install-aimgr/Chart.yaml +++ b/config/cloudpaks/cp4aiops/install-aimgr/Chart.yaml @@ -13,9 +13,9 @@ description: Cloud Pak for AIOps - AI Manager # pipeline. Library charts do not define any templates and therefore cannot be deployed. type: application -version: 0.16.0 +version: 0.17.0 # 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.2.1 +appVersion: 4.3.0 diff --git a/config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/100-subscription.yaml b/config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/100-subscription.yaml index e5d1630b..851ad97e 100644 --- a/config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/100-subscription.yaml +++ b/config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/100-subscription.yaml @@ -7,7 +7,7 @@ metadata: name: ibm-aiops-orchestrator namespace: "{{.Values.metadata.argocd_app_namespace}}" spec: - channel: v4.2 + channel: v4.3 installPlanApproval: Automatic name: ibm-aiops-orchestrator source: ibm-operator-catalog diff --git a/config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/110-sync-check-all-csvs.yaml b/config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/110-sync-check-all-csvs.yaml index bf752f0e..848fc884 100644 --- a/config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/110-sync-check-all-csvs.yaml +++ b/config/cloudpaks/cp4aiops/install-aimgr/templates/subscriptions/110-sync-check-all-csvs.yaml @@ -32,13 +32,8 @@ spec: csv_installing=1 while [ ${current_seconds} -lt ${operation_limit_seconds} ]; do - # Note the exclusion of "ibm-automation-elastic" in the statement below, reflecting an - # issue with this operator called out in the Cloud Pak docs: - # https://www.ibm.com/docs/en/cloud-paks/cloud-pak-aiops/4.2.0?topic=installation-online-cli#install-cp4aiops - failing_csvs=$(oc get csv \ -n ${TARGET_NAMESPACE} \ - | grep -v ibm-automation-elastic \ | grep -vc Succeeded) || result=1 if [ ${result} -eq 1 ] || [ "${failing_csvs}" -gt 1 ]; then csv_installing=1 diff --git a/config/cloudpaks/cp4aiops/install-ia/Chart.yaml b/config/cloudpaks/cp4aiops/install-ia/Chart.yaml index 7c21e879..5df7c737 100644 --- a/config/cloudpaks/cp4aiops/install-ia/Chart.yaml +++ b/config/cloudpaks/cp4aiops/install-ia/Chart.yaml @@ -21,4 +21,4 @@ version: 0.16.0 # 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.2.1 +appVersion: 4.3.0