Merge pull request #16 from commitdev/fix-small-issues

bmonkman · web-flow · commit 7c04de08754d · 2020-04-21T17:00:20.000-07:00
Fix some missed things with cert manager and metrics server
diff --git a/kubernetes/terraform/modules/kubernetes/cert_manager.tf b/kubernetes/terraform/modules/kubernetes/cert_manager.tf
@@ -1,7 +1,7 @@
 locals {
   cert_manager_namespace   = "kube-system"
   cert_manager_version     = "0.14.2"
-  cluster_issuer_name      = var.cert_manager_use_production_acme_environment ? "clusterissuer-letsencrypt-production" : "clusterissuer-letsencrypt-production"
+  cluster_issuer_name      = var.cert_manager_use_production_acme_environment ? "clusterissuer-letsencrypt-production" : "clusterissuer-letsencrypt-staging"
   cert_manager_acme_server = var.cert_manager_use_production_acme_environment ? "https://acme-v02.api.letsencrypt.org/directory" : "https://acme-staging-v02.api.letsencrypt.org/directory"
 }
 
diff --git a/kubernetes/terraform/modules/kubernetes/metrics_server.tf b/kubernetes/terraform/modules/kubernetes/metrics_server.tf
@@ -11,7 +11,7 @@ resource "helm_release" "metrics_server" {
 
   set {
     name  = "args"
-    value = "--kubelet-preferred-address-types=InternalIP"
+    value = "{--kubelet-preferred-address-types=InternalIP}"
   }
   set {
     name  = "image.tag"

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`locals {`
`2`	`2`	`cert_manager_namespace = "kube-system"`
`3`	`3`	`cert_manager_version = "0.14.2"`
`4`		`- cluster_issuer_name = var.cert_manager_use_production_acme_environment ? "clusterissuer-letsencrypt-production" : "clusterissuer-letsencrypt-production"`
	`4`	`+ cluster_issuer_name = var.cert_manager_use_production_acme_environment ? "clusterissuer-letsencrypt-production" : "clusterissuer-letsencrypt-staging"`
`5`	`5`	`cert_manager_acme_server = var.cert_manager_use_production_acme_environment ? "https://acme-v02.api.letsencrypt.org/directory" : "https://acme-staging-v02.api.letsencrypt.org/directory"`
`6`	`6`	`}`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ resource "helm_release" "metrics_server" {`
`11`	`11`
`12`	`12`	`set {`
`13`	`13`	`name = "args"`
`14`		`- value = "--kubelet-preferred-address-types=InternalIP"`
	`14`	`+ value = "{--kubelet-preferred-address-types=InternalIP}"`
`15`	`15`	`}`
`16`	`16`	`set {`
`17`	`17`	`name = "image.tag"`