add comment

Signed-off-by: PoAn Yang <[email protected]>

Author: FrankYang0529

.github/workflows/rancher-integration.yaml

@@ -92,23 +92,23 @@ jobs:
         working-directory: ./ci/terraform
         run: |
           ./cleanup_test_files.sh
-      - name: Testing existing files
+      - name: Check files exist on provisioned hosts
         working-directory: ./ci/terraform
         run: |
           ./check_files.sh ${{ steps.ipxe.outputs.VAGRANT_HOME }}/settings.yml
-      - name: Testing services status
+      - name: Check system services status on provisioned hosts
         working-directory: ./ci/terraform
         run: |
           ./check_services_status.sh ${{ steps.ipxe.outputs.VAGRANT_HOME }}/settings.yml
-      - name: Testing basic operations with terraform
+      - name: Create Harvester resources for testing
         working-directory: ./ci/terraform
         run: |
           curl https://releases.hashicorp.com/terraform/1.3.7/terraform_1.3.7_linux_amd64.zip -o terraform_bin.zip
           unzip -o terraform_bin.zip
           ./get_kubeconfig.sh ${{ steps.ipxe.outputs.VAGRANT_HOME }}/settings.yml
           ./terraform init -no-color
           ./terraform apply -auto-approve -no-color
-      - name: Test network on the VMs
+      - name: Test VM networking
         working-directory: ./ci/terraform
         run: |
           ./test_terraform_vm.sh ${{ steps.ipxe.outputs.VAGRANT_HOME }}/settings.yml
@@ -141,7 +141,7 @@ jobs:
             exit 1
           fi
 
-      - name: Check rotate RKE2 certificates
+      - name: Test RKE2 cert rotation
         run: |
           node0_ip=$(yq e ".harvester_network_config.cluster[0].ip" ${{ steps.ipxe.outputs.VAGRANT_HOME }}/settings.yml)
           first_enddate=$(ssh -o "StrictHostKeyChecking no" -i tmp-ssh-key rancher@$node0_ip "openssl x509 -in /var/lib/rancher/rke2/server/tls/serving-kube-apiserver.crt -noout -enddate")

.github/workflows/rancher-upgrade-integration.yaml

@@ -102,51 +102,29 @@ jobs:
         working-directory: ./ci/terraform
         run: |
           ./cleanup_test_files.sh
-      - name: Testing existing files
+      - name: Check files exist on provisioned hosts
         working-directory: ./ci/terraform
         run: |
           ./check_files.sh ${{ steps.ipxe.outputs.VAGRANT_HOME }}/settings.yml
-      - name: Testing services status
+      - name: Check system services status on provisioned hosts
         working-directory: ./ci/terraform
         run: |
           ./check_services_status.sh ${{ steps.ipxe.outputs.VAGRANT_HOME }}/settings.yml
 
-      - name: Create new-version.yaml
-        run: |
-          echo "apiVersion: harvesterhci.io/v1beta1" > new-version.yaml
-          echo "kind: Version" >> new-version.yaml
-          echo "metadata:" >> new-version.yaml
-          echo "  name: master-head" >> new-version.yaml
-          echo "  namespace: harvester-system" >> new-version.yaml
-          echo "spec:" >> new-version.yaml
-          echo "  isoURL: http://localhost:8000/dist/artifacts/harvester-master-amd64.iso" >> new-version.yaml
-          echo "  minUpgradableVersion: v1.3.1" >> new-version.yaml
-          echo "  releaseDate: \"202401231\"" >> new-version.yaml
-          echo "  tags:" >> new-version.yaml
-          echo "  - dev" >> new-version.yaml
-          echo "  - test" >> new-version.yaml
-
-      - name: Create new-upgrade.yaml
+      - name: Start file server
         run: |
-          echo "apiVersion: harvesterhci.io/v1beta1" > new-version.yaml
-          echo "kind: Upgrade" >> new-version.yaml
-          echo "metadata:" >> new-version.yaml
-          echo "  name: master-head" >> new-version.yaml
-          echo "  namespace: harvester-system" >> new-version.yaml
-          echo "spec:" >> new-version.yaml
-          echo "  logEnabled: true" >> new-version.yaml
-          echo "  version: master-head" >> new-version.yaml
+          python3 -m http.server 8000 --bind 0.0.0.0 &
 
-      - name: Apply new-version.yaml
+      - name: Create new-version.yaml
+        working-directory: ./ci/upgrade
         run: |
+          ./create_version_file.sh
           kubectl apply -f new-version.yaml
 
-      - name: Start file server
-        run: |
-          python3 -m http.server 8000 --bind 0.0.0.0 &
-
-      - name: Apply new-upgrade.yaml
+      - name: Create new-upgrade.yaml
+        working-directory: ./ci/upgrade
         run: |
+          ./create_upgrade_file.sh
           kubectl apply -f new-upgrade.yaml
 
       - name: Wait for upgrade to complete

ci/upgrade/create_upgrade_file.sh

@@ -0,0 +1,12 @@
+#!/bin/bash -ex
+
+cat <<EOF > new-upgrade.yaml
+apiVersion: harvesterhci.io/v1beta1
+kind: Upgrade
+metadata:
+  name: master-head
+  namespace: harvester-system
+spec:
+  logEnabled: true
+  version: master-head
+EOF

ci/upgrade/create_version_file.sh

@@ -0,0 +1,16 @@
+#!/bin/bash -ex
+
+cat <<EOF > new-version.yaml
+apiVersion: harvesterhci.io/v1beta1
+kind: Version
+metadata:
+  name: master-head
+  namespace: harvester-system
+spec:
+  isoURL: http://localhost:8000/dist/artifacts/harvester-master-amd64.iso
+  minUpgradableVersion: v1.3.1
+  releaseDate: 202401231
+  tags:
+  - dev
+  - test
+EOF