This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-1158
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1158 by this push:
new 940d10f added step-ca
940d10f is described below
commit 940d10fb108c77242a8ca7d0d96283a5748aaacf
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Wed Dec 4 13:38:06 2019 +0200
added step-ca
---
.../terraform/gcp/ssn-gke/main/modules/helm_charts/main.tf | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/main.tf
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/main.tf
index 1129e5f..300e729 100644
---
a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/main.tf
+++
b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/main.tf
@@ -37,7 +37,7 @@ provider "helm" {
cluster_ca_certificate =
base64decode(data.google_container_cluster.ssn_k8s_gke_cluster.master_auth.0.cluster_ca_certificate)
}
install_tiller = true
- service_account = "tiller"
+ service_account = kubernetes_service_account.tiller_sa.metadata.0.name
}
provider "kubernetes" {
@@ -48,14 +48,14 @@ provider "kubernetes" {
cluster_ca_certificate =
base64decode(data.google_container_cluster.ssn_k8s_gke_cluster.master_auth.0.cluster_ca_certificate)
}
-resource "kubernetes_service_account" "example" {
+resource "kubernetes_service_account" "tiller_sa" {
metadata {
name = "tiller"
namespace = "kube-system"
}
}
-resource "kubernetes_role_binding" "example" {
+resource "kubernetes_role_binding" "tiller_rb" {
metadata {
name = "tiller"
namespace = "kube-system"
@@ -67,11 +67,6 @@ resource "kubernetes_role_binding" "example" {
}
subject {
kind = "ServiceAccount"
- name = "default"
- namespace = "kube-system"
- }
- subject {
- kind = "ServiceAccount"
name = "tiller"
namespace = "kube-system"
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
