Merge pull request #10 from aigisuk/develop

🔥 remove k8s dashboard temp configuration 🐛 fix GitHub Actions
aigisuk · Apr 28, 2021 · 084cace · 084cace
2 parents 562cb81 + 7cd0048
commit 084cace
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 21 deletions.
diff --git a/.github/workflows/terraform.yaml b/.github/workflows/terraform.yaml
@@ -1,9 +1,6 @@
 name: 'Terraform GitHub Actions'
 
 on:
-  push:
-    branches:
-    - release
   pull_request:
 
 jobs:
@@ -49,7 +46,7 @@ jobs:
     needs: terraform-fmt
     runs-on: ubuntu-latest
     env:
-      WORKING_DIR: "examples/default_deployment"
+      WORKING_DIR: "examples/github_actions"
     steps:
       - name: Checkout
         uses: actions/[email protected]

diff --git a/examples/default_deployment/README.md b/examples/default_deployment/README.md
@@ -12,7 +12,9 @@ This example illustrates how to use the `terraform-digitalocean-ha-k3s` module.
 
 ## Outputs
 
-TBC
+| Name | Description |
+|------|-------------|
+| cluster_summary | A summary of the cluster's provisioned resources. |
 
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 

diff --git a/examples/default_deployment/main.tf b/examples/default_deployment/main.tf
@@ -1,13 +1,4 @@
 terraform {
-  # Reconfigure the backend block to suit your needs
-  backend "remote" {
-    hostname     = "app.terraform.io"
-    organization = "AIGISUK"
-
-    workspaces {
-      name = "gh-actions-terraform-digitalocean-ha-k3s"
-    }
-  }
   required_providers {
     digitalocean = {
       source = "digitalocean/digitalocean"

diff --git a/examples/github_actions/README.md b/examples/github_actions/README.md
@@ -0,0 +1,17 @@
+# GitHub Actions Deployment Example
+
+This example is specifically for module tests.
+
+<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+## Inputs
+
+| Name | Description | Type | Default | Required |
+|------|-------------|:----:|:-----:|:-----:|
+| do_token | DigitalOcean Personal Access Token | string | N/A | yes |
+| ssh_key_fingerprints | List of SSH Key fingerprints | list(string) | N/A | yes |
+
+## Outputs
+
+| Name | Description |
+|------|-------------|
+| cluster_summary | A summary of the cluster's provisioned resources. |
diff --git a/examples/github_actions/main.tf b/examples/github_actions/main.tf
@@ -0,0 +1,26 @@
+terraform {
+  # Reconfigure the backend block to suit your needs
+  backend "remote" {
+    hostname     = "app.terraform.io"
+    organization = "AIGISUK"
+
+    workspaces {
+      name = "gh-actions-terraform-digitalocean-ha-k3s"
+    }
+  }
+  required_providers {
+    digitalocean = {
+      source = "digitalocean/digitalocean"
+    }
+  }
+  required_version = ">= 0.13"
+}
+
+provider "digitalocean" {}
+
+module "ha-k3s" {
+  source = "git::https://github.com/aigisuk/terraform-digitalocean-ha-k3s.git?ref=develop"
+
+  do_token             = var.do_token
+  ssh_key_fingerprints = var.ssh_key_fingerprints
+}
diff --git a/examples/github_actions/outputs.tf b/examples/github_actions/outputs.tf
@@ -0,0 +1,3 @@
+output "cluster_summary" {
+  value = module.ha-k3s.cluster_summary
+}
diff --git a/examples/github_actions/variables.tf b/examples/github_actions/variables.tf
@@ -0,0 +1,2 @@
+variable "ssh_key_fingerprints" {}
+variable "do_token" {}
diff --git a/server_init.tf b/server_init.tf
@@ -23,7 +23,6 @@ resource "digitalocean_droplet" "k3s_server_init" {
     csi_crds_manifest   = file("${path.module}/manifests/do-csi/crds.yaml")
     csi_driver_manifest = file("${path.module}/manifests/do-csi/driver.yaml")
     csi_sc_manifest     = file("${path.module}/manifests/do-csi/snapshot-controller.yaml")
-    #k8s_dashboard       = file("${path.module}/manifests/k8s-dashboard.yaml")
   })
 }
 

diff --git a/user_data/ks3_server_init.sh b/user_data/ks3_server_init.sh
@@ -54,9 +54,4 @@ EOF
 # csi snapshot controller
 cat <<'EOF' | sudo tee /var/lib/rancher/k3s/server/manifests/snapshot-controller.yaml
 ${csi_sc_manifest}
-EOF
-
-# kubernetes dashboard
-# cat <<'EOF' | sudo tee /var/lib/rancher/k3s/server/manifests/k8s-dashboard.yaml
-# ${k8s_dashboard}
-# EOF
+EOF
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		variable "ssh_key_fingerprints" {}
		variable "do_token" {}