update example to include dev and prod environments (GoogleCloudPlatf…

…orm#12) * reverting to original example with added environment folders * small fix to jenkinsfile * making tfvars file envionment specific * changed values in tfvars to avoid conflicts * fix to jenkinsfile for tf apply stage and removed unused vars from tfvars * changes to jenkinsfile to cover all merge/PR scenarios, fixed path to jenkinsfile in values.yaml * added a variable for environment to be used in naming of resources * removed CHANGE_TARGET and tf out file from tf apply stage * removed extra - * updated CIDR to valid RFC 1918 space * updated CIDR to valid RFC 1918 space for dev * removing approval stage Co-authored-by: Rahul Gupta <[email protected]>
gvchandar · Mar 30, 2020 · 8d77037 · 8d77037
1 parent 66e442a
commit 8d77037
Show file tree

Hide file tree

Showing 18 changed files with 178 additions and 94 deletions.
diff --git a/example-pipelines/environments/Jenkinsfile b/example-pipelines/environments/Jenkinsfile
@@ -0,0 +1,105 @@
+/**
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+pipeline {
+  agent {
+      label "terraform-exec"
+  }
+  stages {
+    stage('TF init & validate') {
+      when { anyOf {branch "prod";branch "dev";changeRequest() } }
+      steps {
+        container('terraform') {
+          sh '''
+          if [[ $CHANGE_TARGET ]]; then
+            TARGET_ENV=$CHANGE_TARGET
+          else
+            TARGET_ENV=$BRANCH_NAME
+          fi
+
+          if [ -d "example-pipelines/environments/${TARGET_ENV}/" ]; then
+            cd example-pipelines/environments/${TARGET_ENV}
+            terraform init
+            terraform validate
+          else
+            for dir in example-pipelines/environments/*/
+            do 
+              cd ${dir}
+              env=${dir%*/}
+              env=${env#*/}
+              echo ""
+              echo "*************** TERRAFOM INIT and VALIDATE ******************"
+              echo "******* At environment: ${env} ********"
+              echo "*************************************************"
+              terraform init || exit 1
+              terraform validate || exit 1
+              cd ../../../
+            done
+          fi'''
+        }
+      }
+    }
+    stage('TF plan') {
+      when { anyOf {branch "prod";branch "dev";changeRequest() } }
+      steps {
+        container('terraform') {
+          sh '''
+          if [[ $CHANGE_TARGET ]]; then
+            TARGET_ENV=$CHANGE_TARGET
+          else
+            TARGET_ENV=$BRANCH_NAME
+          fi
+         
+          if [ -d "example-pipelines/environments/${TARGET_ENV}/" ]; then
+            cd example-pipelines/environments/${TARGET_ENV}
+            terraform plan
+          else
+            for dir in example-pipelines/environments/*/
+            do 
+              cd ${dir}
+              env=${dir%*/}
+              env=${env#*/}
+              echo ""
+              echo "*************** TERRAFOM PLAN ******************"
+              echo "******* At environment: ${env} ********"
+              echo "*************************************************"
+              terraform plan || exit 1
+              cd ../../../
+            done
+          fi'''
+        }
+      }
+    }
+    stage('TF Apply') {
+      when { anyOf {branch "prod";branch "dev" } }
+      steps {
+        container('terraform') {
+          sh '''
+          TARGET_ENV=$BRANCH_NAME
+
+          if [ -d "example-pipelines/environments/${TARGET_ENV}/" ]; then
+            cd example-pipelines/environments/${TARGET_ENV}
+            terraform apply -input=false -auto-approve
+          else
+            echo "*************** SKIPPING APPLY ******************"
+            echo "Branch '$TARGET_ENV' does not represent an official environment."
+            echo "*************************************************"
+          fi'''
+        }
+      }
+    }
+  }
+}
diff --git a/example-pipelines/environments/dev/backend.tf b/example-pipelines/environments/dev/backend.tf
@@ -0,0 +1,21 @@
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+terraform {
+  backend "gcs" {
+    bucket = "PROJECT_ID-tfstate"
+    prefix = "env/dev"
+  }
+}
diff --git a/example-pipelines/environments/dev/main.tf b/example-pipelines/environments/dev/main.tf
@@ -0,0 +1 @@
+../../example-create/main.tf
diff --git a/example-pipelines/environments/dev/outputs.tf b/example-pipelines/environments/dev/outputs.tf
@@ -0,0 +1 @@
+../../example-create/outputs.tf
diff --git a/...pipelines/example-create/terraform.tfvars → ...pelines/environments/dev/terraform.tfvars b/...pipelines/example-create/terraform.tfvars → ...pelines/environments/dev/terraform.tfvars
@@ -1,7 +1,5 @@
-
-
 project_id = "PROJECT_ID"
-vpc_network_name = "example-vpc"
+environment = "dev"
 subnet1_region = "us-central1"
 subnet1_zone = "us-central1-a"
-subnet1_cidr = "10.0.0.0/17"
+subnet1_cidr = "10.10.0.0/16"
diff --git a/example-pipelines/environments/dev/variables.tf b/example-pipelines/environments/dev/variables.tf
@@ -0,0 +1 @@
+../../example-create/variables.tf
diff --git a/example-pipelines/environments/prod/backend.tf b/example-pipelines/environments/prod/backend.tf
@@ -0,0 +1,21 @@
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+terraform {
+  backend "gcs" {
+    bucket = "PROJECT_ID-tfstate"
+    prefix = "env/prod"
+  }
+}
diff --git a/example-pipelines/environments/prod/main.tf b/example-pipelines/environments/prod/main.tf
@@ -0,0 +1 @@
+../../example-create/main.tf
diff --git a/example-pipelines/environments/prod/outputs.tf b/example-pipelines/environments/prod/outputs.tf
@@ -0,0 +1 @@
+../../example-create/outputs.tf
diff --git a/example-pipelines/environments/prod/terraform.tfvars b/example-pipelines/environments/prod/terraform.tfvars
@@ -0,0 +1,5 @@
+project_id = "PROJECT_ID"
+environment = "prod"
+subnet1_region = "us-central1"
+subnet1_zone = "us-central1-a"
+subnet1_cidr = "10.20.0.0/16"
diff --git a/example-pipelines/environments/prod/variables.tf b/example-pipelines/environments/prod/variables.tf
@@ -0,0 +1 @@
+../../example-create/variables.tf
diff --git a/example-pipelines/example-create/Jenkinsfile b/example-pipelines/example-create/Jenkinsfile
diff --git a/example-pipelines/example-create/backend.tf b/example-pipelines/example-create/backend.tf
diff --git a/example-pipelines/example-create/main.tf b/example-pipelines/example-create/main.tf
@@ -14,6 +14,14 @@
  * limitations under the License.
  */
 
+/*****************************************
+  Locals
+ *****************************************/
+locals {
+  vpc_network_name = "example-vpc-${var.environment}"
+  vm_name = "example-vm-${var.environment}-001"
+}
+
 /*****************************************
   Google Provider Configuration
  *****************************************/
@@ -28,11 +36,11 @@ module "gcp-network" {
   source       = "terraform-google-modules/network/google"
   version      = "~> 1.4.0"
   project_id   = var.project_id
-  network_name = var.vpc_network_name
+  network_name = local.vpc_network_name
 
   subnets = [
     {
-      subnet_name   = "${var.vpc_network_name}-${var.subnet1_region}"
+      subnet_name   = "${local.vpc_network_name}-${var.subnet1_region}"
       subnet_ip     = var.subnet1_cidr
       subnet_region = var.subnet1_region
     },
@@ -45,7 +53,7 @@ module "gcp-network" {
 resource "google_compute_instance" "vm_0001" {
   project      = var.project_id
   zone         = var.subnet1_zone
-  name         = "${var.project_id}-vm-0001"
+  name         = local.vm_name
   machine_type = "f1-micro"
   network_interface {
     network    = module.gcp-network.network_name

diff --git a/example-pipelines/example-create/outputs.tf b/example-pipelines/example-create/outputs.tf
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+output "example_vpc_name" {
+  value = module.gcp-network.network_name
+}
 
 output "example_vm_name" {
   value = google_compute_instance.vm_0001.name

diff --git a/example-pipelines/example-create/variables.tf b/example-pipelines/example-create/variables.tf
@@ -21,10 +21,10 @@ variable "project_id" {
   default     = ""
 }
 
-variable "vpc_network_name" {
+variable "environment" {
   type        = string
-  description = "Name of VPC Network to be created"
-  default     = "example-vpc"
+  description = "Name of the environment (dev or prod)"
+  default     = "dev"
 }
 
 variable "subnet1_region" {

diff --git a/jenkins-gke/jenkins-helm/values.yaml b/jenkins-gke/jenkins-helm/values.yaml
@@ -133,7 +133,7 @@ master:
                     multibranchPipelineJob('terraform-jenkins-create-demo') {
                         factory {
                         workflowBranchProjectFactory {
-                            scriptPath('example-pipelines/example-create/Jenkinsfile')
+                            scriptPath('example-pipelines/environments/Jenkinsfile')
                         }
                         }
                         branchSources {

diff --git a/jenkins-gke/tf-gke/terraform.tfvars b/jenkins-gke/tf-gke/terraform.tfvars
@@ -2,13 +2,11 @@
 
 project_id = "PROJECT_ID"
 tfstate_gcs_backend = "PROJECT_ID-tfstate"
-restart_policy = "Always"
 region = "us-east4"
 zones = ["us-east4-a"]
 ip_range_pods_name = "ip-range-pods"
 ip_range_services_name = "ip-range-scv"
 network_name = "jenkins-network"
 subnet_ip = "10.10.10.0/24"
 subnet_name = "jenkins-subnet"
-jenkins_project_name = "jenkins-gke"
 jenkins_k8s_config = "jenkins-k8s-config"