fix: Add missing statuses to MinIO Tenant health check (argoproj#10815)

Signed-off-by: dnskr <[email protected]> Signed-off-by: dnskr <[email protected]>
Barneyblanco · Oct 7, 2022 · 8e3b915 · 8e3b915
1 parent ee47700
commit 8e3b915
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 0 deletions.
diff --git a/resource_customizations/minio.min.io/Tenant/health.lua b/resource_customizations/minio.min.io/Tenant/health.lua
@@ -36,11 +36,21 @@ if obj.status ~= nil then
             health_status.message = obj.status.currentState
             return health_status
         end
+        if obj.status.currentState == "Tenant credentials are not set properly" then
+            health_status.status = "Degraded"
+            health_status.message = obj.status.currentState
+            return health_status
+        end
         if obj.status.currentState == "Different versions across MinIO Pools" then
             health_status.status = "Degraded"
             health_status.message = obj.status.currentState
             return health_status
         end
+        if obj.status.currentState == "Pool Decommissioning Not Allowed" then
+            health_status.status = "Degraded"
+            health_status.message = obj.status.currentState
+            return health_status
+        end
         health_status.status = "Progressing"
         health_status.message = obj.status.currentState
         return health_status

diff --git a/resource_customizations/minio.min.io/Tenant/health_test.yaml b/resource_customizations/minio.min.io/Tenant/health_test.yaml
@@ -23,10 +23,18 @@ tests:
     status: Degraded
     message: "Another MinIO Tenant already exists in the namespace"
   inputPath: testdata/another_tenant_exists.yaml
+- healthStatus:
+    status: Degraded
+    message: "Tenant credentials are not set properly"
+  inputPath: testdata/incorrect_tenant_credentials.yaml
 - healthStatus:
     status: Degraded
     message: "Different versions across MinIO Pools"
   inputPath: testdata/versions_mismatch.yaml
+- healthStatus:
+    status: Degraded
+    message: "Pool Decommissioning Not Allowed"
+  inputPath: testdata/pool_decommissioning_not_allowed.yaml
 - healthStatus:
     status: Progressing
     message: "<unknown status message>"

diff --git a/resource_customizations/minio.min.io/Tenant/testdata/incorrect_tenant_credentials.yaml b/resource_customizations/minio.min.io/Tenant/testdata/incorrect_tenant_credentials.yaml
@@ -0,0 +1,13 @@
+apiVersion: minio.min.io/v2
+kind: Tenant
+metadata:
+  name: minio-tenant
+spec:
+  image: minio/minio:latest
+  pools:
+    - name: pool-0
+      servers: 1
+      volumesPerServer: 4
+status:
+  revision: 0
+  currentState: Tenant credentials are not set properly
diff --git a/resource_customizations/minio.min.io/Tenant/testdata/pool_decommissioning_not_allowed.yaml b/resource_customizations/minio.min.io/Tenant/testdata/pool_decommissioning_not_allowed.yaml
@@ -0,0 +1,13 @@
+apiVersion: minio.min.io/v2
+kind: Tenant
+metadata:
+  name: minio-tenant
+spec:
+  image: minio/minio:latest
+  pools:
+    - name: pool-0
+      servers: 1
+      volumesPerServer: 4
+status:
+  revision: 0
+  currentState: Pool Decommissioning Not Allowed