Skip to content

Commit

Permalink
Merge pull request #34 from streamnative/fix/addon_namespaces
Browse files Browse the repository at this point in the history
[addons] Install addons in kube-system
  • Loading branch information
jrsdav authored Dec 6, 2021
2 parents 20a53f6 + 6087423 commit 4ee37b7
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions aws_load_balancer_controller.tf
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ data "aws_iam_policy_document" "aws_load_balancer_controller_sts" {
}
condition {
test = "StringLike"
values = [format("system:serviceaccount:%s:%s", kubernetes_namespace.sn_system.id, "aws-load-balancer-controller")]
values = [format("system:serviceaccount:%s:%s", "kube-system", "aws-load-balancer-controller")]
variable = format("%s:sub", local.oidc_issuer)
}
}
Expand Down Expand Up @@ -290,7 +290,7 @@ resource "helm_release" "aws_load_balancer_controller" {
chart = var.aws_load_balancer_controller_helm_chart_name
cleanup_on_fail = true
name = "aws-load-balancer-controller"
namespace = kubernetes_namespace.sn_system.id
namespace = "kube-system"
repository = var.aws_load_balancer_controller_helm_chart_repository
timeout = 300
version = var.aws_load_balancer_controller_helm_chart_version
Expand Down
2 changes: 1 addition & 1 deletion aws_node_termination_handler.tf
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ resource "helm_release" "node_termination_handler" {
chart = var.node_termination_handler_helm_chart_name
cleanup_on_fail = true
name = "node-termination-handler"
namespace = kubernetes_namespace.sn_system.id
namespace = "kube-system"
repository = var.node_termination_handler_helm_chart_repository
timeout = 300

Expand Down
2 changes: 1 addition & 1 deletion calico.tf
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ resource "helm_release" "calico" {
chart = var.calico_helm_chart_name
cleanup_on_fail = true
name = "tigera-operator"
namespace = kubernetes_namespace.sn_system.id
namespace = "kube-system"
repository = var.calico_helm_chart_repository
timeout = 300
version = var.calico_helm_chart_version
Expand Down
4 changes: 2 additions & 2 deletions cert_manager.tf
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ data "aws_iam_policy_document" "cert_manager_sts" {
}
condition {
test = "StringLike"
values = [format("system:serviceaccount:%s:%s", kubernetes_namespace.sn_system.id, "cert-manager")]
values = [format("system:serviceaccount:%s:%s", "kube-system", "cert-manager")]
variable = format("%s:sub", local.oidc_issuer)
}
}
Expand Down Expand Up @@ -102,7 +102,7 @@ resource "helm_release" "cert_manager" {
chart = var.cert_manager_helm_chart_name
cleanup_on_fail = true
name = "cert-manager"
namespace = kubernetes_namespace.sn_system.id
namespace = "kube-system"
repository = var.cert_manager_helm_chart_repository
timeout = 300
version = var.cert_manager_helm_chart_version
Expand Down
4 changes: 2 additions & 2 deletions cluster_autoscaler.tf
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ data "aws_iam_policy_document" "cluster_autoscaler_sts" {
}
condition {
test = "StringLike"
values = [format("system:serviceaccount:%s:%s", kubernetes_namespace.sn_system.id, "cluster-autoscaler")]
values = [format("system:serviceaccount:%s:%s", "kube-system", "cluster-autoscaler")]
variable = format("%s:sub", local.oidc_issuer)
}
}
Expand Down Expand Up @@ -100,7 +100,7 @@ resource "helm_release" "cluster_autoscaler" {
chart = var.cluster_autoscaler_helm_chart_name
cleanup_on_fail = true
name = "cluster-autoscaler"
namespace = kubernetes_namespace.sn_system.id
namespace = "kube-system"
repository = var.cluster_autoscaler_helm_chart_repository
timeout = 300
version = var.cluster_autoscaler_helm_chart_version
Expand Down
4 changes: 2 additions & 2 deletions csi.tf
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ data "aws_iam_policy_document" "csi_sts" {
}
condition {
test = "StringEquals"
values = [format("system:serviceaccount:%s:%s", kubernetes_namespace.sn_system.id, "ebs-csi-controller-sa")]
values = [format("system:serviceaccount:%s:%s", "kube-system", "ebs-csi-controller-sa")]
variable = format("%s:sub", local.oidc_issuer)
}
condition {
Expand Down Expand Up @@ -175,7 +175,7 @@ resource "helm_release" "csi" {
chart = var.csi_helm_chart_name
cleanup_on_fail = true
name = "aws-ebs-csi-driver"
namespace = kubernetes_namespace.sn_system.id
namespace = "kube-system"
repository = var.csi_helm_chart_repository
timeout = 300

Expand Down
4 changes: 2 additions & 2 deletions external_dns.tf
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ data "aws_iam_policy_document" "external_dns_sts" {
}
condition {
test = "StringLike"
values = [format("system:serviceaccount:%s:%s", kubernetes_namespace.sn_system.id, "external-dns")]
values = [format("system:serviceaccount:%s:%s", "kube-system", "external-dns")]
variable = format("%s:sub", local.oidc_issuer)
}
}
Expand Down Expand Up @@ -91,7 +91,7 @@ resource "helm_release" "external_dns" {
atomic = true
chart = var.external_dns_helm_chart_name
cleanup_on_fail = true
namespace = kubernetes_namespace.sn_system.id
namespace = "kube-system"
name = "external-dns"
repository = var.external_dns_helm_chart_repository
timeout = 300
Expand Down
4 changes: 2 additions & 2 deletions external_secrets.tf
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ data "aws_iam_policy_document" "external_secrets_sts" {
}
condition {
test = "StringLike"
values = [format("system:serviceaccount:%s:%s", kubernetes_namespace.sn_system.id, "external-secrets")]
values = [format("system:serviceaccount:%s:%s", "kube-system", "external-secrets")]
variable = format("%s:sub", local.oidc_issuer)
}
}
Expand Down Expand Up @@ -87,7 +87,7 @@ resource "helm_release" "external_secrets" {
atomic = true
chart = var.external_secrets_helm_chart_name
cleanup_on_fail = true
namespace = kubernetes_namespace.sn_system.id
namespace = "kube-system"
name = "external-secrets"
repository = var.external_secrets_helm_chart_repository
timeout = 300
Expand Down

0 comments on commit 4ee37b7

Please sign in to comment.