Skip to content

Commit 4fa6832

Browse files
NoxsiosNoxsios
authored
Merge branch 'main' into release-cleanup
2 parents 6005b93 + 95c42ff commit 4fa6832

59 files changed

Lines changed: 1541 additions & 830 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/nightly-eks.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848

4949
- name: Deploy the eks package
5050
run: |
51-
./build/zarf package deploy build/zarf-package-distro-eks-multi-0.0.3.tar.zst \
51+
./build/zarf package deploy build/zarf-package-distro-eks-amd64-0.0.3.tar.zst \
5252
--components=deploy-eks-cluster \
5353
--set=EKS_CLUSTER_NAME=${{ inputs.cluster_name || 'zarf-nightly-eks-e2e-test' }} \
5454
--set=EKS_INSTANCE_TYPE=${{ inputs.instance_type || 't3.medium' }} \
@@ -60,7 +60,7 @@ jobs:
6060
- name: Teardown the cluster
6161
if: always()
6262
run: |
63-
./build/zarf package deploy build/zarf-package-distro-eks-multi-0.0.3.tar.zst \
63+
./build/zarf package deploy build/zarf-package-distro-eks-amd64-0.0.3.tar.zst \
6464
--components=teardown-eks-cluster \
6565
--set=EKS_CLUSTER_NAME=${{ inputs.cluster_name || 'zarf-nightly-eks-e2e-test' }} \
6666
--confirm

‎docs-website/static/docs/tutorials/package_deploy_wordpress_suggestions.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<b class="YEL">Saving log file to
5151
/var/folders/bk/rz1xx2sd5zn134c0_j1s2n5r0000gp/T/zarf-2023-03-23-13-18-54-4086179855.log</b>
5252
<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>
53-
<b class=WHI> zarf-package-distro-eks-multi.tar.zst</b>
53+
<b class=WHI> zarf-package-distro-eks-amd64.tar.zst</b>
5454
<b class=CYN>> zarf-package-wordpress-amd64-16.0.4.tar.zst</b>
5555
</pre>
5656
</body>

0 commit comments

Comments
 (0)