Skip to content

Commit efeb5a3

Browse files
Merge pull request #305 from opendatacube/fix/pull-through-cache
Pass through variable creation for ECR pull through cache
2 parents a87dd83 + 7baa279 commit efeb5a3

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

odc_eks/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ module "odc_eks" {
165165
| extra_kubelet_args | Additional kubelet command-line arguments | string | "--arg1=value --arg2" | No |
166166
| extra_bootstrap_args | Additional bootstrap command-line arguments | string | "--arg1 value --arg2=value --arg3" | No |
167167
| extra_userdata | Additional EC2 user data commands that will be passed to EKS nodes | string | <<USERDATA echo "" USERDATA | No |
168+
| enable_ecr_pullthough_cache_permissions | Create additional cluster node IAM permissions to allow cluster to use ecr pull-through cache rules. | boolean | false | No |
168169
| tags | Additional tags - e.g. `map('StackName','XYZ')` | map(string) | {} | No |
169170
| enabled_cluster_log_types | List of the desired control plane logging to enable, defaults to none | list(string) | [] | No |
170171
| enable_custom_cluster_log_group | Create a custom CloudWatch Log Group for the cluster. If you supply `enabled_cluster_log_types` but leave this false, EKS will create a log group automatically with default retention values. | bool | false | No |

odc_eks/main.tf

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,10 @@ module "eks" {
131131

132132
enable_ec2_ssm = var.enable_ec2_ssm
133133

134-
enabled_cluster_log_types = var.enabled_cluster_log_types
135-
enable_custom_cluster_log_group = var.enable_custom_cluster_log_group
136-
log_retention_period = var.log_retention_period
134+
enabled_cluster_log_types = var.enabled_cluster_log_types
135+
enable_custom_cluster_log_group = var.enable_custom_cluster_log_group
136+
log_retention_period = var.log_retention_period
137+
enable_ecr_pullthough_cache_permissions = var.enable_ecr_pullthough_cache_permissions
137138

138139
# Worker configuration
139140
min_nodes = var.min_nodes

odc_eks/variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,12 @@ USERDATA
333333

334334
}
335335

336+
variable "enable_ecr_pullthough_cache_permissions" {
337+
type = bool
338+
description = "Create additional cluster node IAM permissions to allow cluster to use ecr pull-through cache rules."
339+
default = false
340+
}
341+
336342
variable "tags" {
337343
type = map(string)
338344
description = "Additional tags(e.g. `map('StackName','XYZ')`"

0 commit comments

Comments
 (0)