Merge pull request GoogleCloudPlatform#2 from bharathkkb/bugfixes

Minor bugs, add codeowners
botpampa · Mar 3, 2020 · dc39c8d · dc39c8d
2 parents a45cde4 + 2efc161
commit dc39c8d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -0,0 +1 @@
+@bharathkkb @r4hulgupta
diff --git a/example-pipelines/example-create/Jenkinsfile b/example-pipelines/example-create/Jenkinsfile
@@ -32,7 +32,7 @@ pipeline {
       steps {
         container('terraform') {
           sh '''cd example-pipelines/example-create
-          terraform plan -var project_id=$PROJECT_ID --out=test.out'''
+          terraform plan --out=test.out'''
         }
       }
     }

diff --git a/jenkins-gke/tf-gke/variables.tf b/jenkins-gke/tf-gke/variables.tf
@@ -23,11 +23,6 @@ variable "tfstate_gcs_backend" {
   default     = "TFSTATE_GCS_BACKEND"
 }
 
-variable "restart_policy" {
-  description = "The desired Docker restart policy for the deployed image"
-  default     = "Always"
-}
-
 variable "region" {
   description = "The GCP region to deploy instances into"
   default     = "us-east4"
@@ -61,11 +56,6 @@ variable "subnet_name" {
   default     = "jenkins-subnet"
 }
 
-variable "jenkins_project_name" {
-  description = "Name for jenkins project"
-  default     = "jenkins-gke"
-}
-
 variable "jenkins_k8s_config" {
   description = "Name for the k8s secret required to configure k8s executers on Jenkins"
   default     = "jenkins-k8s-config"