Skip to content

Commit

Permalink
fix: increase EARTHLY_BUILDKIT_CACHE_SIZE_MB & upgrade PE version
Browse files Browse the repository at this point in the history 
Signed-off-by: Tyler Gillson <[email protected]>
  • Loading branch information
@TylerGillson
TylerGillson committed Nov 7, 2023
1 parent 5efa2fe commit b22e102
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 11 deletions.
2 changes: 1 addition & 1 deletion test/templates/two-node-cluster-profile.json.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"layer": "os",
"version": "1.0.0",
"tag": "1.0.0",
"values": "pack:\n content:\n images:\n - image: \"{{.spectro.pack.edge-native-byoi.options.system.uri}}\"\n # Below config is default value, please uncomment if you want to modify default values\n #drain:\n #cordon: true\n #timeout: 60 # The length of time to wait before giving up, zero means infinite\n #gracePeriod: 60 # Period of time in seconds given to each pod to terminate gracefully. If negative, the default value specified in the pod will be used\n #ignoreDaemonSets: true\n #deleteLocalData: true # Continue even if there are pods using emptyDir (local data that will be deleted when the node is drained)\n #force: true # Continue even if there are pods that do not declare a controller\n #disableEviction: false # Force drain to use delete, even if eviction is supported. This will bypass checking PodDisruptionBudgets, use with caution\n #skipWaitForDeleteTimeout: 60 # If pod DeletionTimestamp older than N seconds, skip waiting for the pod. Seconds must be greater than 0 to skip.\nstylusPackage: container://OCI_REGISTRY/stylus-linux-amd64:v0.0.0-STYLUS_HASH\noptions:\n system.uri: \"OCI_REGISTRY/ubuntu:k3s-1.26.4-v4.0.4-STYLUS_HASH\"",
"values": "pack:\n content:\n images:\n - image: \"{{.spectro.pack.edge-native-byoi.options.system.uri}}\"\n # Below config is default value, please uncomment if you want to modify default values\n #drain:\n #cordon: true\n #timeout: 60 # The length of time to wait before giving up, zero means infinite\n #gracePeriod: 60 # Period of time in seconds given to each pod to terminate gracefully. If negative, the default value specified in the pod will be used\n #ignoreDaemonSets: true\n #deleteLocalData: true # Continue even if there are pods using emptyDir (local data that will be deleted when the node is drained)\n #force: true # Continue even if there are pods that do not declare a controller\n #disableEviction: false # Force drain to use delete, even if eviction is supported. This will bypass checking PodDisruptionBudgets, use with caution\n #skipWaitForDeleteTimeout: 60 # If pod DeletionTimestamp older than N seconds, skip waiting for the pod. Seconds must be greater than 0 to skip.\nstylusPackage: container://OCI_REGISTRY/stylus-linux-amd64:v0.0.0-STYLUS_HASH\noptions:\n system.uri: \"OCI_REGISTRY/ubuntu:k3s-1.26.4-v4.1.2-STYLUS_HASH\"",
"registry": {
"metadata": {
"uid": "_____place_holder_____",
Expand Down
2 changes: 1 addition & 1 deletion test/templates/two-node-create.json.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"tag": "1.0.0",
"name": "edge-native-byoi",
"type": "spectro",
"values": "pack:\n content:\n images:\n - image: \"{{.spectro.pack.edge-native-byoi.options.system.uri}}\"\n # Below config is default value, please uncomment if you want to modify default values\n #drain:\n #cordon: true\n #timeout: 60 # The length of time to wait before giving up, zero means infinite\n #gracePeriod: 60 # Period of time in seconds given to each pod to terminate gracefully. If negative, the default value specified in the pod will be used\n #ignoreDaemonSets: true\n #deleteLocalData: true # Continue even if there are pods using emptyDir (local data that will be deleted when the node is drained)\n #force: true # Continue even if there are pods that do not declare a controller\n #disableEviction: false # Force drain to use delete, even if eviction is supported. This will bypass checking PodDisruptionBudgets, use with caution\n #skipWaitForDeleteTimeout: 60 # If pod DeletionTimestamp older than N seconds, skip waiting for the pod. Seconds must be greater than 0 to skip.\nstylusPackage: container://OCI_REGISTRY/stylus-linux-amd64:v0.0.0-STYLUS_HASH\noptions:\n system.uri: \"OCI_REGISTRY/ubuntu:k3s-1.26.4-v4.0.4-STYLUS_HASH\"",
"values": "pack:\n content:\n images:\n - image: \"{{.spectro.pack.edge-native-byoi.options.system.uri}}\"\n # Below config is default value, please uncomment if you want to modify default values\n #drain:\n #cordon: true\n #timeout: 60 # The length of time to wait before giving up, zero means infinite\n #gracePeriod: 60 # Period of time in seconds given to each pod to terminate gracefully. If negative, the default value specified in the pod will be used\n #ignoreDaemonSets: true\n #deleteLocalData: true # Continue even if there are pods using emptyDir (local data that will be deleted when the node is drained)\n #force: true # Continue even if there are pods that do not declare a controller\n #disableEviction: false # Force drain to use delete, even if eviction is supported. This will bypass checking PodDisruptionBudgets, use with caution\n #skipWaitForDeleteTimeout: 60 # If pod DeletionTimestamp older than N seconds, skip waiting for the pod. Seconds must be greater than 0 to skip.\nstylusPackage: container://OCI_REGISTRY/stylus-linux-amd64:v0.0.0-STYLUS_HASH\noptions:\n system.uri: \"OCI_REGISTRY/ubuntu:k3s-1.26.4-v4.1.2-STYLUS_HASH\"",
"manifests": []
},
{
Expand Down
16 changes: 7 additions & 9 deletions test/test-two-node.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,12 @@ export CLUSTER_PROFILE_UID= # if left blank, a cluster profile will be created
export CLUSTER_VIP= # choose an unassigned VIP

# image vars
export EARTHLY_BUILDKIT_CACHE_SIZE_MB=20000
export OCI_REGISTRY=ttl.sh

# Do not edit anything below

declare -a vm_array=("two-node-one-$HOST_SUFFIX" "two-node-two-$HOST_SUFFIX")
declare -a vm_array=("2n1-$HOST_SUFFIX" "2n2-$HOST_SUFFIX")
export HOST_1="${vm_array[0]}-$HOST_SUFFIX"
export HOST_2="${vm_array[1]}-$HOST_SUFFIX"

Expand Down Expand Up @@ -394,8 +395,8 @@ function build_canvos() {
--IMAGE_REGISTRY=${OCI_REGISTRY} \
--TWO_NODE=true \
--CUSTOM_TAG=${STYLUS_HASH}
docker push ${OCI_REGISTRY}/ubuntu:k3s-1.26.4-v4.0.4-${STYLUS_HASH}
docker push ${OCI_REGISTRY}/ubuntu:k3s-1.27.2-v4.0.4-${STYLUS_HASH}
docker push ${OCI_REGISTRY}/ubuntu:k3s-1.26.4-v4.1.2-${STYLUS_HASH}
docker push ${OCI_REGISTRY}/ubuntu:k3s-1.27.2-v4.1.2-${STYLUS_HASH}
}

function build_all() {
Expand Down Expand Up @@ -423,18 +424,15 @@ function build_all() {
(
test -f build/palette-edge-installer-stylus-${STYLUS_HASH}-k3s-${PROVIDER_K3S_HASH}.iso && \
docker image ls --format "{{.Repository}}:{{.Tag}}" | \
grep -q ${OCI_REGISTRY}/ubuntu:k3s-1.26.4-v4.0.4-${STYLUS_HASH}
grep -q ${OCI_REGISTRY}/ubuntu:k3s-1.26.4-v4.1.2-${STYLUS_HASH}
) || ( build_canvos )
}

function clean_all() {
docker images | grep $OCI_REGISTRY | awk '{print $3;}' | xargs docker rmi --force
docker images | grep palette-installer | awk '{print $3;}' | xargs docker rmi --force
docker kill earthly-buildkitd
docker container prune --force
docker volume rm earthly-cache
docker volume prune --force
docker system prune --force
earthly prune --reset
docker system prune --all --volumes --force
}

function main() {
Expand Down

0 comments on commit b22e102

Please sign in to comment.