Skip to content

Commit d21e4f8

Browse files
authored
Release 4.3.0 (#107) (#109)
* updated vpc cni and ebs csi addons * updated multi addons components
1 parent dbce6ce commit d21e4f8

File tree

10 files changed

+110
-95
lines changed

10 files changed

+110
-95
lines changed

README.md

Lines changed: 31 additions & 31 deletions
Large diffs are not rendered by default.

examples/complete/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
| Name | Source | Version |
2323
|------|--------|---------|
24-
| <a name="module_eks-addons"></a> [eks-addons](#module\_eks-addons) | squareops/eks-addons/aws | 4.2.0 |
24+
| <a name="module_eks-addons"></a> [eks-addons](#module\_eks-addons) | squareops/eks-addons/aws | 4.3.0 |
2525

2626
## Resources
2727

examples/complete/config/karpenter.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ affinity:
1919
- "true"
2020

2121
settings:
22-
clusterName: ${eks_cluster_id}
23-
clusterEndpoint: ${eks_cluster_endpoint}
2422
eksControlPlane: false
2523
featureGates:
2624
spotToSpotConsolidation: true

examples/complete/main.tf

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ locals {
2222
}
2323
module "eks-addons" {
2424
source = "squareops/eks-addons/aws"
25-
version = "4.2.0"
25+
version = "4.3.0"
2626
name = local.name
2727
tags = local.additional_tags
2828
vpc_id = local.vpc_id
@@ -38,11 +38,11 @@ module "eks-addons" {
3838

3939
#VPC-CNI-DRIVER
4040
amazon_eks_vpc_cni_enabled = false # enable VPC-CNI
41-
vpc_cni_version = "v1.19.2-eksbuild.1"
41+
vpc_cni_version = "v1.19.3-eksbuild.1"
4242

4343
#EBS-CSI-DRIVER
4444
enable_amazon_eks_aws_ebs_csi_driver = false # enable EBS CSI Driver
45-
ebs_csi_driver_version = "v1.36.0-eksbuild.1"
45+
ebs_csi_driver_version = "v1.41.0-eksbuild.1"
4646
amazon_eks_aws_ebs_csi_driver_config = {
4747
values = [file("${path.module}/config/ebs-csi.yaml")]
4848
}
@@ -53,26 +53,26 @@ module "eks-addons" {
5353

5454
## EfS-STORAGE-CLASS
5555
efs_storage_class_enabled = false # to enable EBS storage class
56-
efs_version = "2.3.2"
56+
efs_version = "3.1.8"
5757

5858
## SERVICE-MONITORING-CRDs
5959
service_monitor_crd_enabled = false # enable service monitor along with K8S-dashboard (required CRD) or when require service monitor in reloader and cert-manager
6060

6161
## METRIC-SERVER
6262
metrics_server_enabled = false # to enable metrics server
63-
metrics_server_version = "3.12.1"
63+
metrics_server_version = "3.12.2"
6464
metrics_server_helm_config = [file("${path.module}/config/metrics-server.yaml")]
6565

6666
# VerticalPodAutoscaler
6767
vpa_enabled = false
68-
vpa_version = "9.9.0"
68+
vpa_version = "10.0.0"
6969
vpa_config = {
7070
values = [file("${path.module}/config/vpa-crd.yaml")]
7171
}
7272

7373
## CLUSTER-AUTOSCALER
7474
cluster_autoscaler_enabled = false # to enable cluster autoscaller
75-
cluster_autoscaler_version = "9.46.3"
75+
cluster_autoscaler_version = "9.46.6"
7676
cluster_autoscaler_helm_config = [file("${path.module}/config/cluster-autoscaler.yaml")]
7777

7878
## NODE-TERMINATION-HANDLER
@@ -86,14 +86,14 @@ module "eks-addons" {
8686

8787
## KEDA
8888
keda_enabled = false # to enable Keda in the EKS cluster
89-
keda_version = "2.14.2"
89+
keda_version = "2.17.0"
9090
keda_helm_config = {
9191
values = [file("${path.module}/config/keda.yaml")]
9292
}
9393

9494
## KARPENTER
9595
karpenter_enabled = false # to enable Karpenter (installs required CRDs )
96-
karpenter_version = "1.3.1"
96+
karpenter_version = "1.3.3"
9797
karpenter_helm_config = {
9898
enable_service_monitor = false # to enable monitoring for kafalserpenter
9999
values = [file("${path.module}/config/karpenter.yaml")]
@@ -112,7 +112,7 @@ module "eks-addons" {
112112

113113
## EXTERNAL-SECRETS
114114
external_secrets_enabled = false # to enable external secrets
115-
external_secrets_version = "0.9.19"
115+
external_secrets_version = "0.15.1"
116116
external_secrets_helm_config = {
117117
values = [file("${path.module}/config/external-secret.yaml")]
118118
}

main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ module "aws-efs-csi-driver" {
3232
source = "./modules/aws-efs-csi-driver"
3333
count = var.efs_storage_class_enabled ? 1 : 0
3434
helm_config = var.aws_efs_csi_driver_helm_config
35-
irsa_policies = var.kms_policy_arn != "" ? [var.kms_policy_arn] : []
35+
irsa_policies = var.kms_policy_arn != "" ? [var.kms_policy_arn] : []
3636
manage_via_gitops = var.argocd_manage_add_ons
3737
addon_context = local.addon_context
3838
chart_version = var.efs_version
@@ -295,7 +295,7 @@ module "reloader" {
295295
module "single-az-sc" {
296296
for_each = { for sc in var.single_az_sc_config : sc.name => sc }
297297
source = "./modules/aws-ebs-storage-class"
298-
kms_key_id = var.kms_key_arn != "" ? var.kms_key_arn : null
298+
kms_key_id = var.kms_key_arn != "" ? var.kms_key_arn : null
299299
availability_zone = each.value.zone
300300
single_az_ebs_gp3_storage_class = var.single_az_ebs_gp3_storage_class_enabled
301301
single_az_ebs_gp3_storage_class_name = each.value.name

modules/aws-ebs-csi-driver/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ module "helm_addon" {
3636
name = local.name
3737
description = "The Amazon Elastic Block Store Container Storage Interface (CSI) Driver provides a CSI interface used by Container Orchestrators to manage the lifecycle of Amazon EBS volumes."
3838
chart = local.name
39-
version = "2.27.0"
39+
version = "2.41.0"
4040
repository = "https://kubernetes-sigs.github.io/aws-ebs-csi-driver"
4141
namespace = local.namespace
4242
values = yamlencode(merge(

modules/aws-efs-csi-driver/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131

3232
| Name | Description | Type | Default | Required |
3333
|------|-------------|------|---------|:--------:|
34-
| <a name="input_addon_context"></a> [addon\_context](#input\_addon\_context) | Input configuration for the addon | <pre>object({<br> aws_caller_identity_account_id = string<br> aws_caller_identity_arn = string<br> aws_eks_cluster_endpoint = string<br> aws_partition_id = string<br> aws_region_name = string<br> eks_cluster_id = string<br> eks_oidc_issuer_url = string<br> eks_oidc_provider_arn = string<br> tags = map(string)<br> irsa_iam_role_path = string<br> irsa_iam_permissions_boundary = string<br> })</pre> | n/a | yes |
35-
| <a name="input_chart_version"></a> [chart\_version](#input\_chart\_version) | aws efs addons helm version | `string` | `"2.3.2"` | no |
34+
| <a name="input_addon_context"></a> [addon\_context](#input\_addon\_context) | Input configuration for the addon | <pre>object({<br/> aws_caller_identity_account_id = string<br/> aws_caller_identity_arn = string<br/> aws_eks_cluster_endpoint = string<br/> aws_partition_id = string<br/> aws_region_name = string<br/> eks_cluster_id = string<br/> eks_oidc_issuer_url = string<br/> eks_oidc_provider_arn = string<br/> tags = map(string)<br/> irsa_iam_role_path = string<br/> irsa_iam_permissions_boundary = string<br/> })</pre> | n/a | yes |
35+
| <a name="input_chart_version"></a> [chart\_version](#input\_chart\_version) | aws efs addons helm version | `string` | `"3.1.8"` | no |
3636
| <a name="input_helm_config"></a> [helm\_config](#input\_helm\_config) | Helm provider config for the aws\_efs\_csi\_driver. | `any` | `{}` | no |
3737
| <a name="input_irsa_policies"></a> [irsa\_policies](#input\_irsa\_policies) | Additional IAM policies for a IAM role for service accounts | `list(string)` | `[]` | no |
3838
| <a name="input_manage_via_gitops"></a> [manage\_via\_gitops](#input\_manage\_via\_gitops) | Determines if the add-on should be managed via GitOps. | `bool` | `false` | no |

modules/aws-efs-csi-driver/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ variable "addon_context" {
3737
variable "chart_version" {
3838
description = "aws efs addons helm version"
3939
type = string
40-
default = "2.3.2"
40+
default = "3.1.8"
4141
}

modules/keda/config/values.yaml

Lines changed: 54 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,24 @@
44

55
image:
66
keda:
7-
repository: ghcr.io/kedacore/keda
7+
# -- Image registry of KEDA operator
8+
registry: ghcr.io
9+
# -- Image name of KEDA operator
10+
repository: kedacore/keda
811
# Allows people to override tag if they don't want to use the app version
912
tag:
1013
metricsApiServer:
11-
repository: ghcr.io/kedacore/keda-metrics-apiserver
14+
# -- Image registry of KEDA Metrics API Server
15+
registry: ghcr.io
16+
# -- Image name of KEDA Metrics API Server
17+
repository: kedacore/keda-metrics-apiserver
1218
# Allows people to override tag if they don't want to use the app version
1319
tag:
1420
webhooks:
15-
repository: ghcr.io/kedacore/keda-admission-webhooks
21+
# -- Image registry of KEDA admission-webhooks
22+
registry: ghcr.io
23+
# -- Image name of KEDA admission-webhooks
24+
repository: kedacore/keda-admission-webhooks
1625
# Allows people to override tag if they don't want to use the app version
1726
tag:
1827
pullPolicy: Always
@@ -121,22 +130,18 @@ rbac:
121130
create: true
122131

123132
serviceAccount:
124-
# Specifies whether a service account should be created
125-
create: true
126-
# The name of the service account to use.
127-
# If not set and create is true, a name is generated using the fullname template
128-
name: keda-operator
129-
# Specifies whether a service account should automount API-Credentials
130-
automountServiceAccountToken: true
131-
# Annotations to add to the service account
132-
annotations: {}
133+
operator:
134+
# Specifies whether a service account should be created
135+
create: true
136+
# The name of the service account to use.
137+
# If not set and create is true, a name is generated using the fullname template
138+
name: keda-operator
139+
# Specifies whether a service account should automount API-Credentials
140+
automountServiceAccountToken: true
141+
# Annotations to add to the service account
142+
annotations: {}
133143

134144
podIdentity:
135-
activeDirectory:
136-
# Set to the value of the Azure Active Directory Pod Identity
137-
# See https://keda.sh/docs/concepts/authentication/#azure-pod-identity
138-
# This will be set as a label on the KEDA Pod(s)
139-
identity: ""
140145
azureWorkload:
141146
# Set to true to enable Azure Workload Identity usage.
142147
# See https://keda.sh/docs/concepts/authentication/#azure-workload-identity
@@ -166,7 +171,6 @@ podIdentity:
166171
# Set to the value of the service account token expiration duration.
167172
# This will be set as an annotation on the KEDA service account.
168173
tokenExpiration: 86400
169-
170174
# Set this if you are using an external scaler and want to communicate
171175
# over TLS (recommended). This variable holds the name of the secret that
172176
# will be mounted to the /grpccerts path on the Pod
@@ -255,8 +259,6 @@ podSecurityContext:
255259

256260
service:
257261
type: ClusterIP
258-
portHttp: 80
259-
portHttpTarget: 8080
260262
portHttps: 443
261263
portHttpsTarget: 6443
262264

@@ -292,7 +294,6 @@ resources:
292294
nodeSelector: {}
293295

294296
tolerations: []
295-
296297
# -- Pod Topology Constraints https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/
297298
topologySpreadConstraints: {}
298299
# operator: []
@@ -349,7 +350,7 @@ volumes:
349350
prometheus:
350351
metricServer:
351352
enabled: false
352-
port: 9022
353+
port: 8080
353354
portName: metrics
354355
path: /metrics
355356
serviceMonitor:
@@ -359,17 +360,23 @@ prometheus:
359360
targetLabels: []
360361
podTargetLabels: []
361362
port: metrics
362-
targetPort:
363-
interval:
364-
scrapeTimeout:
363+
# -- Name or number of the target port of the Pod behind the Service, the port must be specified with container port property. Mutually exclusive with port
364+
targetPort: ""
365+
# -- Interval at which metrics should be scraped If not specified Prometheus’ global scrape interval is used.
366+
interval: ""
367+
# -- Timeout after which the scrape is ended If not specified, the Prometheus global scrape timeout is used unless it is less than Interval in which the latter is used
368+
scrapeTimeout: ""
365369
relabellings: []
366370
additionalLabels: {}
367371
podMonitor:
368372
# Enables PodMonitor creation for the Prometheus Operator
369373
enabled: false
370-
interval:
371-
scrapeTimeout:
372-
namespace:
374+
# -- Scraping interval for metric server using podMonitor crd (prometheus operator)
375+
interval: ""
376+
# -- Scraping timeout for metric server using podMonitor crd (prometheus operator)
377+
scrapeTimeout: ""
378+
# -- Scraping namespace for metric server using podMonitor crd (prometheus operator)
379+
namespace: ""
373380
additionalLabels: {}
374381
relabelings: []
375382
operator:
@@ -382,17 +389,24 @@ prometheus:
382389
targetLabels: []
383390
podTargetLabels: []
384391
port: metrics
385-
targetPort:
386-
interval:
387-
scrapeTimeout:
392+
# -- Name or number of the target port of the Pod behind the Service,
393+
# the port must be specified with container port property. Mutually exclusive with port
394+
targetPort: ""
395+
# -- Interval at which metrics should be scraped If not specified Prometheus’ global scrape interval is used.
396+
interval: ""
397+
# -- Timeout after which the scrape is ended If not specified, the Prometheus global scrape timeout is used unless it is less than Interval in which the latter is used
398+
scrapeTimeout: ""
388399
relabellings: []
389400
additionalLabels: {}
390401
podMonitor:
391402
# Enables PodMonitor creation for the Prometheus Operator
392403
enabled: false
393-
interval:
394-
scrapeTimeout:
395-
namespace:
404+
# -- Scraping interval for KEDA Operator using podMonitor crd (prometheus operator)
405+
interval: ""
406+
# -- Scraping timeout for KEDA Operator using podMonitor crd (prometheus operator)
407+
scrapeTimeout: ""
408+
# -- Scraping namespace for KEDA Operator using podMonitor crd (prometheus operator)
409+
namespace: ""
396410
additionalLabels: {}
397411
relabelings: []
398412
prometheusRules:
@@ -419,9 +433,12 @@ prometheus:
419433
targetLabels: []
420434
podTargetLabels: []
421435
port: metrics
422-
targetPort:
423-
interval:
424-
scrapeTimeout:
436+
# -- Name or number of the target port of the Pod behind the Service, the port must be specified with container port property. Mutually exclusive with port
437+
targetPort: ""
438+
# -- Interval at which metrics should be scraped If not specified Prometheus’ global scrape interval is used.
439+
interval: ""
440+
# -- Timeout after which the scrape is ended If not specified, the Prometheus global scrape timeout is used unless it is less than Interval in which the latter is used
441+
scrapeTimeout: ""
425442
relabellings: []
426443
additionalLabels: {}
427444
prometheusRules:

variables.tf

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -738,19 +738,19 @@ variable "vpc_cni_version" {
738738

739739
variable "ebs_csi_driver_version" {
740740
description = "Version of the ebs csi driver addon"
741-
default = "v1.36.0-eksbuild.1"
741+
default = "v1.41.0-eksbuild.1"
742742
type = string
743743
}
744744

745745
variable "metrics_server_version" {
746746
description = "Version of the metrics server addon"
747-
default = "3.12.1"
747+
default = "3.12.2"
748748
type = string
749749
}
750750

751751
variable "cluster_autoscaler_version" {
752752
description = "Version of the cluster autoscaler addon"
753-
default = "9.46.3"
753+
default = "9.46.6"
754754
type = string
755755
}
756756

@@ -762,19 +762,19 @@ variable "aws_node_termination_handler_version" {
762762

763763
variable "keda_version" {
764764
description = "Version of the keda addon"
765-
default = "2.14.2"
765+
default = "2.17.0"
766766
type = string
767767
}
768768

769769
variable "karpenter_version" {
770770
description = "Version of the karpenter addon"
771-
default = "1.3.1"
771+
default = "1.3.3"
772772
type = string
773773
}
774774

775775
variable "external_secrets_version" {
776776
description = "Version of the external secrets addon"
777-
default = "0.9.19"
777+
default = "0.15.1"
778778
type = string
779779
}
780780

@@ -846,7 +846,7 @@ variable "falco_version" {
846846

847847
variable "efs_version" {
848848
description = "Version of the efs addon"
849-
default = "2.3.2"
849+
default = "3.1.8"
850850
type = string
851851
}
852852

@@ -858,6 +858,6 @@ variable "vpa_enabled" {
858858

859859
variable "vpa_version" {
860860
description = "Version of VPA CRD"
861-
default = "9.9.0"
861+
default = "10.0.0"
862862
type = string
863863
}

0 commit comments

Comments
 (0)