Skip to content

fixes for helm_release syntax updates #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidcheung merged 1 commit into from
Jun 29, 2020
Merged

fixes for helm_release syntax updates #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions templates/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,13 @@ update-k8s-conf:
teardown: teardown-k8s-utils teardown-env teardown-secrets teardown-remote-state

teardown-remote-state:
export AWS_PAGER='' && \
export AWS_PAGER='' && export AWS_DEFAULT_REGION=<% index .Params `region` %> && \
aws s3 rm s3://<% .Name %>-$(ENVIRONMENT)-terraform-state --recursive && \
aws s3 rb s3://<% .Name %>-$(ENVIRONMENT)-terraform-state --force && \
aws dynamodb delete-table --table-name <% .Name %>-$(ENVIRONMENT)-terraform-state-locks

teardown-secrets:
export AWS_PAGER='' && \
export AWS_PAGER='' && export AWS_DEFAULT_REGION=<% index .Params `region` %> && \
aws secretsmanager list-secrets --query "SecretList[?Tags[?Key=='project' && Value=='<% .Name %>']].[Name] | [0][0]" | xargs aws secretsmanager delete-secret --secret-id && \
aws iam delete-access-key --user-name <% .Name %>-ci-user --access-key-id $(shell aws iam list-access-keys --user-name <% .Name %>-ci-user --query "AccessKeyMetadata[0].AccessKeyId" | sed 's/"//g') && \
aws iam delete-user --user-name <% .Name %>-ci-user
Expand Down
13 changes: 5 additions & 8 deletions templates/kubernetes/terraform/modules/kubernetes/cert_manager.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,22 +61,19 @@ resource "null_resource" "cert_manager_issuer" {
depends_on = [null_resource.cert_manager]
}

data "helm_repository" "jetstack" {
name = "jetstack"
url = "https://charts.jetstack.io"
}

resource "helm_release" "cert_manager" {
name = "cert-manager"
repository = data.helm_repository.jetstack.metadata[0].name
repository = "https://charts.jetstack.io"
chart = "cert-manager"
version = local.cert_manager_version
namespace = local.cert_manager_namespace
set_string {
set {
type = "string"
name = "serviceAccount.annotations.eks\\.amazonaws\\.com/role-arn"
value = module.iam_assumable_role_cert_manager.this_iam_role_arn
}
set_string {
set {
type = "string"
name = "podAnnotations.eks\\.amazonaws\\.com/role-arn"
value = module.iam_assumable_role_cert_manager.this_iam_role_arn
}
Expand Down
5 changes: 3 additions & 2 deletions templates/kubernetes/terraform/modules/kubernetes/cluster_autoscaler.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ locals {

resource "helm_release" "cluster_autoscaler" {
name = "cluster-autoscaler"
repository = data.helm_repository.stable.metadata[0].name
repository = "https://kubernetes-charts.storage.googleapis.com"
chart = "cluster-autoscaler"
namespace = local.cluster_autoscaler_namespace

Expand All @@ -17,7 +17,8 @@ resource "helm_release" "cluster_autoscaler" {
name = "rbac.create"
value = true
}
set_string {
set {
type = "string"
name = "rbac.serviceAccountAnnotations.eks\\.amazonaws\\.com/role-arn"
value = module.iam_assumable_role_cluster_autoscaler.this_iam_role_arn
}
Expand Down
2 changes: 1 addition & 1 deletion templates/kubernetes/terraform/modules/kubernetes/metrics_server.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ locals {

resource "helm_release" "metrics_server" {
name = "metrics-server"
repository = data.helm_repository.stable.metadata[0].name
repository = "https://kubernetes-charts.storage.googleapis.com"
chart = "metrics-server"
namespace = local.metrics_server_namespace

Expand Down
5 changes: 0 additions & 5 deletions templates/kubernetes/terraform/modules/kubernetes/provider.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,3 @@ provider "kubernetes" {
token = data.aws_eks_cluster_auth.cluster_auth.token
load_config_file = false
}

data "helm_repository" "stable" {
name = "stable"
url = "https://kubernetes-charts.storage.googleapis.com"
}