Skip to content

Commit

Permalink
Upgrade and fixed a few issues deploying
Browse files Browse the repository at this point in the history
  • Loading branch information
mcgin314 committed Jul 26, 2024
1 parent 2eb3a3f commit c4bd940
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 11 deletions.
8 changes: 6 additions & 2 deletions copy_images.tf
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ locals {
}

module "images" {
source = "git@github.e.it.census.gov:terraform-modules/aws-ecr-copy-images.git/?ref=2.0.2"
source = "git@github.e.it.census.gov:terraform-modules/aws-ecr-copy-images.git/?ref=tf-upgrade"

profile = var.profile
application_name = var.cluster_name
Expand All @@ -38,8 +38,12 @@ module "images" {
## destination_password = ""
## destination_username = ""
## override_prefixes = {}
region = var.region
## region = var.region
## source_password = ""
## source_username = ""

enable_lifecycle_policy = true
lifecycle_policy_all = true
force_delete = true
}

2 changes: 1 addition & 1 deletion examples/simple/istio.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "eks-configuration" {
source = "git@github.it.census.gov:SOA/tfmod-istio.git//?ref=v1.0.1"
source = "../.."

region = var.region
profile = var.profile
Expand Down
4 changes: 2 additions & 2 deletions examples/simple/simple.auto.tfvars
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
region = "us-gov-east-1"
profile = "107742151971-do2-govcloud"
cluster_name = "adsd-cumulus-sandbox"
profile = "terraform"
cluster_name = "platform-test-1"

19 changes: 15 additions & 4 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,11 @@ resource "helm_release" "istiod" {
}
set {
name = "global.proxy.image"
value = module.images.images[local.proxy_key].dest_repository
value = module.images.images[local.proxy_key].dest_full_path
}
set {
name = "global.proxy_init.image"
value = module.images.images[local.proxy_key].dest_repository
value = module.images.images[local.proxy_key].dest_full_path
}

set {
Expand Down Expand Up @@ -126,11 +126,18 @@ resource "helm_release" "ingress" {
name = "service.annotations.service\\.beta\\.kubernetes\\.io/aws-load-balancer-type"
value = "nlb"
}

set {
name = "service.annotations.service\\.beta\\.kubernetes\\.io/aws-load-balancer-additional-resource-tags"
value = join(",", [for key, value in local.tags : "${key}=${value}"])
name = "service.annotations.service\\.beta\\.kubernetes\\.io/aws-load-balancer-internal"
type = "string"
value = "true"
}

set {
name = "service.annotations.service\\.beta\\.kubernetes\\.io/aws-load-balancer-additional-resource-tags"
value = join("\\,", [for key, value in local.tags : "${key}=${value}"])
}

dynamic "set" {
for_each = local.ports

Expand Down Expand Up @@ -163,6 +170,8 @@ resource "helm_release" "ingress" {
value = set.value.port
}
}

timeout = 90
}

resource "helm_release" "egress" {
Expand All @@ -180,5 +189,7 @@ resource "helm_release" "egress" {
name = "service.type"
value = "ClusterIP"
}

timeout = 90
}

4 changes: 2 additions & 2 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ variable "tags" {
variable "istio_chart_version" {
description = "The version of istio to install into the cluster."
type = string
default = "1.18.2"
default = "1.22.3"
}

# The `APP VERSION` of the output found while determining the chart version
variable "istio_version" {
description = "The version of istio to install into the cluster."
type = string
default = "1.18.2"
default = "1.22.3"
}

variable "enable_telemetry" {
Expand Down

0 comments on commit c4bd940

Please sign in to comment.