diff --git a/.github/workflows/terraform-release.yaml b/.github/workflows/terraform-release.yaml
index 90910bc..6bdff7e 100644
--- a/.github/workflows/terraform-release.yaml
+++ b/.github/workflows/terraform-release.yaml
@@ -18,7 +18,7 @@ jobs:
- name: Setup Terraform
uses: CSVD/gh-actions-setup-terraform@v3
with:
- terraform_version: "1.9.1"
+ terraform_version: "1.10.5"
- name: Setup GITHUB Credentials
id: github_credentials
@@ -28,28 +28,6 @@ jobs:
github_app_installation_id: ${{ vars.GH_APP_INSTALLATION_ID }}
github_app_id: ${{ vars.GH_APP_ID }}
-
- - name: Debug Authentication
- run: |
- # Print the GitHub server URL
- echo "GitHub Server URL: ${{ github.server_url }}"
-
- # Extract the host from the URL
- HOST="${{ github.server_url }}"
- HOST="${HOST#*//}"
- HOST="${HOST%%/*}"
- echo "GitHub Host: $HOST"
-
- # Check if token exists
- if [[ -n "${{ steps.github_credentials.outputs.github_token }}" ]]; then
- echo "Token generated successfully"
- # Test the token with a simple GitHub API call (without exposing the token)
- STATUS=$(curl -s -o /dev/null -w "%{http_code}" -H "Authorization: Bearer ${{ steps.github_credentials.outputs.github_token }}" "${{ github.server_url }}/api/v3/user")
- echo "API Test Status Code: $STATUS"
- else
- echo "No token was generated!"
- fi
-
- name: Setup GitHub CLI
run: |
# Force manual authentication since setup-git might not work with GitHub Enterprise
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ef52d70..8244dbb 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -37,7 +37,7 @@ repos:
# Terraform Hooks
- repo: https://github.com/antonbabenko/pre-commit-terraform
- rev: v1.97.3 # Get the latest from: https://github.com/antonbabenko/pre-commit-terraform/releases
+ rev: v1.98.0 # Get the latest from: https://github.com/antonbabenko/pre-commit-terraform/releases
hooks:
- id: terraform_fmt
args:
@@ -94,6 +94,6 @@ repos:
# - --hook-config=--parallelism-ci-cpu-cores=2
- repo: https://github.com/ljnsn/cz-conventional-gitmoji
- rev: v0.6.1
+ rev: v0.7.0
hooks:
- id: conventional-gitmoji
diff --git a/README.md b/README.md
index c9da336..ef22a3a 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ The following addons are automatically installed and configured:
```hcl
module "eks" {
- source = "https://github.e.it.census.gov/SCT-Engineering/terraform-aws-eks.git?ref=v20.35.0"
+ source = "git::https://github.e.it.census.gov/SCT-Engineering/terraform-aws-eks.git?ref=v20.35.0"
cluster_name = "my-cluster"
cluster_version = "1.28"
@@ -110,11 +110,11 @@ efs-csi-controller 0 5m
| Name | Source | Version |
|------|--------|---------|
-| [cloudwatch\_observability\_irsa\_role](#module\_cloudwatch\_observability\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | n/a |
+| [cloudwatch\_observability\_irsa\_role](#module\_cloudwatch\_observability\_irsa\_role) | git::https://github.e.it.census.gov/SCT-Engineering/terraform-aws-iam//modules/iam-role-for-service-accounts-eks | n/a |
| [cluster](#module\_cluster) | git::https://github.e.it.census.gov/SCT-Engineering/terraform-aws-eks/ | v20.35.0 |
-| [ebs\_csi\_irsa\_role](#module\_ebs\_csi\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | n/a |
-| [efs\_csi\_irsa\_role](#module\_efs\_csi\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | n/a |
-| [vpc\_cni\_irsa\_role](#module\_vpc\_cni\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | n/a |
+| [ebs\_csi\_irsa\_role](#module\_ebs\_csi\_irsa\_role) | git::https://github.e.it.census.gov/SCT-Engineering/terraform-aws-iam//modules/iam-role-for-service-accounts-eks | n/a |
+| [efs\_csi\_irsa\_role](#module\_efs\_csi\_irsa\_role) | git::https://github.e.it.census.gov/SCT-Engineering/terraform-aws-iam//modules/iam-role-for-service-accounts-eks | n/a |
+| [vpc\_cni\_irsa\_role](#module\_vpc\_cni\_irsa\_role) | git::https://github.e.it.census.gov/SCT-Engineering/terraform-aws-iam//modules/iam-role-for-service-accounts-eks | n/a |
## Resources
diff --git a/irsa_roles.tf b/irsa_roles.tf
index ee75c98..9d06500 100644
--- a/irsa_roles.tf
+++ b/irsa_roles.tf
@@ -1,6 +1,7 @@
-# tflint-ignore: terraform_module_version
module "vpc_cni_irsa_role" {
- source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
+ # tflint-ignore: terraform_module_version
+ # tflint-ignore: terraform_module_pinned_source
+ source = "git::https://github.e.it.census.gov/SCT-Engineering/terraform-aws-iam//modules/iam-role-for-service-accounts-eks"
role_name = format("%v%v-%v", local.prefixes["eks-role"], var.cluster_name, "vpc-cni")
@@ -16,9 +17,10 @@ module "vpc_cni_irsa_role" {
tags = local.tags
}
-# tflint-ignore: terraform_module_version
module "ebs_csi_irsa_role" {
- source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
+ # tflint-ignore: terraform_module_version
+ # tflint-ignore: terraform_module_pinned_source
+ source = "git::https://github.e.it.census.gov/SCT-Engineering/terraform-aws-iam//modules/iam-role-for-service-accounts-eks"
role_name = format("%v%v-%v", local.prefixes["eks-role"], var.cluster_name, "ebs-csi-driver")
attach_ebs_csi_policy = true
@@ -32,9 +34,10 @@ module "ebs_csi_irsa_role" {
tags = local.tags
}
-# tflint-ignore: terraform_module_version
module "efs_csi_irsa_role" {
- source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
+ # tflint-ignore: terraform_module_version
+ # tflint-ignore: terraform_module_pinned_source
+ source = "git::https://github.e.it.census.gov/SCT-Engineering/terraform-aws-iam//modules/iam-role-for-service-accounts-eks"
role_name = format("%v%v-%v", local.prefixes["eks-role"], var.cluster_name, "efs-csi-driver")
attach_efs_csi_policy = true
@@ -48,9 +51,10 @@ module "efs_csi_irsa_role" {
tags = local.tags
}
-# tflint-ignore: terraform_module_version
module "cloudwatch_observability_irsa_role" {
- source = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
+ # tflint-ignore: terraform_module_version
+ # tflint-ignore: terraform_module_pinned_source
+ source = "git::https://github.e.it.census.gov/SCT-Engineering/terraform-aws-iam//modules/iam-role-for-service-accounts-eks"
role_name = format("%v%v-%v", local.prefixes["eks-role"], var.cluster_name, "cloudwatch-observability")
attach_cloudwatch_observability_policy = true