Skip to content

Commit bf06d00

Browse files
3pings3pings
authored
Merge pull request #76 from 3pings/main
Removed version requirement in TFLint
2 parents b7a4195 + e031e86 commit bf06d00

File tree

10 files changed

+37
-34
lines changed

10 files changed

+37
-34
lines changed

‎.github/workflows/pre-commit.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# - name: pre-commit
2+
# uses: pre-commit/action@v2.0.3
3+
4+
5+
# on:
6+
# pull_request:
7+
# push:
8+
# branches: [master]
9+
10+
# jobs:
11+
# pre-commit:
12+
# runs-on: ubuntu-latest
13+
# steps:
14+
# - uses: actions/checkout@v2
15+
# - uses: actions/setup-python@v2
16+
# - uses: pre-commit/action@v2.0.3

‎.pre-commit-config.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ repos:
22
- repo: git://github.com/antonbabenko/pre-commit-terraform
33
rev: v1.45.0
44
hooks:
5-
- id: terraform_fmt
5+
- id: terraform_fmt
66
- id: terraform_docs
77
# - id: terraform_validate
8-
- id: terraform_tflint
8+
- id: terraform_tflint
9+
args:
10+
- --args=--disable-rule=terraform_module_version

‎README.md‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -269,21 +269,21 @@ variable "tags" {
269269

270270
| Name | Source | Version |
271271
|------|--------|---------|
272-
| <a name="module_addons"></a> [addons](#module\_addons) | terraform-cisco-modules/iks/intersight//modules/addon_policy | =2.0.3 |
273-
| <a name="module_cluster_addon_profile"></a> [cluster\_addon\_profile](#module\_cluster\_addon\_profile) | terraform-cisco-modules/iks/intersight//modules/cluster_addon_profile | =2.0.3 |
274-
| <a name="module_cluster_profile"></a> [cluster\_profile](#module\_cluster\_profile) | terraform-cisco-modules/iks/intersight//modules/cluster | =2.0.3 |
275-
| <a name="module_control_profile"></a> [control\_profile](#module\_control\_profile) | terraform-cisco-modules/iks/intersight//modules/node_profile | =2.0.3 |
276-
| <a name="module_control_provider"></a> [control\_provider](#module\_control\_provider) | terraform-cisco-modules/iks/intersight//modules/infra_provider | =2.0.3 |
277-
| <a name="module_infra_config_policy"></a> [infra\_config\_policy](#module\_infra\_config\_policy) | terraform-cisco-modules/iks/intersight//modules/infra_config_policy | =2.0.4 |
278-
| <a name="module_instance_type"></a> [instance\_type](#module\_instance\_type) | terraform-cisco-modules/iks/intersight//modules/worker_profile | =2.0.3 |
279-
| <a name="module_ip_pool_policy"></a> [ip\_pool\_policy](#module\_ip\_pool\_policy) | terraform-cisco-modules/iks/intersight//modules/ip_pool | =2.0.3 |
280-
| <a name="module_k8s_network"></a> [k8s\_network](#module\_k8s\_network) | terraform-cisco-modules/iks/intersight//modules/k8s_network | =2.0.3 |
281-
| <a name="module_k8s_sysconfig"></a> [k8s\_sysconfig](#module\_k8s\_sysconfig) | terraform-cisco-modules/iks/intersight//modules/k8s_sysconfig | =2.0.3 |
282-
| <a name="module_k8s_version"></a> [k8s\_version](#module\_k8s\_version) | terraform-cisco-modules/iks/intersight//modules/version | =2.0.3 |
283-
| <a name="module_runtime_policy"></a> [runtime\_policy](#module\_runtime\_policy) | terraform-cisco-modules/iks/intersight//modules/runtime_policy | =2.0.3 |
284-
| <a name="module_trusted_registry"></a> [trusted\_registry](#module\_trusted\_registry) | terraform-cisco-modules/iks/intersight//modules/trusted_registry | =2.0.3 |
285-
| <a name="module_worker_profile"></a> [worker\_profile](#module\_worker\_profile) | terraform-cisco-modules/iks/intersight//modules/node_profile | =2.0.3 |
286-
| <a name="module_worker_provider"></a> [worker\_provider](#module\_worker\_provider) | terraform-cisco-modules/iks/intersight//modules/infra_provider | =2.0.3 |
272+
| <a name="module_addons"></a> [addons](#module\_addons) | terraform-cisco-modules/iks/intersight//modules/addon_policy | n/a |
273+
| <a name="module_cluster_addon_profile"></a> [cluster\_addon\_profile](#module\_cluster\_addon\_profile) | terraform-cisco-modules/iks/intersight//modules/cluster_addon_profile | n/a |
274+
| <a name="module_cluster_profile"></a> [cluster\_profile](#module\_cluster\_profile) | terraform-cisco-modules/iks/intersight//modules/cluster | n/a |
275+
| <a name="module_control_profile"></a> [control\_profile](#module\_control\_profile) | terraform-cisco-modules/iks/intersight//modules/node_profile | n/a |
276+
| <a name="module_control_provider"></a> [control\_provider](#module\_control\_provider) | terraform-cisco-modules/iks/intersight//modules/infra_provider | n/a |
277+
| <a name="module_infra_config_policy"></a> [infra\_config\_policy](#module\_infra\_config\_policy) | terraform-cisco-modules/iks/intersight//modules/infra_config_policy | n/a |
278+
| <a name="module_instance_type"></a> [instance\_type](#module\_instance\_type) | terraform-cisco-modules/iks/intersight//modules/worker_profile | n/a |
279+
| <a name="module_ip_pool_policy"></a> [ip\_pool\_policy](#module\_ip\_pool\_policy) | terraform-cisco-modules/iks/intersight//modules/ip_pool | n/a |
280+
| <a name="module_k8s_network"></a> [k8s\_network](#module\_k8s\_network) | terraform-cisco-modules/iks/intersight//modules/k8s_network | n/a |
281+
| <a name="module_k8s_sysconfig"></a> [k8s\_sysconfig](#module\_k8s\_sysconfig) | terraform-cisco-modules/iks/intersight//modules/k8s_sysconfig | n/a |
282+
| <a name="module_k8s_version"></a> [k8s\_version](#module\_k8s\_version) | terraform-cisco-modules/iks/intersight//modules/version | n/a |
283+
| <a name="module_runtime_policy"></a> [runtime\_policy](#module\_runtime\_policy) | terraform-cisco-modules/iks/intersight//modules/runtime_policy | n/a |
284+
| <a name="module_trusted_registry"></a> [trusted\_registry](#module\_trusted\_registry) | terraform-cisco-modules/iks/intersight//modules/trusted_registry | n/a |
285+
| <a name="module_worker_profile"></a> [worker\_profile](#module\_worker\_profile) | terraform-cisco-modules/iks/intersight//modules/node_profile | n/a |
286+
| <a name="module_worker_provider"></a> [worker\_provider](#module\_worker\_provider) | terraform-cisco-modules/iks/intersight//modules/infra_provider | n/a |
287287

288288
## Resources
289289

examples/complete/README.md renamed to examples/complete_cluster_deployment/README.md

File renamed without changes.

examples/complete/main.tf renamed to examples/complete_cluster_deployment/main.tf

File renamed without changes.

examples/complete/output.tf renamed to examples/complete_cluster_deployment/output.tf

File renamed without changes.

examples/complete/terraform.tfvars.sample renamed to examples/complete_cluster_deployment/terraform.tfvars.sample

File renamed without changes.

examples/complete/variables.tf renamed to examples/complete_cluster_deployment/variables.tf

File renamed without changes.

examples/complete/versions.tf renamed to examples/complete_cluster_deployment/versions.tf

File renamed without changes.

‎main.tf‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@ data "intersight_kubernetes_virtual_machine_instance_type" "this" {
3434
}
3535

3636
module "infra_config_policy" {
37-
source = "terraform-cisco-modules/iks/intersight//modules/infra_config_policy"
38-
version = "=2.0.4"
39-
count = var.infraConfigPolicy.use_existing == true ? 0 : 1
37+
source = "terraform-cisco-modules/iks/intersight//modules/infra_config_policy"
38+
count = var.infraConfigPolicy.use_existing == true ? 0 : 1
4039
vmConfig = {
4140
platformType = var.infraConfigPolicy.platformType
4241
targetName = var.infraConfigPolicy.targetName
@@ -56,7 +55,6 @@ module "infra_config_policy" {
5655
module "ip_pool_policy" {
5756
count = var.ip_pool.use_existing == true ? 0 : 1
5857
source = "terraform-cisco-modules/iks/intersight//modules/ip_pool"
59-
version = "=2.0.3"
6058
name = var.ip_pool.name
6159
starting_address = var.ip_pool.ip_starting_address
6260
pool_size = var.ip_pool.ip_pool_size
@@ -69,7 +67,6 @@ module "ip_pool_policy" {
6967
}
7068
module "k8s_network" {
7169
source = "terraform-cisco-modules/iks/intersight//modules/k8s_network"
72-
version = "=2.0.3"
7370
count = var.k8s_network.use_existing == true ? 0 : 1
7471
policy_name = var.k8s_network.name
7572
pod_cidr = var.k8s_network.pod_cidr
@@ -80,7 +77,6 @@ module "k8s_network" {
8077
}
8178
module "k8s_sysconfig" {
8279
source = "terraform-cisco-modules/iks/intersight//modules/k8s_sysconfig"
83-
version = "=2.0.3"
8480
count = var.sysconfig.use_existing == true ? 0 : 1
8581
policy_name = var.sysconfig.name
8682
dns_servers = var.sysconfig.dns_servers
@@ -92,7 +88,6 @@ module "k8s_sysconfig" {
9288
}
9389
module "trusted_registry" {
9490
source = "terraform-cisco-modules/iks/intersight//modules/trusted_registry"
95-
version = "=2.0.3"
9691
count = var.tr_policy.create_new == true ? 1 : 0
9792
policy_name = var.tr_policy.name
9893
unsigned_registries = var.tr_policy.unsigned_registries
@@ -102,7 +97,6 @@ module "trusted_registry" {
10297
}
10398
module "runtime_policy" {
10499
source = "terraform-cisco-modules/iks/intersight//modules/runtime_policy"
105-
version = "=2.0.3"
106100
count = var.runtime_policy.create_new == true ? 1 : 0
107101
name = var.runtime_policy.name
108102
proxy_http_hostname = var.runtime_policy.http_proxy_hostname
@@ -121,7 +115,6 @@ module "runtime_policy" {
121115
}
122116
module "k8s_version" {
123117
source = "terraform-cisco-modules/iks/intersight//modules/version"
124-
version = "=2.0.3"
125118
count = var.version_policy.use_existing == true ? 0 : 1
126119
k8s_version = var.version_policy.version
127120
k8s_version_name = var.version_policy.name
@@ -130,7 +123,6 @@ module "k8s_version" {
130123
}
131124
module "instance_type" {
132125
source = "terraform-cisco-modules/iks/intersight//modules/worker_profile"
133-
version = "=2.0.3"
134126
count = var.instance_type.use_existing == true ? 0 : 1
135127
name = var.instance_type.name
136128
cpu = var.instance_type.cpu
@@ -141,7 +133,6 @@ module "instance_type" {
141133
}
142134
module "cluster_profile" {
143135
source = "terraform-cisco-modules/iks/intersight//modules/cluster"
144-
version = "=2.0.3"
145136
name = var.cluster.name
146137
action = var.cluster.action
147138
wait_for_completion = var.cluster.wait_for_completion
@@ -173,15 +164,13 @@ module "cluster_profile" {
173164
module "addons" {
174165

175166
source = "terraform-cisco-modules/iks/intersight//modules/addon_policy"
176-
version = "=2.0.3"
177167
addons = var.addons_list
178168
org_name = var.organization
179169
tags = var.tags
180170
}
181171
module "cluster_addon_profile" {
182172

183173
source = "terraform-cisco-modules/iks/intersight//modules/cluster_addon_profile"
184-
version = "=2.0.3"
185174
count = var.addons_list != null ? 1 : 0
186175
depends_on = [module.addons]
187176
profile_name = "${var.cluster.name}-addon-profile"
@@ -193,7 +182,6 @@ module "cluster_addon_profile" {
193182
}
194183
module "control_profile" {
195184
source = "terraform-cisco-modules/iks/intersight//modules/node_profile"
196-
version = "=2.0.3"
197185
name = "${var.cluster.name}-control_profile"
198186
profile_type = "ControlPlane"
199187
min_size = var.cluster.control_nodes
@@ -205,7 +193,6 @@ module "control_profile" {
205193
}
206194
module "worker_profile" {
207195
source = "terraform-cisco-modules/iks/intersight//modules/node_profile"
208-
version = "=2.0.3"
209196
name = "${var.cluster.name}-worker_profile"
210197
profile_type = "Worker"
211198
min_size = var.cluster.worker_nodes
@@ -217,7 +204,6 @@ module "worker_profile" {
217204
}
218205
module "control_provider" {
219206
source = "terraform-cisco-modules/iks/intersight//modules/infra_provider"
220-
version = "=2.0.3"
221207
name = "${var.cluster.name}-control_provider"
222208
instance_type_moid = var.instance_type.use_existing == true ? data.intersight_kubernetes_virtual_machine_instance_type.this.0.results.0.moid : module.instance_type.0.moid
223209
node_group_moid = module.control_profile.node_group_profile_moid
@@ -226,7 +212,6 @@ module "control_provider" {
226212
}
227213
module "worker_provider" {
228214
source = "terraform-cisco-modules/iks/intersight//modules/infra_provider"
229-
version = "=2.0.3"
230215
name = "${var.cluster.name}-worker_provider"
231216
instance_type_moid = var.instance_type.use_existing == true ? data.intersight_kubernetes_virtual_machine_instance_type.this.0.results.0.moid : module.instance_type.0.moid
232217
node_group_moid = module.worker_profile.node_group_profile_moid

0 commit comments

Comments
 (0)