Skip to content
Open
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
8 changes: 4 additions & 4 deletions .github/actions/terratest/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM golang:1.24.1-alpine3.20
FROM golang:1.25.4-alpine3.22

WORKDIR /

ARG TERRAFORM_VERSION=1.11.3
ARG KUBECTL_VERSION=1.32.3
ARG HELM_VERSION=3.17.0
ARG TERRAFORM_VERSION=1.14.0
ARG KUBECTL_VERSION=1.34.2
ARG HELM_VERSION=3.19.0

RUN apk add --no-cache \
bash \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- uses: actions/checkout@v4
- uses: hashicorp/setup-terraform@v3
with:
terraform_version: 1.8.1
terraform_version: 1.14.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(nit) If you wish to pin Terraform version, you might consider doing it like this: hashicorp/setup-terraform#407 (comment)

- name: 'Terraform Format'
run: terraform fmt -check -recursive
- name: 'Terraform Init cluster'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tfsec_pr_commenter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
- name: Clone repo
uses: actions/checkout@v4
- name: trivy
uses: reviewdog/action-trivy@v1.13.10
uses: reviewdog/action-trivy@v1.14.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
trivy_command: config
Expand Down
2 changes: 1 addition & 1 deletion .terraform-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.11.3
1.14.0
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,11 @@ module "cluster" {
provider "kubernetes" {
host = module.cluster.config.endpoint
cluster_ca_certificate = base64decode(module.cluster.config.ca_data)
token = ephemeral.aws_eks_cluster_auth.auth.token
}

exec {
api_version = "client.authentication.k8s.io/v1beta1"
command = "aws"
args = ["eks", "get-token", "--cluster-name", module.cluster.config.name]
}
ephemeral "aws_eks_cluster_auth" "auth" {
name = module.cluster.config.name
}
```

Expand Down
102 changes: 51 additions & 51 deletions examples/cluster/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/cluster/environment/.terraform-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.3
1.14.0
40 changes: 20 additions & 20 deletions examples/cluster/environment/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions examples/cluster/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@ provider "aws" {
provider "kubernetes" {
host = module.cluster.config.endpoint
cluster_ca_certificate = base64decode(module.cluster.config.ca_data)
token = ephemeral.aws_eks_cluster_auth.auth.token
}

exec {
api_version = "client.authentication.k8s.io/v1beta1"
command = "aws"
args = ["eks", "get-token", "--cluster-name", module.cluster.config.name]
}
ephemeral "aws_eks_cluster_auth" "auth" {
name = module.cluster.config.name
}

data "http" "ip" {
Expand Down
4 changes: 2 additions & 2 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ data "aws_iam_policy_document" "cloudwatch" {
identifiers = [
format(
"logs.%s.amazonaws.com",
data.aws_region.current.name
data.aws_region.current.region
)
]
}
Expand All @@ -151,7 +151,7 @@ data "aws_iam_policy_document" "cloudwatch" {
values = [
format(
"arn:aws:logs:%s:%s:log-group:/aws/eks/%s/cluster",
data.aws_region.current.name,
data.aws_region.current.region,
data.aws_caller_identity.current.account_id,
var.name,
)
Expand Down
Loading