Merge pull request #13 from FairwindsOps/nb/add-oauth-scope

added additional oauth scopes

node_pool/CHANGELOG.md

@@ -1,3 +1,7 @@
+# node-pool-v2.1.0
+- Addded ability to add additional oauth scopes to a node pool
+  - NOTE: changing oauth scopes will recreate your node pool
+
 # node-pool-v2.0.0
 - Added tags to be able to assign specific firewall rules to node pools in GCP - NOTE: Adding tags to nodepools _WILL RECREATE YOUR NODE POOL_! Use this option carefully!
 - Added disk type to the node pool. Accepts the values 'pd-standard' or 'pd-ssd' _WILL RECREATE YOUR NODE POOL_! Use this option carefully!

node_pool/README.md

@@ -108,6 +108,17 @@ Default:
 []
 ```
 
+#### additional\_oauth\_scope
+
+Descriptio: List of strings for additional oauth scope in a node config
+
+Type: `list`
+
+Default:
+
+```json
+[]
+```
 
 ## Future To-do Items
 

node_pool/inputs.tf

@@ -52,3 +52,9 @@ variable "disk_type" {
   description = "Type of the disk attached to each node"
   default     = "pd-standard"
 }
+
+variable "additional_oauth_scopes" {
+  type        = "list"
+  description = "List of strings for additional oauth scope in a node config"
+  default     = []
+}

node_pool/main.tf

@@ -27,6 +27,15 @@ resource "random_id" "entropy" {
   byte_length = 2
 }
 
+locals {
+  base_oauth_scope = [
+    "https://www.googleapis.com/auth/devstorage.read_only",
+    "https://www.googleapis.com/auth/logging.write",
+    "https://www.googleapis.com/auth/monitoring",
+    "https://www.googleapis.com/auth/compute",
+  ]
+}
+
 resource "google_container_node_pool" "node_pool" {
   name               = "${var.name}-${random_id.entropy.hex}"
   cluster            = "${var.gke_cluster_name}"
@@ -47,12 +56,7 @@ resource "google_container_node_pool" "node_pool" {
     disk_type    = "${var.disk_type}"
     tags         = ["${var.node_tags}"]
 
-    oauth_scopes = [
-      "https://www.googleapis.com/auth/devstorage.read_only",
-      "https://www.googleapis.com/auth/logging.write",
-      "https://www.googleapis.com/auth/monitoring",
-      "https://www.googleapis.com/auth/compute",
-    ]
+    oauth_scopes = "${concat(local.base_oauth_scope, var.additional_oauth_scopes)}"
   }
 
   lifecycle {

node_pool_taint/CHANGELOG.md

@@ -1,2 +1,6 @@
+# node-pool-taint-v1.1.0
+- added ability to add additional_oauth_scopes to node pools
+  - NOTE: changing oauth scopes will recreate your node pool
+
 # node-pool-taint-v1.0.0
 Initial release of `node-pool-taint` which leverages the `google-beta` provider to apply taints to node pools. This module should be roughly equivalent with the features of `node-pool` in the same repository.

node_pool_taint/README.md

@@ -114,6 +114,17 @@ Default:
 []
 ```
 
+#### additional\_oauth\_scope
+
+Descriptio: List of strings for additional oauth scope in a node config
+
+Type: `list`
+
+Default:
+
+```json
+[]
+```
 
 ## Future To-do Items
 

node_pool_taint/inputs.tf

@@ -57,3 +57,9 @@ variable "taint" {
   description = "Key value pairs of taints to apply on nodes in the pool"
   type        = "map"
 }
+
+variable "additional_oauth_scopes" {
+  type        = "list"
+  description = "List of strings for additional oauth scope in a node config"
+  default     = []
+}

node_pool_taint/main.tf

@@ -28,6 +28,15 @@ resource "random_id" "entropy" {
   byte_length = 2
 }
 
+locals {
+  base_oauth_scope = [
+    "https://www.googleapis.com/auth/devstorage.read_only",
+    "https://www.googleapis.com/auth/logging.write",
+    "https://www.googleapis.com/auth/monitoring",
+    "https://www.googleapis.com/auth/compute",
+  ]
+}
+
 resource "google_container_node_pool" "node_pool" {
   provider           = "google-beta"
   name               = "${var.name}-${random_id.entropy.hex}"
@@ -50,12 +59,7 @@ resource "google_container_node_pool" "node_pool" {
     disk_type    = "${var.disk_type}"
     tags         = ["${var.node_tags}"]
 
-    oauth_scopes = [
-      "https://www.googleapis.com/auth/devstorage.read_only",
-      "https://www.googleapis.com/auth/logging.write",
-      "https://www.googleapis.com/auth/monitoring",
-      "https://www.googleapis.com/auth/compute",
-    ]
+    oauth_scopes = "${concat(local.base_oauth_scope, var.additional_oauth_scopes)}"
   }
 
   lifecycle {