feat: Update OpenShift GitOps to 1.10

Signed-off-by: Denilson Nastacio <[email protected]>
IBM · Nov 21, 2023 · ab5e648 · ab5e648
1 parent 9ecb50c
commit ab5e648
Show file tree

Hide file tree

Showing 7 changed files with 100 additions and 70 deletions.
diff --git a/config/argocd/Chart.yaml b/config/argocd/Chart.yaml
@@ -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.7.2
+version: 0.8.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: "0.30.6"
+appVersion: "0.31.0"
diff --git a/config/argocd/templates/0200-argocd.yaml b/config/argocd/templates/0200-argocd.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: argoproj.io/v1alpha1
+apiVersion: argoproj.io/v1beta1
 kind: ArgoCD
 metadata:
   annotations:
@@ -86,9 +86,10 @@ spec:
       requests:
         cpu: 250m
         memory: 256Mi
-  resourceCustomizations: |
-    argoproj.io/Application:
-      health.lua: |
+  resourceHealthChecks:
+    - group: argoproj.io
+      kind: Application
+      check: |
         hs = {}
         hs.status = "Progressing"
         hs.message = ""
@@ -101,8 +102,9 @@ spec:
           end
         end
         return hs
-    multicluster.odf.openshift.io/MirrorPeer:
-      health.lua: |
+    - group: multicluster.odf.openshift.io
+      kind: MirrorPeer
+      check: |
         hs = {}
         hs.status = "Progressing"
         hs.message = "Unknown"
@@ -121,8 +123,9 @@ spec:
         end
 
         return hs
-    ocs.openshift.io/StorageCluster:
-      health.lua: |
+    - group: ocs.openshift.io
+      kind: StorageCluster
+      check: |
         hs = {}
         if obj.status ~= nil then
           if obj.status.conditions ~= nil then
@@ -143,8 +146,9 @@ spec:
 
         hs.status = "Progressing"
         return hs
-    odf.openshift.io/StorageSystem:
-      health.lua: |
+    - group: odf.openshift.io
+      kind: StorageSystem
+      check: |
         hs = {}
         if obj.status ~= nil then
           if obj.status.conditions ~= nil then
@@ -170,8 +174,9 @@ spec:
 
         hs.status = "Progressing"
         return hs
-    ramendr.openshift.io/DRPlacementControl:
-      health.lua: |
+    - group: ramendr.openshift.io
+      kind: DRPlacementControl
+      check: |
         hs = {}
 
         if obj.status ~= nil then
@@ -188,8 +193,9 @@ spec:
 
         hs.status = "Progressing"
         return hs
-    ramendr.openshift.io/DRPolicy:
-      health.lua: |
+    - group: ramendr.openshift.io
+      kind: DRPolicy
+      check: |
         hs = {}
 
         if obj.status ~= nil then
@@ -211,8 +217,9 @@ spec:
 
         hs.status = "Progressing"
         return hs
-    operator.open-cluster-management.io/MultiClusterHub:
-      health.lua: |
+    - group: operator.open-cluster-management.io
+      kind: MultiClusterHub
+      check: |
         hs = {}
         hs.status = "Progressing"
         hs.message = "Unknown"
@@ -231,8 +238,9 @@ spec:
         end
 
         return hs
-    submarineraddon.open-cluster-management.io/SubmarinerConfig:
-      health.lua: |
+    - group: submarineraddon.open-cluster-management.io
+      kind: SubmarinerConfig
+      check: |
         hs = {}
 
         if obj.status ~= nil then
@@ -250,8 +258,9 @@ spec:
         hs.status = "Progressing"
         return hs
 
-    hive.openshift.io/ClusterDeployment:
-      health.lua: |
+    - group: hive.openshift.io
+      kind: ClusterDeployment
+      check: |
         hs = {}
 
         if obj.status ~= nil then
@@ -278,8 +287,9 @@ spec:
 
         hs.status = "Progressing"
         return hs
-    cluster.open-cluster-management.io/ManagedCluster:
-      health.lua: |
+    - group: cluster.open-cluster-management.io
+      kind: ManagedCluster
+      check: |
         hs = {}
 
         if obj.status ~= nil then
@@ -301,8 +311,9 @@ spec:
 
         hs.status = "Progressing"
         return hs
-    core.automation.ibm.com/Cartridge:
-      health.lua: |
+    - group: core.automation.ibm.com
+      kind: Cartridge
+      check: |
         hs = {}
 
         generation = obj.metadata.generation
@@ -325,8 +336,9 @@ spec:
 
         hs.status = "Progressing"
         return hs
-    apiconnect.ibm.com/APIConnectCluster:
-      health.lua: |
+    - group: apiconnect.ibm.com
+      kind: APIConnectCluster
+      check: |
         hs = {}
 
         generation = obj.metadata.generation
@@ -358,8 +370,9 @@ spec:
 
         hs.status = "Progressing"
         return hs
-    datapower.ibm.com/DataPowerService:
-      health.lua: |
+    - group: datapower.ibm.com
+      kind: DataPowerService
+      check: |
         hs = {}
         if obj.status ~= nil then
           if obj.status.phase ~= nil then
@@ -376,8 +389,9 @@ spec:
         hs.status = "Progressing"
         hs.message = "Unknown"
         return hs
-    icp4a.ibm.com/ICP4ACluster:
-      health.lua: |
+    - group: icp4a.ibm.com
+      kind: ICP4ACluster
+      check: |
         hs = {}
 
         generation = obj.metadata.generation
@@ -421,8 +435,9 @@ spec:
 
         hs.status = "Progressing"
         return hs
-    integration.ibm.com/PlatformNavigator:
-      health.lua: |
+    - group: integration.ibm.com
+      kind: PlatformNavigator
+      check: |
         hs = {}
 
         generation = obj.metadata.generation
@@ -445,8 +460,9 @@ spec:
 
         hs.status = "Progressing"
         return hs
-    operators.coreos.com/CatalogSource:
-      health.lua: |
+    - group: operators.coreos.com
+      kind: CatalogSource
+      check: |
         hs = {}
         if obj.status ~= nil then
           if obj.status.connectionState ~= nil then
@@ -462,8 +478,9 @@ spec:
         hs.status = "Progressing"
         hs.message = "Unknown"
         return hs
-    operators.coreos.com/InstallPlan:
-      health.lua: |
+    - group: operators.coreos.com
+      kind: InstallPlan
+      check: |
         hs = {}
         if obj.status ~= nil then
           if obj.status.phase ~= nil then
@@ -480,8 +497,9 @@ spec:
         hs.status = "Progressing"
         hs.message = "Unknown"
         return hs
-    operators.coreos.com/Subscription:
-      health.lua: |
+    - group: operators.coreos.com
+      kind: Subscription
+      check: |
         hs = {}
         if obj.status ~= nil then
           if obj.status.installedCSV ~= nil then
@@ -500,8 +518,9 @@ spec:
           hs.message = obj.status.state
         end
         return hs
-    mq.ibm.com/QueueManager:
-      health.lua: |
+    - group: mq.ibm.com
+      kind: QueueManager
+      check: |
         hs = {}
         if obj.status ~= nil then
           if obj.status.phase ~= nil then
@@ -518,8 +537,9 @@ spec:
         hs.status = "Progressing"
         hs.message = "Unknown"
         return hs
-    orchestrator.aiops.ibm.com/Installation:
-      health.lua: |
+    - group: orchestrator.aiops.ibm.com
+      kind: Installation
+      check: |
         hs = {}
         if obj.status ~= nil then
           if obj.status.phase ~= nil then
@@ -539,8 +559,9 @@ spec:
         hs.status = "Progressing"
         hs.message = "Unknown"
         return hs
-    aiops.ibm.com/IAConfig:
-      health.lua: |
+    - group: aiops.ibm.com
+      kind: IAConfig
+      check: |
         hs = {}
         if obj.status ~= nil then
           if obj.status.phase ~= nil then
@@ -560,8 +581,9 @@ spec:
         hs.status = "Progressing"
         hs.message = "Unknown"
         return hs
-    noi.ibm.com/NOI:
-      health.lua: |
+    - group: noi.ibm.com
+      kind: NOI
+      check: |
         hs = {}
         if obj.status ~= nil then
           if obj.status.phase ~= nil then
@@ -580,8 +602,9 @@ spec:
         hs.status = "Progressing"
         hs.message = "Unknown"
         return hs
-    cpd.ibm.com/Ibmcpd:
-      health.lua: |
+    - group: cpd.ibm.com
+      kind: Ibmcpd
+      check: |
         hs = {}
         if obj.status ~= nil then
           if obj.status.controlPlaneStatus ~= nil then
@@ -601,8 +624,9 @@ spec:
         hs.status = "Progressing"
         hs.message = "Unknown"
         return hs
-    db2u.databases.ibm.com/DvService:
-      health.lua: |
+    - group: db2u.databases.ibm.com
+      kind: DvService
+      check: |
         hs = {}
         if obj.status ~= nil then
           if obj.status.reconcileStatus ~= nil then
@@ -622,8 +646,9 @@ spec:
         hs.status = "Progressing"
         hs.message = "Unknown"
         return hs
-    rstudio.cpd.ibm.com/RStudioAddon:
-      health.lua: |
+    - group: rstudio.cpd.ibm.com
+      kind: RStudioAddon
+      check: |
         hs = {}
         if obj.status ~= nil then
           if obj.status.rstudioStatus ~= nil then
@@ -643,8 +668,9 @@ spec:
         hs.status = "Progressing"
         hs.message = "Unknown"
         return hs
-    wkc.cpd.ibm.com/WKC:
-      health.lua: |
+    - group: wkc.cpd.ibm.com
+      kind: WKC
+      check: |
         hs = {}
         if obj.status ~= nil then
           if obj.status.wkcStatus ~= nil then
@@ -664,8 +690,9 @@ spec:
         hs.status = "Progressing"
         hs.message = "Unknown"
         return hs
-    wml.cpd.ibm.com/WmlBase:
-      health.lua: |
+    - group: wml.cpd.ibm.com
+      kind: WmlBase
+      check: |
         hs = {}
         if obj.status ~= nil then
           if obj.status.wmlStatus ~= nil then
@@ -685,8 +712,9 @@ spec:
         hs.status = "Progressing"
         hs.message = "Unknown"
         return hs
-    wos.cpd.ibm.com/WOService:
-      health.lua: |
+    - group: wos.cpd.ibm.com
+      kind: WOService
+      check: |
         hs = {}
         if obj.status ~= nil then
           if obj.status.wosStatus ~= nil then
@@ -706,8 +734,9 @@ spec:
         hs.status = "Progressing"
         hs.message = "Unknown"
         return hs
-    ws.cpd.ibm.com/WS:
-      health.lua: |
+    - group: ws.cpd.ibm.com
+      kind: WS
+      check: |
         hs = {}
         if obj.status ~= nil then
           if obj.status.wsStatus ~= nil then
@@ -727,8 +756,9 @@ spec:
         hs.status = "Progressing"
         hs.message = "Unknown"
         return hs
-    isc.ibm.com/CP4SThreatManagement:
-      health.lua: |
+    - group: isc.ibm.com
+      kind: CP4SThreatManagement
+      check: |
         hs = {}
         hs.status = "Progressing"
 

diff --git a/config/rhacm/seeds/Chart.yaml b/config/rhacm/seeds/Chart.yaml
@@ -16,7 +16,7 @@ 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.13.0
+version: 0.14.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

diff --git a/config/rhacm/seeds/templates/0200-policy-openshift-gitops.yaml b/config/rhacm/seeds/templates/0200-policy-openshift-gitops.yaml
@@ -37,7 +37,7 @@ spec:
                   name: openshift-gitops-operator
                   namespace: openshift-operators
                 spec:
-                  channel: gitops-1.8
+                  channel: gitops-1.10
                   installPlanApproval: Automatic
                   name: openshift-gitops-operator
                   source: redhat-operators