Skip to content

Commit

Permalink
fix: parameterize k3s & PE versions
Browse files Browse the repository at this point in the history 
Signed-off-by: Tyler Gillson <[email protected]>
  • Loading branch information
@TylerGillson
TylerGillson committed Jan 10, 2024
1 parent e479c83 commit dc6bf12
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 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.1.2-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-K3S_VERSION-vPE_VERSION-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.1.2-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-K3S_VERSION-vPE_VERSION-STYLUS_HASH\"",
"manifests": []
},
{
Expand Down
4 changes: 4 additions & 0 deletions test/test-two-node.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,8 @@ function prepare_cluster_profile() {
.spec.template.packs[1].registry.metadata.uid = env.PUBLIC_PACK_REPO_UID |
.spec.template.packs[2].registry.metadata.uid = env.PUBLIC_PACK_REPO_UID |
.spec.template.packs[0].values |= gsub("OCI_REGISTRY"; env.OCI_REGISTRY) |
.spec.template.packs[0].values |= gsub("PE_VERSION"; env.PE_VERSION) |
.spec.template.packs[0].values |= gsub("K3S_VERSION"; "1.26.4") |
.spec.template.packs[0].values |= gsub("STYLUS_HASH"; env.STYLUS_HASH)
' test/templates/two-node-cluster-profile.json.tmpl > two-node-cluster-profile.json
}
Expand Down Expand Up @@ -314,6 +316,8 @@ function prepare_cluster() {
.spec.machinePoolConfig[1].cloudConfig.edgeHosts[0].nicName = env.NIC_NAME |
.spec.profiles[0].uid = env.CLUSTER_PROFILE_UID |
.spec.profiles[0].packValues[0].values |= gsub("OCI_REGISTRY"; env.OCI_REGISTRY) |
.spec.profiles[0].packValues[0].values |= gsub("PE_VERSION"; env.PE_VERSION) |
.spec.profiles[0].packValues[0].values |= gsub("K3S_VERSION"; "1.26.4") |
.spec.profiles[0].packValues[0].values |= gsub("STYLUS_HASH"; env.STYLUS_HASH)
' test/templates/two-node-create.json.tmpl > two-node-create.json
}
Expand Down

0 comments on commit dc6bf12

Please sign in to comment.