update documentation example

Skatteetaten · Nov 10, 2020 · e2e8d9d · e2e8d9d
1 parent f15efa3
commit e2e8d9d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -143,22 +143,23 @@ module "minio" {
   host            = "127.0.0.1"
   port            = 9000
   container_image = "minio/minio:latest" # todo: avoid using tag latest in future releases
+
   # user provided  credentials
-  vault_secret = {
-    use_vault_provider     = false,
-    vault_kv_policy_name   = "",
-    vault_kv_path          = "",
-    vault_kv_access_key    = "",
-    vault_kv_secret_key    = ""
-  }
   access_key = "minio"
   secret_key = "minio123"
+  vault_secret = {
+    use_vault_provider   = false,
+    vault_kv_policy_name = "",
+    vault_kv_path        = "",
+    vault_kv_access_key  = "",
+    vault_kv_secret_key  = ""
+  }
 
   data_dir                        = "/minio/data"
   buckets                         = ["default", "hive"]
   container_environment_variables = ["JUST_EXAMPLE_VAR1=some-value", "ANOTHER_EXAMPLE2=some-other-value"]
-  use_host_volume                 = false
-  use_canary                      = false
+  use_host_volume                 = true
+  use_canary                      = true
 
   # mc
   mc_service_name                    = "mc"
@@ -175,10 +176,10 @@ module "postgres" {
   nomad_host_volume = "persistence-postgres"
 
   # postgres
-  service_name                    = "postgres"
-  container_image                 = "postgres:12-alpine"
-  container_port                  = 5432
-  vault_secret                    = {
+  service_name    = "postgres"
+  container_image = "postgres:12-alpine"
+  container_port  = 5432
+  vault_secret = {
     use_vault_provider     = false,
     vault_kv_policy_name   = "",
     vault_kv_path          = "",
@@ -203,15 +204,20 @@ module "hive" {
   local_docker_image = false
 
   # hive
-  use_canary                           = false
+  use_canary                           = true
   hive_service_name                    = "hive-metastore"
   hive_container_port                  = 9083
   hive_docker_image                    = "fredrikhgrelland/hive:3.1.0"
   hive_container_environment_variables = ["SOME_EXAMPLE=example-value"]
+  
   resource = {
     cpu    = 500,
     memory = 1024
   }
+  resource_proxy =  {
+    cpu     = 200,
+    memory  = 128
+  }
 
   # hive - minio
   hive_bucket = {

diff --git a/example/standalone-user-provided-creds/main.tf b/example/standalone-user-provided-creds/main.tf
@@ -77,6 +77,7 @@ module "hive" {
   hive_container_port                  = 9083
   hive_docker_image                    = "fredrikhgrelland/hive:3.1.0"
   hive_container_environment_variables = ["SOME_EXAMPLE=example-value"]
+
   resource = {
     cpu    = 500,
     memory = 1024