Merge pull request #90 from form3tech-oss/sergii-add-more-retries-to-…

…hv-recovery Split recovery into phases to use parallel steps better
form3tech-oss · Sep 17, 2024 · 29046a4 · 29046a4
2 parents 37ad69b + 7168c7b
commit 29046a4
Show file tree

Hide file tree

Showing 10 changed files with 296 additions and 147 deletions.
diff --git a/.github/workflows/build_targets.yaml b/.github/workflows/build_targets.yaml
@@ -100,7 +100,7 @@ jobs:
           key: ${{ inputs.images-cache-key }}
 
       - name: Upload saved images
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ inputs.images-artifact-name }}
           path: ./output/saved-images
@@ -134,7 +134,7 @@ jobs:
           key: ${{ inputs.e2e-binary-cache-key }}
 
       - name: Upload e2e binary
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ inputs.e2e-binary-name }}
           path: ./e2e-test/image/e2e/bin
@@ -169,7 +169,7 @@ jobs:
           echo "chart-name=$chart_name" >> $GITHUB_OUTPUT
 
       - name: Upload chart
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ inputs.chart-artifact-name }}
           path: ${{ steps.build-chart.outputs.chart-path }}

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -49,14 +49,14 @@ jobs:
     steps:
       - name: Download saved images
         id: download-images
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: ${{ needs.build-targets.outputs.images-artifact-name }}
           path: ./output/${{ needs.build-targets.outputs.images-artifact-name }}
 
       - name: Download chart
         id: download-chart
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: ${{ needs.build-targets.outputs.chart-artifact-name }}
           path: ./output/${{ needs.build-targets.outputs.chart-artifact-name }}

diff --git a/.github/workflows/e2e_test.yaml b/.github/workflows/e2e_test.yaml
@@ -40,13 +40,13 @@ jobs:
         uses: actions/checkout@v2
 
       - name: download saved images
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: ${{ inputs.images-artifact-name }}
           path: ./output/saved-images
 
       - name: download e2e binary
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: ${{ inputs.e2e-binary-name }}
           path: ./output/e2e-binary

diff --git a/.github/workflows/integration_test.yaml b/.github/workflows/integration_test.yaml
@@ -22,7 +22,7 @@ jobs:
 
       - name: Download saved images
         id: download-images
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: ${{ inputs.images-artifact-name }}
           path: ./output/${{ inputs.images-artifact-name }}
@@ -85,7 +85,7 @@ jobs:
 
       - name: Post run - upload kubernetes cluster info dump
         if: always()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: integration-test-kubernetes-cluster-info-dump
           path: cluster-info-dump

diff --git a/api/v1alpha1/cloudstackhostchaos_types.go b/api/v1alpha1/cloudstackhostchaos_types.go
@@ -80,6 +80,15 @@ type CloudStackHostChaosSpec struct {
 // CloudStackHostChaosStatus represents the status of a CloudStackChaos.
 type CloudStackHostChaosStatus struct {
 	ChaosStatus `json:",inline"`
+
+	// Instances keeps track of the affected hosts and vms
+	// +optional
+	Instances map[string]CloudStackHostAffected `json:"affectedHosts,omitempty"`
+}
+
+type CloudStackHostAffected struct {
+	Name string   `json:"name,omitempty"`
+	VMs  []string `json:"vms,omitempty"`
 }
 
 type CloudStackHostChaosSelector struct {
@@ -116,3 +125,7 @@ func (selector *CloudStackHostChaosSelector) Id() string {
 func (obj *CloudStackHostChaos) GetSelectorSpecs() map[string]interface{} {
 	return map[string]interface{}{".": &obj.Spec.Selector}
 }
+
+func (obj *CloudStackHostChaos) GetCustomStatus() interface{} {
+	return &obj.Status.Instances
+}
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/chaos-mesh.org_cloudstackhostchaos.yaml b/config/crd/bases/chaos-mesh.org_cloudstackhostchaos.yaml
@@ -120,6 +120,18 @@ spec:
           status:
             description: CloudStackHostChaosStatus represents the status of a CloudStackChaos.
             properties:
+              affectedHosts:
+                additionalProperties:
+                  properties:
+                    name:
+                      type: string
+                    vms:
+                      items:
+                        type: string
+                      type: array
+                  type: object
+                description: Instances keeps track of the affected hosts and vms
+                type: object
               conditions:
                 description: Conditions represents the current global condition of
                   the chaos