Skip to content

updates from karpenter #1

Merged
merged 6 commits into from
Jul 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 11 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,17 @@ have a istio proxy configured, prevent communication with that pod.)
configuration of which identities are allowed to call services, and
which services are allowed to interact with other services.

# CHANGELOG
* 1.0.3 -- 2024-07-30
- updated image module
- bumped version
* 1.0.2 -- 2024-07-22
- updated istio chart/app to 1.22.3
- add force_delete and lifecycle policies to copy_images
- updated version.tf to 1.0.2
- included module.images in depends on helm charts
- created changelog

## Requirements

| Name | Version |
Expand Down Expand Up @@ -69,4 +80,3 @@ have a istio proxy configured, prevent communication with that pod.)
| Name | Source | Version |
|------|--------|---------|
| <a name="module_images"></a> [images](#module\_images) | git@github.e.it.census.gov:terraform-modules/aws-ecr-copy-images.git/ | 2.0.2 |

9 changes: 6 additions & 3 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,11 @@ 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 @@ -62,6 +62,7 @@ data "kubernetes_service" "apiserver" {
}

resource "helm_release" "base" {
depends_on = [module.images]
chart = "base"
name = "istio-base"
namespace = kubernetes_namespace.ns.metadata[0].name
Expand All @@ -88,11 +89,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,9 +127,16 @@ 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-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}"])
value = join("\\,", [for key, value in local.tags : "${key}=${value}"])
}

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

timeout = 90
}

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

timeout = 90
}
1 change: 0 additions & 1 deletion outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@ output "module_version" {
description = "The version of this module."
value = local._module_version
}

5 changes: 2 additions & 3 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 All @@ -61,4 +61,3 @@ variable "enable_egress_gateway" {
type = bool
default = true
}

2 changes: 1 addition & 1 deletion version.tf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
locals {
_module_name = "tfmod-istio"
_module_version = "1.0.1"
_module_version = "1.0.3"
}