Fix/remove unneeded variables (#8)

* fix: remove un needed credstash variables * doc: update feature list and usage
ouzi-dev · Oct 22, 2019 · f51334e · f51334e
1 parent fb69a91
commit f51334e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 58 deletions.
diff --git a/Makefile b/Makefile
@@ -1,17 +1,6 @@
 # Get current directory
 DIR := ${CURDIR}
 
-# Credstash version and dowload locations
-CREDSTASH_VERSION := 0.4.0
-CREDSTASH_DOWNLOAD_DARWIN_URL := https://github.com/sspinc/terraform-provider-credstash/releases/download/$(CREDSTASH_VERSION)/terraform-provider-credstash_darwin_amd64
-CREDSTASH_FILEPATH := ~/.terraform.d/plugins/terraform-provider-credstash_v$(CREDSTASH_VERSION)
-
-.PHONY: setup
-setup:
-	@mkdir -p ~/.terraform.d/plugins
-	@curl -L "$(CREDSTASH_DOWNLOAD_DARWIN_URL)" -o $(CREDSTASH_FILEPATH) -z $(CREDSTASH_FILEPATH)
-	@chmod +x ~/.terraform.d/plugins/terraform-provider-credstash_v$(CREDSTASH_VERSION)
-
 .PHONY: clean
 clean:
 	@rm -rf .terraform

diff --git a/README.md b/README.md
@@ -11,8 +11,8 @@ This is a terraform module for creating a prow k8s cluster running in GKE.
 - Managed Control Plane and Nodes by GKE
 - Automatic control plane upgrades
 - Automatic node updades
-- Cluster scales up and down as needed
-- Injected all needed secrets to install Prow
+- Cluster scales up and down as needed, min 1
+- Two different node pools such that the cluster can scale according to the workload provided
 - Setup GSuite integration with RBAC
 
 ## Usage
@@ -24,18 +24,12 @@ module "prow-cluster" {
   gcloud_region              = var.gcloud_region
   gcloud_project             = var.gcloud_project
   gke_kubernetes_version     = var.gke_kubernetes_version
-  dockerconfig_credstash_key = var.dockerconfig_credstash_key
+  gke_authenticator_groups_security_group = var.gke_authenticator_groups_security_group
 
   base_domain = var.base_domain
   github_org  = var.github_org
 
-  slack_bot_token_credstash_key = var.slack_bot_token_credstash_key
   prow_artefact_bucket_location = var.prow_artefact_bucket_location
-
-  gke_authenticator_groups_security_group = var.gke_authenticator_groups_security_group
 }
 ```
 
-## Secrets
-
-We leverage [credstash](https://github.com/fugue/credstash) for managing secrets and therefore this module will require you to specify credstash keys
diff --git a/variables.tf b/variables.tf
@@ -124,48 +124,10 @@ variable "prow_artefact_bucket_location" {
   type = string
 }
 
-variable "github_bot_token_credstash_key" {
-  type    = string
-  default = "github_bot_personal_access_token_prow"
-}
-
-variable "github_bot_ssh_key_credstash_key" {
-  type    = string
-  default = "github_bot_ssh_private_key"
-}
-
 variable "github_org" {
   type = string
 }
 
-variable "prow_github_oauth_client_id_credstash_key" {
-  type    = string
-  default = "prow-github-oauth-client-id"
-}
-
-variable "prow_github_oauth_client_secret_credstash_key" {
-  type    = string
-  default = "prow-github-oauth-client-secret"
-}
-
-variable "prow_cluster_github_oauth_client_id_credstash_key" {
-  type    = string
-  default = "prow-cluster-github-oauth-client-id"
-}
-
-variable "prow_cluster_github_oauth_client_secret_credstash_key" {
-  type    = string
-  default = "prow-cluster-github-oauth-client-secret"
-}
-
-variable "slack_bot_token_credstash_key" {
-  type = string
-}
-
-variable "dockerconfig_credstash_key" {
-  type = string
-}
-
 variable "base_domain" {
   type = string
 }