From 88b3d3868da58eb6bd97b64da7f7b10febe9b4e4 Mon Sep 17 00:00:00 2001
From: podoherty <podoherty@virtualguru.org>
Date: Mon, 19 Apr 2021 22:44:09 +0000
Subject: [PATCH 1/2] Update project IDS and buckets

---
 example-pipelines/environments/dev/backend.tf |  2 +-
 .../environments/dev/backend.tf.bak           | 21 ++++++++++++++++++
 .../environments/dev/terraform.tfvars         |  2 +-
 .../environments/dev/terraform.tfvars.bak     |  5 +++++
 .../environments/prod/backend.tf              |  2 +-
 .../environments/prod/backend.tf.bak          | 21 ++++++++++++++++++
 .../environments/prod/terraform.tfvars        |  2 +-
 .../environments/prod/terraform.tfvars.bak    |  5 +++++
 jenkins-gke/tf-gke/backend.tf                 |  2 +-
 jenkins-gke/tf-gke/backend.tf.bak             | 22 +++++++++++++++++++
 jenkins-gke/tf-gke/terraform.tfvars           |  4 ++--
 jenkins-gke/tf-gke/terraform.tfvars.bak       | 12 ++++++++++
 12 files changed, 93 insertions(+), 7 deletions(-)
 create mode 100644 example-pipelines/environments/dev/backend.tf.bak
 create mode 100644 example-pipelines/environments/dev/terraform.tfvars.bak
 create mode 100644 example-pipelines/environments/prod/backend.tf.bak
 create mode 100644 example-pipelines/environments/prod/terraform.tfvars.bak
 create mode 100644 jenkins-gke/tf-gke/backend.tf.bak
 create mode 100644 jenkins-gke/tf-gke/terraform.tfvars.bak

diff --git a/example-pipelines/environments/dev/backend.tf b/example-pipelines/environments/dev/backend.tf
index 0479a9fb..1b9d1690 100644
--- a/example-pipelines/environments/dev/backend.tf
+++ b/example-pipelines/environments/dev/backend.tf
@@ -15,7 +15,7 @@
 
 terraform {
   backend "gcs" {
-    bucket = "PROJECT_ID-tfstate"
+    bucket = "genesis-252423-tfstate"
     prefix = "env/dev"
   }
 }
diff --git a/example-pipelines/environments/dev/backend.tf.bak b/example-pipelines/environments/dev/backend.tf.bak
new file mode 100644
index 00000000..0479a9fb
--- /dev/null
+++ b/example-pipelines/environments/dev/backend.tf.bak
@@ -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/terraform.tfvars b/example-pipelines/environments/dev/terraform.tfvars
index 8e4d5968..4b8072f7 100644
--- a/example-pipelines/environments/dev/terraform.tfvars
+++ b/example-pipelines/environments/dev/terraform.tfvars
@@ -1,4 +1,4 @@
-project_id = "PROJECT_ID"
+project_id = "genesis-252423"
 environment = "dev"
 subnet1_region = "us-central1"
 subnet1_zone = "us-central1-a"
diff --git a/example-pipelines/environments/dev/terraform.tfvars.bak b/example-pipelines/environments/dev/terraform.tfvars.bak
new file mode 100644
index 00000000..8e4d5968
--- /dev/null
+++ b/example-pipelines/environments/dev/terraform.tfvars.bak
@@ -0,0 +1,5 @@
+project_id = "PROJECT_ID"
+environment = "dev"
+subnet1_region = "us-central1"
+subnet1_zone = "us-central1-a"
+subnet1_cidr = "10.10.0.0/16"
diff --git a/example-pipelines/environments/prod/backend.tf b/example-pipelines/environments/prod/backend.tf
index c2a7e04c..ff167682 100644
--- a/example-pipelines/environments/prod/backend.tf
+++ b/example-pipelines/environments/prod/backend.tf
@@ -15,7 +15,7 @@
 
 terraform {
   backend "gcs" {
-    bucket = "PROJECT_ID-tfstate"
+    bucket = "genesis-252423-tfstate"
     prefix = "env/prod"
   }
 }
diff --git a/example-pipelines/environments/prod/backend.tf.bak b/example-pipelines/environments/prod/backend.tf.bak
new file mode 100644
index 00000000..c2a7e04c
--- /dev/null
+++ b/example-pipelines/environments/prod/backend.tf.bak
@@ -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/terraform.tfvars b/example-pipelines/environments/prod/terraform.tfvars
index 8146d8c6..5fe6614a 100644
--- a/example-pipelines/environments/prod/terraform.tfvars
+++ b/example-pipelines/environments/prod/terraform.tfvars
@@ -1,4 +1,4 @@
-project_id = "PROJECT_ID"
+project_id = "genesis-252423"
 environment = "prod"
 subnet1_region = "us-central1"
 subnet1_zone = "us-central1-a"
diff --git a/example-pipelines/environments/prod/terraform.tfvars.bak b/example-pipelines/environments/prod/terraform.tfvars.bak
new file mode 100644
index 00000000..8146d8c6
--- /dev/null
+++ b/example-pipelines/environments/prod/terraform.tfvars.bak
@@ -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/jenkins-gke/tf-gke/backend.tf b/jenkins-gke/tf-gke/backend.tf
index bcc4ef7c..23ae3038 100644
--- a/jenkins-gke/tf-gke/backend.tf
+++ b/jenkins-gke/tf-gke/backend.tf
@@ -16,7 +16,7 @@
 
 terraform {
   backend "gcs" {
-    bucket = "PROJECT_ID-tfstate"
+    bucket = "genesis-252423-tfstate"
     prefix = "jenkins"
   }
 }
diff --git a/jenkins-gke/tf-gke/backend.tf.bak b/jenkins-gke/tf-gke/backend.tf.bak
new file mode 100644
index 00000000..bcc4ef7c
--- /dev/null
+++ b/jenkins-gke/tf-gke/backend.tf.bak
@@ -0,0 +1,22 @@
+/**
+ * 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.
+ */
+
+terraform {
+  backend "gcs" {
+    bucket = "PROJECT_ID-tfstate"
+    prefix = "jenkins"
+  }
+}
diff --git a/jenkins-gke/tf-gke/terraform.tfvars b/jenkins-gke/tf-gke/terraform.tfvars
index aff05125..e0ceef0c 100644
--- a/jenkins-gke/tf-gke/terraform.tfvars
+++ b/jenkins-gke/tf-gke/terraform.tfvars
@@ -1,7 +1,7 @@
 
 
-project_id = "PROJECT_ID"
-tfstate_gcs_backend = "PROJECT_ID-tfstate"
+project_id = "genesis-252423"
+tfstate_gcs_backend = "genesis-252423-tfstate"
 region = "us-east4"
 zones = ["us-east4-a"]
 ip_range_pods_name = "ip-range-pods"
diff --git a/jenkins-gke/tf-gke/terraform.tfvars.bak b/jenkins-gke/tf-gke/terraform.tfvars.bak
new file mode 100644
index 00000000..aff05125
--- /dev/null
+++ b/jenkins-gke/tf-gke/terraform.tfvars.bak
@@ -0,0 +1,12 @@
+
+
+project_id = "PROJECT_ID"
+tfstate_gcs_backend = "PROJECT_ID-tfstate"
+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_k8s_config = "jenkins-k8s-config"

From fb2a0a345a7b4b6814c8c4796db4ee4e0e717506 Mon Sep 17 00:00:00 2001
From: podoherty <podoherty@virtualguru.org>
Date: Mon, 19 Apr 2021 22:52:24 +0000
Subject: [PATCH 2/2] change vm name

---
 example-pipelines/example-create/main.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example-pipelines/example-create/main.tf b/example-pipelines/example-create/main.tf
index 90160d26..61e3c240 100644
--- a/example-pipelines/example-create/main.tf
+++ b/example-pipelines/example-create/main.tf
@@ -19,7 +19,7 @@
  *****************************************/
 locals {
   vpc_network_name = "example-vpc-${var.environment}"
-  vm_name = "example-vm-${var.environment}-001"
+  vm_name = "example-vm-${var.environment}-new"
 }
 
 /*****************************************