Merge pull request #385 from vshn/fix/readiness_checks

Explicitly specify readiness checks
vshn · Jun 17, 2024 · 1f6b1d0 · 1f6b1d0
2 parents 75f9ac1 + 70f2066
commit 1f6b1d0
Show file tree

Hide file tree

Showing 17 changed files with 110 additions and 6 deletions.
diff --git a/component/component/common.libsonnet b/component/component/common.libsonnet
@@ -164,7 +164,13 @@ local defaultReadinessCheck() = {
         status: 'True',
         type: 'Ready',
       },
-
+      type: 'MatchCondition',
+    },
+    {
+      matchCondition: {
+        status: 'True',
+        type: 'Ready',
+      },
       type: 'MatchCondition',
     },
   ],

diff --git a/component/component/exoscale_kafka.jsonnet b/component/component/exoscale_kafka.jsonnet
@@ -93,7 +93,7 @@ local composition =
             comp.ToCompositeFieldPath('status.atProvider.version', 'status.version'),
             comp.FromCompositeFieldPath('spec.parameters.service.zone', 'metadata.annotations[appcat.vshn.io/cloudzone]'),
           ],
-        },
+        } + common.DefaultReadinessCheck(),
       ],
     },
   };

diff --git a/component/component/exoscale_mysql.jsonnet b/component/component/exoscale_mysql.jsonnet
@@ -96,7 +96,7 @@ local composition =
             comp.FromCompositeFieldPath('spec.parameters.backup.timeOfDay', 'spec.forProvider.backup.timeOfDay'),
             comp.FromCompositeFieldPath('spec.parameters.service.zone', 'metadata.annotations[appcat.vshn.io/cloudzone]'),
           ],
-        },
+        } + common.DefaultReadinessCheck(),
       ],
     },
   };

diff --git a/component/component/exoscale_opensearch.jsonnet b/component/component/exoscale_opensearch.jsonnet
@@ -95,7 +95,7 @@ local composition =
             comp.FromCompositeFieldPath('spec.parameters.backup.timeOfDay', 'spec.forProvider.backup.timeOfDay'),
             comp.FromCompositeFieldPath('spec.parameters.service.zone', 'metadata.annotations[appcat.vshn.io/cloudzone]'),
           ],
-        },
+        } + common.DefaultReadinessCheck(),
       ],
     },
   };

diff --git a/component/component/exoscale_postgres.jsonnet b/component/component/exoscale_postgres.jsonnet
@@ -96,7 +96,7 @@ local composition =
             comp.FromCompositeFieldPath('spec.parameters.backup.timeOfDay', 'spec.forProvider.backup.timeOfDay'),
             comp.FromCompositeFieldPath('spec.parameters.service.zone', 'metadata.annotations[appcat.vshn.io/cloudzone]'),
           ],
-        },
+        } + common.DefaultReadinessCheck(),
       ],
     },
   };

diff --git a/component/component/exoscale_redis.jsonnet b/component/component/exoscale_redis.jsonnet
@@ -88,7 +88,7 @@ local composition =
             comp.FromCompositeFieldPath('spec.parameters.maintenance.timeOfDay', 'spec.forProvider.maintenance.timeOfDay'),
             comp.FromCompositeFieldPath('spec.parameters.service.zone', 'metadata.annotations[appcat.vshn.io/cloudzone]'),
           ],
-        },
+        } + common.DefaultReadinessCheck(),
       ],
     },
   };

diff --git a/component/tests/golden/cloudscale/appcat/appcat/21_composition_objectstorage_cloudscale.yaml b/component/tests/golden/cloudscale/appcat/appcat/21_composition_objectstorage_cloudscale.yaml
@@ -76,6 +76,10 @@ spec:
             status: 'True'
             type: Ready
           type: MatchCondition
+        - matchCondition:
+            status: 'True'
+            type: Ready
+          type: MatchCondition
     - base:
         apiVersion: cloudscale.crossplane.io/v1
         kind: Bucket
@@ -142,4 +146,8 @@ spec:
             status: 'True'
             type: Ready
           type: MatchCondition
+        - matchCondition:
+            status: 'True'
+            type: Ready
+          type: MatchCondition
   writeConnectionSecretsToNamespace: syn-crossplane
diff --git a/component/tests/golden/exoscale/appcat/appcat/21_composition_exoscale_kafka.yaml b/component/tests/golden/exoscale/appcat/appcat/21_composition_exoscale_kafka.yaml
@@ -99,4 +99,13 @@ spec:
         - fromFieldPath: spec.parameters.service.zone
           toFieldPath: metadata.annotations[appcat.vshn.io/cloudzone]
           type: FromCompositeFieldPath
+      readinessChecks:
+        - matchCondition:
+            status: 'True'
+            type: Ready
+          type: MatchCondition
+        - matchCondition:
+            status: 'True'
+            type: Ready
+          type: MatchCondition
   writeConnectionSecretsToNamespace: crossplane-system
diff --git a/component/tests/golden/exoscale/appcat/appcat/21_composition_exoscale_mysql.yaml b/component/tests/golden/exoscale/appcat/appcat/21_composition_exoscale_mysql.yaml
@@ -101,4 +101,13 @@ spec:
         - fromFieldPath: spec.parameters.service.zone
           toFieldPath: metadata.annotations[appcat.vshn.io/cloudzone]
           type: FromCompositeFieldPath
+      readinessChecks:
+        - matchCondition:
+            status: 'True'
+            type: Ready
+          type: MatchCondition
+        - matchCondition:
+            status: 'True'
+            type: Ready
+          type: MatchCondition
   writeConnectionSecretsToNamespace: crossplane-system
diff --git a/component/tests/golden/exoscale/appcat/appcat/21_composition_exoscale_opensearch.yaml b/component/tests/golden/exoscale/appcat/appcat/21_composition_exoscale_opensearch.yaml
@@ -98,4 +98,13 @@ spec:
         - fromFieldPath: spec.parameters.service.zone
           toFieldPath: metadata.annotations[appcat.vshn.io/cloudzone]
           type: FromCompositeFieldPath
+      readinessChecks:
+        - matchCondition:
+            status: 'True'
+            type: Ready
+          type: MatchCondition
+        - matchCondition:
+            status: 'True'
+            type: Ready
+          type: MatchCondition
   writeConnectionSecretsToNamespace: crossplane-system
diff --git a/component/tests/golden/exoscale/appcat/appcat/21_composition_exoscale_postgres.yaml b/component/tests/golden/exoscale/appcat/appcat/21_composition_exoscale_postgres.yaml
@@ -101,4 +101,13 @@ spec:
         - fromFieldPath: spec.parameters.service.zone
           toFieldPath: metadata.annotations[appcat.vshn.io/cloudzone]
           type: FromCompositeFieldPath
+      readinessChecks:
+        - matchCondition:
+            status: 'True'
+            type: Ready
+          type: MatchCondition
+        - matchCondition:
+            status: 'True'
+            type: Ready
+          type: MatchCondition
   writeConnectionSecretsToNamespace: crossplane-system
diff --git a/component/tests/golden/exoscale/appcat/appcat/21_composition_exoscale_redis.yaml b/component/tests/golden/exoscale/appcat/appcat/21_composition_exoscale_redis.yaml
@@ -86,4 +86,13 @@ spec:
         - fromFieldPath: spec.parameters.service.zone
           toFieldPath: metadata.annotations[appcat.vshn.io/cloudzone]
           type: FromCompositeFieldPath
+      readinessChecks:
+        - matchCondition:
+            status: 'True'
+            type: Ready
+          type: MatchCondition
+        - matchCondition:
+            status: 'True'
+            type: Ready
+          type: MatchCondition
   writeConnectionSecretsToNamespace: crossplane-system
diff --git a/component/tests/golden/openshift/appcat/appcat/21_composition_exoscale_kafka.yaml b/component/tests/golden/openshift/appcat/appcat/21_composition_exoscale_kafka.yaml
@@ -99,4 +99,13 @@ spec:
         - fromFieldPath: spec.parameters.service.zone
           toFieldPath: metadata.annotations[appcat.vshn.io/cloudzone]
           type: FromCompositeFieldPath
+      readinessChecks:
+        - matchCondition:
+            status: 'True'
+            type: Ready
+          type: MatchCondition
+        - matchCondition:
+            status: 'True'
+            type: Ready
+          type: MatchCondition
   writeConnectionSecretsToNamespace: syn-crossplane
diff --git a/component/tests/golden/openshift/appcat/appcat/21_composition_exoscale_mysql.yaml b/component/tests/golden/openshift/appcat/appcat/21_composition_exoscale_mysql.yaml
@@ -101,4 +101,13 @@ spec:
         - fromFieldPath: spec.parameters.service.zone
           toFieldPath: metadata.annotations[appcat.vshn.io/cloudzone]
           type: FromCompositeFieldPath
+      readinessChecks:
+        - matchCondition:
+            status: 'True'
+            type: Ready
+          type: MatchCondition
+        - matchCondition:
+            status: 'True'
+            type: Ready
+          type: MatchCondition
   writeConnectionSecretsToNamespace: syn-crossplane
diff --git a/component/tests/golden/openshift/appcat/appcat/21_composition_exoscale_opensearch.yaml b/component/tests/golden/openshift/appcat/appcat/21_composition_exoscale_opensearch.yaml
@@ -98,4 +98,13 @@ spec:
         - fromFieldPath: spec.parameters.service.zone
           toFieldPath: metadata.annotations[appcat.vshn.io/cloudzone]
           type: FromCompositeFieldPath
+      readinessChecks:
+        - matchCondition:
+            status: 'True'
+            type: Ready
+          type: MatchCondition
+        - matchCondition:
+            status: 'True'
+            type: Ready
+          type: MatchCondition
   writeConnectionSecretsToNamespace: syn-crossplane
diff --git a/component/tests/golden/openshift/appcat/appcat/21_composition_exoscale_postgres.yaml b/component/tests/golden/openshift/appcat/appcat/21_composition_exoscale_postgres.yaml
@@ -101,4 +101,13 @@ spec:
         - fromFieldPath: spec.parameters.service.zone
           toFieldPath: metadata.annotations[appcat.vshn.io/cloudzone]
           type: FromCompositeFieldPath
+      readinessChecks:
+        - matchCondition:
+            status: 'True'
+            type: Ready
+          type: MatchCondition
+        - matchCondition:
+            status: 'True'
+            type: Ready
+          type: MatchCondition
   writeConnectionSecretsToNamespace: syn-crossplane
diff --git a/component/tests/golden/openshift/appcat/appcat/21_composition_exoscale_redis.yaml b/component/tests/golden/openshift/appcat/appcat/21_composition_exoscale_redis.yaml
@@ -86,4 +86,13 @@ spec:
         - fromFieldPath: spec.parameters.service.zone
           toFieldPath: metadata.annotations[appcat.vshn.io/cloudzone]
           type: FromCompositeFieldPath
+      readinessChecks:
+        - matchCondition:
+            status: 'True'
+            type: Ready
+          type: MatchCondition
+        - matchCondition:
+            status: 'True'
+            type: Ready
+          type: MatchCondition
   writeConnectionSecretsToNamespace: syn-crossplane
-Original file line number
+Diff line change
@@ Expand Up / @@ -93,7 +93,7 @@ local composition = @@
                 comp.ToCompositeFieldPath('status.atProvider.version', 'status.version'),
                 comp.FromCompositeFieldPath('spec.parameters.service.zone', 'metadata.annotations[appcat.vshn.io/cloudzone]'),
               ],
-            },
+            } + common.DefaultReadinessCheck(),
           ],
         },
       };
@@ Expand Down @@