From baf2aa252553e7616efefa57e4794fff8ef9533c Mon Sep 17 00:00:00 2001
From: balchua <balchua@yahoo.com>
Date: Sat, 27 Mar 2021 17:18:58 +0800
Subject: [PATCH] update the default os image

---
 README.md                  |  2 +-
 templates/master.yaml.tmpl | 41 --------------------------------------
 templates/worker.yaml.tmpl | 41 --------------------------------------
 variables.tf               |  4 ++--
 4 files changed, 3 insertions(+), 85 deletions(-)
 delete mode 100644 templates/master.yaml.tmpl
 delete mode 100644 templates/worker.yaml.tmpl

diff --git a/README.md b/README.md
index 4f49180..3f7e248 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ module "microk8s" {
 | ----------------------------- |:-----------------------------------------| -------------- |
 | source                        | The source of the terraform module       | none
 | node_count                    | The number of MicroK8s nodes to create   | 3
-| os_image                      | DigitalOcean OS images.  <br/>To get the list OS images `doctl compute image list-distribution`| ubuntu-18-04-x64
+| os_image                      | DigitalOcean OS images.  <br/>To get the list OS images `doctl compute image list-distribution`| ubuntu-20-04-x64
 | node_size                     | DigitalOcean droptlet sizes <br/> To get the list of droplet sizes `doctl compute size list`| s-4vcpu-8gb
 | node_disksize                 | Additional volume to add to the droplet.  Size in GB| 100 |
 | region                        | DigitalOcean region <br/> To get the list of regions `doctl compute region list`| sgp1
diff --git a/templates/master.yaml.tmpl b/templates/master.yaml.tmpl
deleted file mode 100644
index b6933cc..0000000
--- a/templates/master.yaml.tmpl
+++ /dev/null
@@ -1,41 +0,0 @@
-#cloud-config
-
-# Update apt database on first boot (run 'apt-get update').
-# Note, if packages are given, or package_upgrade is true, then
-# update will be done independent of this setting.
-#
-# Default: false
-# Aliases: apt_update
-package_update: true
-
-# Install additional packages on first boot
-#
-# Default: none
-#
-# if packages are specified, this apt_update will be set to true
-#
-# packages may be supplied as a single package name or as a list
-# with the format [<package>, <version>] wherein the specifc
-# package version will be installed.
-packages:
-- nfs-kernel-server
-- bridge-utils
-- open-iscsi
-
-disk_setup:
-  /dev/sda:
-    table_type: 'mbr'
-    overwrite: true
-fs_setup:
-  - label: data_disk
-    filesystem: ext4
-    device: /dev/sda
-mounts:
-  - ["/dev/sda", "/data-disk"]    
-
-runcmd:
-  - [ systemctl, start, iscsid ]
-
-snap:
-    commands:
-        00: snap install microk8s --channel=${microk8s_channel} --classic
diff --git a/templates/worker.yaml.tmpl b/templates/worker.yaml.tmpl
deleted file mode 100644
index d8649c6..0000000
--- a/templates/worker.yaml.tmpl
+++ /dev/null
@@ -1,41 +0,0 @@
-#cloud-config
-
-# Update apt database on first boot (run 'apt-get update').
-# Note, if packages are given, or package_upgrade is true, then
-# update will be done independent of this setting.
-#
-# Default: false
-# Aliases: apt_update
-package_update: true
-
-# Install additional packages on first boot
-#
-# Default: none
-#
-# if packages are specified, this apt_update will be set to true
-#
-# packages may be supplied as a single package name or as a list
-# with the format [<package>, <version>] wherein the specifc
-# package version will be installed.
-packages:
-- nfs-kernel-server
-- bridge-utils
-- open-iscsi
-
-disk_setup:
-  /dev/sda:
-    table_type: 'mbr'
-    overwrite: true
-fs_setup:
-  - label: data_disk
-    filesystem: ext4
-    device: /dev/sda
-mounts:
-  - ["/dev/sda", "/data-disk"]    
-  
-runcmd:
-  - [ systemctl, start, iscsid ]
-
-snap:
-    commands:
-        00: snap install microk8s --channel=${microk8s_channel} --classic
diff --git a/variables.tf b/variables.tf
index 1057992..0877cf3 100644
--- a/variables.tf
+++ b/variables.tf
@@ -31,7 +31,7 @@ variable "dns_zone" {
 
 variable "os_image" {
     type    = string
-    default = "ubuntu-18-04-x64"
+    default = "ubuntu-20-04-x64"
     description = "The operating system slug name in Digitalocean."
 }
 
@@ -44,7 +44,7 @@ variable "region" {
 variable "node_disksize" {
     type    = string
     default = "100"
-    description = "The size of the controller storage."
+    description = "The size of the node extra disk storage."
 }
 
 variable "node_size" {