Stability Fix and Tagging AWS Resources (#14)

* Adding tags to AWS resources * Unpin git plugin to allow latest to install * Removed unnecessary plugins in Jenkins Co-authored-by: Aaron Miller <aaron.c.miller@saic.com>
saic-oss · Jan 12, 2021 · 38e1c62 · 38e1c62
1 parent 4aa9b77
commit 38e1c62
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/examples/complete/main.tf b/examples/complete/main.tf
@@ -62,12 +62,15 @@ module "subnets" {
 }
 
 module "rke_rancher_master_cluster" {
-  source                          = "git::https://github.com/saic-oss/terraform-aws-rke-rancher-master-cluster.git?ref=tags/0.4.0"
+  source                          = "git::https://github.com/saic-oss/terraform-aws-rke-rancher-master-cluster.git?ref=tags/0.4.1"
   additional_tag_map              = {}
+  description                     = var.description
   instance_type                   = var.controlplane_instance_type
   kubernetes_version              = var.master_cluster_kubernetes_version
   name                            = var.name
   namespace                       = var.namespace
+  owner                           = var.owner
+  repo                            = var.repo
   node_group_1_subnet_id          = module.subnets.public_subnet_ids[0]
   node_group_2_subnet_id          = module.subnets.public_subnet_ids[1]
   node_group_3_subnet_id          = module.subnets.public_subnet_ids[2]
@@ -93,11 +96,14 @@ module "rke_rancher_master_cluster" {
 }
 
 module "rancher-k8s-cluster" {
-  source                     = "git::https://github.com/saic-oss/terraform-aws-rancher-k8s-cluster.git?ref=tags/0.4.6"
+  source                     = "git::https://github.com/saic-oss/terraform-aws-rancher-k8s-cluster.git?ref=tags/0.4.7"
   additional_tag_map         = {}
+  description                = var.description
   kubernetes_version         = var.worker_cluster_kubernetes_version
   name                       = "${var.name}-workload"
   namespace                  = var.namespace
+  owner                      = var.owner
+  repo                       = var.repo
   stage                      = var.stage
   region                     = var.region
   letsencrypt_email          = var.letsencrypt_email

diff --git a/examples/complete/terraform.tfvars b/examples/complete/terraform.tfvars
@@ -2,6 +2,8 @@ region                            = "us-east-1"
 namespace                         = "saic-oss"
 stage                             = "example"
 name                              = "terraform-k8s-devsecops-sandbox"
+repo                              = "https://github.com/saic-oss/terraform-k8s-devsecops-sandbox"
+description                       = "Example deployment of the Rancher worker cluster"
 controlplane_instance_type        = "t3a.medium"
 worker_instance_type              = "t3a.large"
 master_cluster_kubernetes_version = "v1.18.9-rancher1-1"

diff --git a/examples/complete/variables.tf b/examples/complete/variables.tf
@@ -13,6 +13,21 @@ variable "name" {
   description = "Solution name"
 }
 
+variable "repo" {
+  type        = string
+  description = "Repo URL that is responsible for this resource"
+}
+
+variable "owner" {
+  type        = string
+  description = "Email address of owner"
+}
+
+variable "description" {
+  type        = string
+  description = "Short description of what/why this product exists"
+}
+
 variable "additional_tag_map" {
   type        = map(string)
   description = "Map of additional tags to apply to every taggable resource. If you don't want any use an empty map - '{}'"

diff --git a/helmfiles/subhelmfiles/jenkins.helmfile.yaml b/helmfiles/subhelmfiles/jenkins.helmfile.yaml
@@ -49,14 +49,11 @@ releases:
           jenkinsAdminEmail: {{$jenkinsAdminEmail | quote}}
           installPlugins:
             - kubernetes:1.27.7
-            - ace-editor:1.1
             - workflow-job:2.40
             - workflow-aggregator:2.6
             - workflow-cps-global-lib:2.17
             - pipeline-stage-view:2.19
             - credentials-binding:1.24
-            - font-awesome-api:5.15.1-1
-            - git:4.5.1
             - gitlab-oauth:1.10
             - gitlab-plugin:1.5.13
             - matrix-auth:2.6.4