update k8s flist

threefoldtech · Sep 26, 2024 · 6b4c7e8 · 6b4c7e8
1 parent 7f76d01
commit 6b4c7e8
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/docs/resources/kubernetes.md b/docs/resources/kubernetes.md
@@ -47,7 +47,7 @@ Required:
 
 Optional:
 
-- `flist` (String) Flist used on master node, e.g. https://hub.grid.tf/tf-official-apps/threefoldtech-k3s-latest.flist. All flists could be found in `https://hub.grid.tf/`
+- `flist` (String) Flist used on master node, e.g. https://hub.grid.tf/tf-official-apps/threefolddev-k3s-v1.31.0.flist. All flists could be found in `https://hub.grid.tf/`
 - `flist_checksum` (String) if present, the flist is rejected if it has a different hash.
 - `planetary` (Boolean) Flag to enable Yggdrasil IP allocation.
 - `publicip` (Boolean) Flag to enable/disable public ipv4 reservation.
@@ -80,7 +80,7 @@ Required:
 
 Optional:
 
-- `flist` (String) Flist used on worker node, e.g. https://hub.grid.tf/tf-official-apps/threefoldtech-k3s-latest.flist. All flists could be found in `https://hub.grid.tf/`.
+- `flist` (String) Flist used on worker node, e.g. https://hub.grid.tf/tf-official-apps/threefolddev-k3s-v1.31.0.flist. All flists could be found in `https://hub.grid.tf/`.
 - `flist_checksum` (String) if present, the flist is rejected if it has a different hash.
 - `planetary` (Boolean) Flag to enable Yggdrasil IP allocation.
 - `publicip` (Boolean) Flag to enable/disable public ipv4 reservation.

diff --git a/internal/provider/resource_deployment.go b/internal/provider/resource_deployment.go
@@ -98,7 +98,7 @@ func resourceDeployment() *schema.Resource {
 						"name": {
 							Type:             schema.TypeString,
 							Required:         true,
-							Description:      "ZDB worklod name. This has to be unique within the deployment. Must contain only alphanumeric and underscore characters.",
+							Description:      "ZDB workload name. This has to be unique within the deployment. Must contain only alphanumeric and underscore characters.",
 							ValidateDiagFunc: validation.ToDiagFunc(validation.StringMatch(regexp.MustCompile(nameValidationRegex), nameValidationErrorMessage)),
 						},
 						"password": {

diff --git a/internal/provider/resource_gateway_name.go b/internal/provider/resource_gateway_name.go
@@ -47,7 +47,7 @@ func resourceGatewayNameProxy() *schema.Resource {
 			"fqdn": {
 				Type:        schema.TypeString,
 				Computed:    true,
-				Description: "The computed fully quallified domain name of the deployed workload.",
+				Description: "The computed fully qualified domain name of the deployed workload.",
 			},
 			"tls_passthrough": {
 				Type:        schema.TypeBool,

diff --git a/internal/provider/resource_k8s.go b/internal/provider/resource_k8s.go
@@ -51,7 +51,7 @@ func resourceKubernetes() *schema.Resource {
 			"flist": {
 				Type:        schema.TypeString,
 				Optional:    true,
-				Description: "Flist used on all nodes, e.g. https://hub.grid.tf/tf-official-apps/threefoldtech-k3s-latest.flist. All flists could be found in `https://hub.grid.tf/`",
+				Description: "Flist used on all nodes, e.g. https://hub.grid.tf/tf-official-apps/threefolddev-k3s-v1.31.0.flist. All flists could be found in `https://hub.grid.tf/`",
 			},
 			"entrypoint": {
 				Type:        schema.TypeString,
@@ -118,8 +118,8 @@ func resourceKubernetes() *schema.Resource {
 						"flist": {
 							Type:        schema.TypeString,
 							Optional:    true,
-							Default:     "https://hub.grid.tf/tf-official-apps/threefoldtech-k3s-latest.flist",
-							Description: "Flist used on master node, e.g. https://hub.grid.tf/tf-official-apps/threefoldtech-k3s-latest.flist. All flists could be found in `https://hub.grid.tf/`",
+							Default:     "https://hub.grid.tf/tf-official-apps/threefolddev-k3s-v1.31.0.flist",
+							Description: "Flist used on master node, e.g. https://hub.grid.tf/tf-official-apps/threefolddev-k3s-v1.31.0.flist. All flists could be found in `https://hub.grid.tf/`",
 						},
 						"entrypoint": {
 							Type:        schema.TypeString,
@@ -218,7 +218,7 @@ func resourceKubernetes() *schema.Resource {
 						"flist": {
 							Type:        schema.TypeString,
 							Optional:    true,
-							Description: "Flist used on worker node, e.g. https://hub.grid.tf/tf-official-apps/threefoldtech-k3s-latest.flist. All flists could be found in `https://hub.grid.tf/`.",
+							Description: "Flist used on worker node, e.g. https://hub.grid.tf/tf-official-apps/threefolddev-k3s-v1.31.0.flist. All flists could be found in `https://hub.grid.tf/`.",
 						},
 						"entrypoint": {
 							Type:        schema.TypeString,

diff --git a/modules/k8s-module/main.tf b/modules/k8s-module/main.tf
@@ -31,7 +31,7 @@ resource "grid_deployment" "master" {
   network_name = grid_network.net.name
   vms {
     name       = var.master.name
-    flist      = "https://hub.grid.tf/tf-official-apps/threefoldtech-k3s-latest.flist"
+    flist      = "https://hub.grid.tf/tf-official-apps/threefolddev-k3s-v1.31.0.flist"
     cpu        = var.master.cpu
     publicip   = var.master.publicip
     planetary  = var.master.planetary
@@ -66,11 +66,11 @@ resource "grid_deployment" "workers" {
   dynamic "vms" {
     for_each = each.value
     content {
-      name       = vms.value.name
-      cpu        = vms.value.cpu
-      memory     = vms.value.memory
-      publicip   = vms.value.publicip
-      planetary  = vms.value.planetary
+      name      = vms.value.name
+      cpu       = vms.value.cpu
+      memory    = vms.value.memory
+      publicip  = vms.value.publicip
+      planetary = vms.value.planetary
       env_vars = {
         SSH_KEY           = "${var.ssh}"
         K3S_TOKEN         = "${var.token}"