ci: add force-flag support

edgelesssys · Dec 7, 2023 · a4a4c88 · a4a4c88
1 parent efbd62b
commit a4a4c88
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/.github/actions/constellation_create/action.yml b/.github/actions/constellation_create/action.yml
@@ -56,6 +56,9 @@ inputs:
   marketplaceImageVersion:
     description: "Marketplace OS image version. Used instead of osImage."
     required: false
+  force:
+    description: "Set the force-flag on apply to ignore version mismatches."
+    required: false
 
 outputs:
   kubeconfig:
@@ -173,11 +176,18 @@ runs:
         kubernetesVersion: ${{ inputs.kubernetesVersion }}
         selfManagedInfra: ${{ inputs.selfManagedInfra }}
 
+    - name: Set force flag
+      id: set-force-flag
+      if: inputs.force == 'true'
+      shell: bash
+      run: |
+        echo "flag=--force" | tee -a $GITHUB_OUTPUT
+
     - name: Constellation init
       id: constellation-init
       shell: bash
       run: |
-        constellation apply --skip-phases=infrastructure --debug
+        constellation apply --skip-phases=infrastructure --debug ${{ steps.set-force-flag.outputs.flag }}
         echo "KUBECONFIG=$(pwd)/constellation-admin.conf" | tee -a $GITHUB_OUTPUT
 
     - name: Wait for nodes to join and become ready

diff --git a/.github/actions/e2e_test/action.yml b/.github/actions/e2e_test/action.yml
@@ -83,6 +83,9 @@ inputs:
   marketplaceImageVersion:
     description: "Marketplace OS image version. Used instead of osImage."
     required: false
+  force:
+    description: "Set the force-flag on apply to ignore version mismatches."
+    required: false
 
 outputs:
   kubeconfig:
@@ -270,6 +273,7 @@ runs:
         test: ${{ inputs.test }}
         selfManagedInfra: ${{ inputs.selfManagedInfra }}
         marketplaceImageVersion: ${{ inputs.marketplaceImageVersion }}
+        force: ${{ inputs.force }}
 
     - name: Deploy log- and metrics-collection (Kubernetes)
       id: deploy-logcollection

diff --git a/.github/workflows/e2e-test-marketplace-image.yml b/.github/workflows/e2e-test-marketplace-image.yml
@@ -84,3 +84,4 @@ jobs:
       regionZone: ${{ inputs.regionZone }}
       git-ref: ${{ inputs.git-ref }}
       marketplaceImageVersion: ${{ inputs.marketplaceImageVersion }}
+      force: true
diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
@@ -119,6 +119,9 @@ on:
       marketplaceImageVersion:
         description: "Marketplace image version to use."
         type: string
+      force:
+        description: "Use the force-flag when applying to ignore version mismatches."
+        type: boolean
 
 jobs:
   split-nodeCount:
@@ -242,6 +245,7 @@ jobs:
           s3AccessKey: ${{ secrets.AWS_ACCESS_KEY_ID_S3PROXY }}
           s3SecretKey: ${{ secrets.AWS_SECRET_ACCESS_KEY_S3PROXY }}
           marketplaceImageVersion: ${{ inputs.marketplaceImageVersion }}
+          force: ${{ inputs.force }}
 
       - name: Always terminate cluster
         if: always()