From 1c52aab9b1c6b0c14cf5429c351849ffa5700b93 Mon Sep 17 00:00:00 2001 From: Karl Cardenas Date: Tue, 11 Jul 2023 09:35:27 -0700 Subject: [PATCH 1/7] docs: updated the readme for ARM changes --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ef0beb5..0815f0f 100644 --- a/README.md +++ b/README.md @@ -97,6 +97,7 @@ cp .arg.template .arg | Parameter | Description | Type | Default Value | |------------------|-----------------------------------------------------------------------------------------------------------------------------------------|--------|------------------------| | CUSTOM_TAG | Environment name for provider image tagging. The default value is `demo`. | String | `demo` | +| ARCH | The platform architecture to create Edge artifacts for. Allowed values are `amd64`, `arm64`| String |`amd64`| | IMAGE_REGISTRY | Image registry name that will store the image artifacts. The default value points to the *ttl.sh* image registry, an anonymous and ephemeral Docker image registry where images live for a maximum of 24 hours by default. If you wish to make the images exist longer than 24 hours, you can use any other image registry to suit your needs. | String | `ttl.sh` | | OS_DISTRIBUTION | OS distribution of your choice. For example, it can be `ubuntu` or `opensuse-leap`. | String | `ubuntu` | | IMAGE_REPO | Image repository name in your chosen registry. | String | `$OS_DISTRIBUTION` | @@ -173,7 +174,10 @@ docker push ttl.sh/ubuntu-demo:k3s-1.24.6-v3.4.3-demo 13. Build a cluster in [Palette](https://console.spectrocloud.com). -### How-Tos +### Learning Resources -* [Building Edge Native Artifacts]([https://docs.spectrocloud.com/clusters/edge/edgeforge-workflow/palette-canvos](https://deploy-preview-1318--docs-spectrocloud.netlify.app/clusters/edge/edgeforge-workflow/palette-canvos)) + +* [Building Edge Native Artifacts](https://docs.spectrocloud.com/clusters/edge/edgeforge-workflow/palette-canvos) - A how-to guide for using CanvOS. + +* [Deploy Edge Cluster](https://docs.spectrocloud.com/clusters/edge/site-deployment/deploy-cluster) - An end-to-end tutorial for learning how to deploy an Edge cluster in VMware that simulates a bare metal environmet. From 6edac7cae2224a9e9b27fc6c685f4ad79d6fac7d Mon Sep 17 00:00:00 2001 From: Karl Cardenas Date: Tue, 11 Jul 2023 10:09:07 -0700 Subject: [PATCH 2/7] docs: minor cleanup --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 0815f0f..b1a0fbd 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,6 @@ cp .arg.template .arg | Parameter | Description | Type | Default Value | |------------------|-----------------------------------------------------------------------------------------------------------------------------------------|--------|------------------------| | CUSTOM_TAG | Environment name for provider image tagging. The default value is `demo`. | String | `demo` | -| ARCH | The platform architecture to create Edge artifacts for. Allowed values are `amd64`, `arm64`| String |`amd64`| | IMAGE_REGISTRY | Image registry name that will store the image artifacts. The default value points to the *ttl.sh* image registry, an anonymous and ephemeral Docker image registry where images live for a maximum of 24 hours by default. If you wish to make the images exist longer than 24 hours, you can use any other image registry to suit your needs. | String | `ttl.sh` | | OS_DISTRIBUTION | OS distribution of your choice. For example, it can be `ubuntu` or `opensuse-leap`. | String | `ubuntu` | | IMAGE_REPO | Image repository name in your chosen registry. | String | `$OS_DISTRIBUTION` | @@ -105,7 +104,7 @@ cp .arg.template .arg | K8S_DISTRIBUTION | Kubernetes distribution name. It can be one of these: `k3s`, `rke2`, or `kubeadm`. | String | `k3s` | | ISO_NAME | Name of the Edge installer ISO image. In this example, the name is *palette-edge-installer*. | String | `palette-edge-installer`| | PE_VERSION | Palette Edge Version. This should match the tag checked out from Git. Advanced setting. Do not modify unless told to do so. | String | `GH tag` | -| platform | Type of platform to use for the build. Used for Cross Platform Build (arm64 to amd64 as example). | string | `linux/amd64` | +| platform | The type of platform architecture to use for the Edge artifacts build. Allowed values are: `linux/adm64`, or `linux/arm64`. | String | `linux/amd64` | 7. Build the images with the following command. Use the `system.uri` output when creating the cluster profile for the Edge host. From 734d1fb544f74b90ede250febe3d972219697031 Mon Sep 17 00:00:00 2001 From: Karl Cardenas Date: Wed, 26 Jul 2023 15:18:19 -0700 Subject: [PATCH 3/7] docs: fixed merge conflict --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index f0d1dbb..067ee2e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ variables.env.old config.yaml content-*/* .arg +.DS_Store \ No newline at end of file From 4b922f220e1d96352e022087eda9a243725ed04d Mon Sep 17 00:00:00 2001 From: Karl Cardenas Date: Wed, 26 Jul 2023 15:18:34 -0700 Subject: [PATCH 4/7] docs: fixed merge conflict --- .DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index b2b8ffbd360796dde6b69b83b3b226a937599205..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK+ltdb82+cN+qA1tL_q{0;BBqlgRbIDw}*=b573Bvp;DVob{jUEDNVX%DTUsv zuiz_)x4wtIi&y&1q0pptFGX~I_~)C$|IOh`CX*o|)*O3VL=_^k-~tO}Bx_8x3tzFE zuDJ?iq7Q!LhTKI-bZ5*cU=;Y<6%czjPe&9|a1f^U?><^;Kc&e<=qPs*5A`np>JGyo zPU`jVESE1_*(h2?Ytwq`4EV%J`pGzM_D8Qp=_Ti(yU6$5SAjq2Rc^F+l=OqhA4x*s z`3QM)7(^bQH2FC4V##$>gH^Ihy~^$Bbi4lWLDk-Qv^%TX)2*Go?W(=E`*=1hSvT+A zf70!phG!A~pk!zGDoMMhaRDEZ(d#*PMp4M46V!<4GPQ|Ak5lq#M8_0B89$@UXT&Wl zQ=$&_5uMOrJ%ioJFv{qC!3gPsY82BTJqmlD;cQ?oXJDOx8)ssFWMYf-ln$tcc|9kG zI_c<~SnKlqi&*iwTyKc}FEY{JGSMY^L5JwKLtXS;!<@V{Bi~wKbP>G|WuF1pF}`FN z*J%tz#1ptj9_Ez5Ye;>JHpCMVHQA>k-q%k{?<%G94r}w$DAQ;ZFbe#S3W)E6 z4HwwZI9Dh?9Z2LA09Zh^H00&aKhPExz=p=TLe#*Rq5>6_=_>})cL%2EXm9BFxk5!J zCPzj;dSs?=C`?~Hm@UJJH58iEC}0#wE09;kia7r}zrX*dNv32JFbe!r3a~=kX*aPX zeYUPFPMozi{2g4Fh?^^v6eRjMmKkvr--1g+n=LZHhQ_%<)WFP-fRw=`Mu9)7z%K;j B%*X%$ From 0b19ed895c14e7c509e06299eb804bf4741d6f30 Mon Sep 17 00:00:00 2001 From: Karl Cardenas Date: Wed, 26 Jul 2023 15:20:48 -0700 Subject: [PATCH 5/7] docs: fixed merge conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4977f5c..802cc7a 100644 --- a/README.md +++ b/README.md @@ -113,7 +113,7 @@ cp .arg.template .arg | OS_VERSION | OS version. For Ubuntu, the possible values are `20`, and `22`. Whereas for openSUSE Leap, the possible value is `15.4`. This example uses `22` for Ubuntu. | String | `22` | | K8S_DISTRIBUTION | Kubernetes distribution name. It can be one of these: `k3s`, `rke2`, `kubeadm`, or `kubeadm-fips`. The value `kubeadm` refers to Palette eXtended Kubernetes - Edge (PXK-E). Check out the [PXK-E reference](https://docs.spectrocloud.com/integrations/kubernetes-edge) resource to learn more. | String | `k3s` | | ISO_NAME | Name of the Edge installer ISO image. In this example, the name is *palette-edge-installer*. | String | `palette-edge-installer`| -| PE_VERSION | Palette Edge Version. This should match the tag checked out from Git. Advanced setting. Do not modify unless told to do so. | String | `GH tag` | +| PE_VERSION | Palette Edge Version. This should match the tag checked out from Git. Advanced setting. Do not modify unless told to do so. | String | [Refer to the available GitHub tags](https://github.com/spectrocloud/CanvOS/tags) | | FIPS_ENABLED | Enable to generate FIPS compliant Edge artifacts. | String | `false` | | ARCH | The type of platform architecture to use for the Edge artifacts build. Allowed values are: `adm64`, or `arm64`. | String | `amd64` | From b75a5fdb0452f2fd3b60f0a51d5d394fcf02eb1e Mon Sep 17 00:00:00 2001 From: Karl Cardenas Date: Tue, 10 Oct 2023 07:46:15 -0700 Subject: [PATCH 6/7] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 802cc7a..82722ef 100644 --- a/README.md +++ b/README.md @@ -113,7 +113,6 @@ cp .arg.template .arg | OS_VERSION | OS version. For Ubuntu, the possible values are `20`, and `22`. Whereas for openSUSE Leap, the possible value is `15.4`. This example uses `22` for Ubuntu. | String | `22` | | K8S_DISTRIBUTION | Kubernetes distribution name. It can be one of these: `k3s`, `rke2`, `kubeadm`, or `kubeadm-fips`. The value `kubeadm` refers to Palette eXtended Kubernetes - Edge (PXK-E). Check out the [PXK-E reference](https://docs.spectrocloud.com/integrations/kubernetes-edge) resource to learn more. | String | `k3s` | | ISO_NAME | Name of the Edge installer ISO image. In this example, the name is *palette-edge-installer*. | String | `palette-edge-installer`| -| PE_VERSION | Palette Edge Version. This should match the tag checked out from Git. Advanced setting. Do not modify unless told to do so. | String | [Refer to the available GitHub tags](https://github.com/spectrocloud/CanvOS/tags) | | FIPS_ENABLED | Enable to generate FIPS compliant Edge artifacts. | String | `false` | | ARCH | The type of platform architecture to use for the Edge artifacts build. Allowed values are: `adm64`, or `arm64`. | String | `amd64` | From 03f2fffde549736da4906c1911e621c1fa691760 Mon Sep 17 00:00:00 2001 From: Karl Cardenas Date: Fri, 13 Oct 2023 07:25:40 -0700 Subject: [PATCH 7/7] Update .arg.template --- .arg.template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.arg.template b/.arg.template index 1bc6e12..109a44a 100644 --- a/.arg.template +++ b/.arg.template @@ -5,5 +5,4 @@ IMAGE_REPO=$OS_DISTRIBUTION OS_VERSION=22 K8S_DISTRIBUTION=k3s ISO_NAME=palette-edge-installer -PE_VERSION=v3.4.3 -PLATFORM=linux/amd64 \ No newline at end of file +PE_VERSION=v3.4.3 \ No newline at end of file