diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 3e55fc7..7321424 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,9 +1,10 @@
repos:
-- repo: https://github.com/antonbabenko/pre-commit-terraform
- rev: v1.73.0
- hooks:
- - id: terraform_fmt
- - id: terraform_docs
- - id: terraform_validate
- - id: terraform_tflint
- - id: terraform_tfsec
+ - repo: https://github.com/antonbabenko/pre-commit-terraform
+ rev: v1.77.1
+ hooks:
+ - id: terraform_fmt
+ - id: terraform_docs
+ - id: terraform_validate
+ - id: terraform_tflint
+ args:
+ - --args=--config=__GIT_WORKING_DIR__/.tflint.hcl
diff --git a/.tflint.hcl b/.tflint.hcl
index 0bfb222..f3eba00 100644
--- a/.tflint.hcl
+++ b/.tflint.hcl
@@ -2,4 +2,12 @@ plugin "aws" {
enabled = true
version = "0.21.2"
source = "github.com/terraform-linters/tflint-ruleset-aws"
+}
+
+rule "terraform_required_providers" {
+ enabled = false
+}
+
+rule "terraform_required_version" {
+ enabled = false
}
\ No newline at end of file
diff --git a/README.md b/README.md
index ffc3dd6..d54a933 100644
--- a/README.md
+++ b/README.md
@@ -100,7 +100,7 @@ module "ebs_csi_driver_controller" {
| [csi\_controller\_tolerations](#input\_csi\_controller\_tolerations) | CSI driver controller tolerations | `list(map(string))` | `[]` | no |
| [csi\_provisioner\_tag\_version](#input\_csi\_provisioner\_tag\_version) | The csi provisioner tag version | `string` | `"v3.2.1"` | no |
| [default\_fstype](#input\_default\_fstype) | The default Filesystem type | `string` | `"ext4"` | no |
-| [ebs\_csi\_controller\_image](#input\_ebs\_csi\_controller\_image) | The EBS CSI driver controller's image | `string` | `""` | no |
+| [ebs\_csi\_controller\_image](#input\_ebs\_csi\_controller\_image) | The EBS CSI driver controller's image | `string` | `"k8s.gcr.io/provider-aws/aws-ebs-csi-driver"` | no |
| [ebs\_csi\_controller\_role\_name](#input\_ebs\_csi\_controller\_role\_name) | The name of the EBS CSI driver IAM role | `string` | `"ebs-csi-driver-controller"` | no |
| [ebs\_csi\_controller\_role\_policy\_name\_prefix](#input\_ebs\_csi\_controller\_role\_policy\_name\_prefix) | The prefix of the EBS CSI driver IAM policy | `string` | `"ebs-csi-driver-policy"` | no |
| [ebs\_csi\_driver\_version](#input\_ebs\_csi\_driver\_version) | The EBS CSI driver controller's image version | `string` | `""` | no |
diff --git a/controller.tf b/controller.tf
index f8d1fe7..52fea42 100644
--- a/controller.tf
+++ b/controller.tf
@@ -46,7 +46,7 @@ resource "kubernetes_deployment" "ebs_csi_controller" {
container {
name = "ebs-plugin"
- image = "${var.ebs_csi_controller_image == "" ? "k8s.gcr.io/provider-aws/aws-ebs-csi-driver" : var.ebs_csi_controller_image}:${local.ebs_csi_driver_version}"
+ image = "${var.ebs_csi_controller_image}:${local.ebs_csi_driver_version}"
args = compact(
[
"controller",
diff --git a/examples/simple/README.md b/examples/simple/README.md
index bb4eee3..fbc8524 100644
--- a/examples/simple/README.md
+++ b/examples/simple/README.md
@@ -16,7 +16,6 @@ No requirements.
| Name | Version |
|------|---------|
| [aws](#provider\_aws) | 4.22.0 |
-| [tls](#provider\_tls) | 3.4.0 |
## Modules
@@ -30,7 +29,6 @@ No requirements.
|------|------|
| [aws_eks_cluster.cluster](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/eks_cluster) | data source |
| [aws_eks_cluster_auth.cluster](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/eks_cluster_auth) | data source |
-| [tls_certificate.cert](https://registry.terraform.io/providers/hashicorp/tls/latest/docs/data-sources/certificate) | data source |
## Inputs
diff --git a/examples/simple/main.tf b/examples/simple/main.tf
index 4d122d8..6e9c39c 100644
--- a/examples/simple/main.tf
+++ b/examples/simple/main.tf
@@ -10,13 +10,9 @@ data "aws_eks_cluster_auth" "cluster" {
name = var.cluster_id
}
-data "tls_certificate" "cert" {
- url = data.aws_eks_cluster.cluster.identity[0].oidc[0].issuer
-}
-
provider "kubernetes" {
host = data.aws_eks_cluster.cluster.endpoint
- cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority.0.data)
+ cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority[0].data)
token = data.aws_eks_cluster_auth.cluster.token
}
diff --git a/variables.tf b/variables.tf
index c9a4de6..7bd3a7f 100644
--- a/variables.tf
+++ b/variables.tf
@@ -18,7 +18,7 @@ variable "ebs_csi_driver_version" {
variable "ebs_csi_controller_image" {
description = "The EBS CSI driver controller's image"
- default = ""
+ default = "k8s.gcr.io/provider-aws/aws-ebs-csi-driver"
type = string
}