Merge branch 'main' into release-cleanup

defenseunicorns · Mar 21, 2024 · 4fa6832 · 4fa6832
2 parents 6005b93 + 95c42ff
commit 4fa6832
Show file tree

Hide file tree

Showing 59 changed files with 1,541 additions and 830 deletions.
diff --git a/.github/workflows/nightly-eks.yml b/.github/workflows/nightly-eks.yml
@@ -48,7 +48,7 @@ jobs:
 
       - name: Deploy the eks package
         run: |
-          ./build/zarf package deploy build/zarf-package-distro-eks-multi-0.0.3.tar.zst \
+          ./build/zarf package deploy build/zarf-package-distro-eks-amd64-0.0.3.tar.zst \
             --components=deploy-eks-cluster \
             --set=EKS_CLUSTER_NAME=${{ inputs.cluster_name || 'zarf-nightly-eks-e2e-test' }} \
             --set=EKS_INSTANCE_TYPE=${{ inputs.instance_type || 't3.medium' }} \
@@ -60,7 +60,7 @@ jobs:
       - name: Teardown the cluster
         if: always()
         run: |
-          ./build/zarf package deploy build/zarf-package-distro-eks-multi-0.0.3.tar.zst \
+          ./build/zarf package deploy build/zarf-package-distro-eks-amd64-0.0.3.tar.zst \
             --components=teardown-eks-cluster \
             --set=EKS_CLUSTER_NAME=${{ inputs.cluster_name || 'zarf-nightly-eks-e2e-test' }} \
             --confirm

diff --git a/docs-website/static/docs/tutorials/package_deploy_wordpress_suggestions.html b/docs-website/static/docs/tutorials/package_deploy_wordpress_suggestions.html
@@ -50,7 +50,7 @@
 <b class="YEL">Saving log file to
 /var/folders/bk/rz1xx2sd5zn134c0_j1s2n5r0000gp/T/zarf-2023-03-23-13-18-54-4086179855.log</b>
 <b class="BOLD" style="color:#55ff55;">? </b><b class="BOLD">Choose or type the package file </b><b class="WHI">zarf-package-helm-oci-chart-arm64-0.0.1.tar.zst</b><b class=CYN>[</b><b class=CYN>tab for suggestions]</b>
-<b class=WHI>  zarf-package-distro-eks-multi.tar.zst</b>
+<b class=WHI>  zarf-package-distro-eks-amd64.tar.zst</b>
 <b class=CYN>> zarf-package-wordpress-amd64-16.0.4.tar.zst</b>
 </pre>
 </body>