Skip to content

Commit 9d63698

Browse files
authored
Add support for ResourceIdentity to "kubernetes_config_map_v1" (#2721)
1 parent 7933dc4 commit 9d63698

File tree

87 files changed

+478
-727
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+478
-727
lines changed

.changelog/2721.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
`kubernetes_config_map_v1`: Add support for ResourceIdentity
3+
```

.github/workflows/acceptance_test_dfa.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
inputs:
1414
terraformVersion:
1515
description: Terraform version
16-
default: 1.11.2
16+
default: v1.12.0-alpha20250312
1717

1818
jobs:
1919
acceptance_tests:
@@ -29,6 +29,6 @@ jobs:
2929
- name: Run Tests
3030
env:
3131
TF_ACC: 1
32-
TF_ACC_TERRAFORM_VERSION: ${{ github.event.inputs.terraformVersion || '1.11.2' }}
32+
TF_ACC_TERRAFORM_VERSION: ${{ github.event.inputs.terraformVersion || 'v1.12.0-alpha20250312' }}
3333
run: |
3434
go test -v -run '^TestAccKubernetesDeferredActions' ./kubernetes/test-dfa

.github/workflows/acceptance_tests_aks.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
default: "1.27"
1818
terraformVersion:
1919
description: Terraform version
20-
default: 1.11.2
20+
default: 1.12.0
2121
runTests:
2222
description: The regex passed to the -run option of `go test`
2323
default: "^TestAcc"
@@ -29,7 +29,7 @@ on:
2929

3030
env:
3131
KUBE_CONFIG_PATH: ${{ github.workspace }}/kubernetes/test-infra/aks/kubeconfig
32-
TERRAFORM_VERSION: ${{ github.event.inputs.terraformVersion || '1.11.2' }}
32+
TERRAFORM_VERSION: ${{ github.event.inputs.terraformVersion || '1.12.0' }}
3333
PARALLEL_RUNS: ${{ github.event.inputs.parallelRuns || '8' }}
3434
TF_VAR_location: ${{ github.event.inputs.location || 'canadaeast' }}
3535
TF_VAR_node_count: ${{ github.event.inputs.nodeCount || '2' }}

.github/workflows/acceptance_tests_eks.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ on:
2626
default: "^TestAcc"
2727
terraformVersion:
2828
description: Terraform version
29-
default: 1.11.2
29+
default: 1.12.0
3030
schedule:
3131
- cron: '0 20 * * *'
3232

3333
env:
3434
AWS_REGION: ${{ github.event.inputs.region || 'ca-central-1' }}
3535
KUBE_CONFIG_PATH: ${{ github.workspace }}/kubernetes/test-infra/eks/kubeconfig
3636
PARALLEL_RUNS: ${{ github.event.inputs.parallelRuns || '8' }}
37-
TERRAFORM_VERSION: ${{ github.event.inputs.terraformVersion || '1.11.2' }}
37+
TERRAFORM_VERSION: ${{ github.event.inputs.terraformVersion || '1.12.0' }}
3838
TF_VAR_az_span: ${{ github.event.inputs.azSpan || '2' }}
3939
TF_VAR_capacity_type: ${{ 'SPOT' }}
4040
TF_VAR_cluster_version: ${{ github.event.inputs.clusterVersion || '1.29' }}

.github/workflows/acceptance_tests_gke.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ on:
2626
default: "^TestAcc"
2727
terraformVersion:
2828
description: Terraform version
29-
default: 1.11.2
29+
default: 1.12.0
3030
schedule:
3131
- cron: '0 23 * * *'
3232

@@ -37,7 +37,7 @@ env:
3737
USE_GKE_GCLOUD_AUTH_PLUGIN: True
3838
KUBE_CONFIG_PATH: ${{ github.workspace }}/kubernetes/test-infra/gke/kubeconfig
3939
PARALLEL_RUNS: ${{ github.event.inputs.parallelRuns || '8' }}
40-
TERRAFORM_VERSION: ${{ github.event.inputs.terraformVersion || '1.11.2' }}
40+
TERRAFORM_VERSION: ${{ github.event.inputs.terraformVersion || '1.12.0' }}
4141
TF_VAR_cluster_version: ${{ github.event.inputs.clusterVersion || '1.29' }}
4242
TF_VAR_node_count: ${{ github.event.inputs.nodeCount || '1' }}
4343
TF_VAR_instance_type: ${{ github.event.inputs.instanceType || 'e2-standard-2' }}

.github/workflows/acceptance_tests_kind.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
default: "^TestAcc"
1212
terraformVersion:
1313
description: Terraform version
14-
default: 1.11.2
14+
default: 1.12.0
1515
parallelRuns:
1616
description: The maximum number of tests to run simultaneously
1717
default: 8
@@ -29,7 +29,7 @@ env:
2929
KUBECONFIG: ${{ github.workspace }}/.kube/config
3030
KIND_VERSION: ${{ github.event.inputs.kindVersion || '0.25.0' }}
3131
PARALLEL_RUNS: ${{ github.event.inputs.parallelRuns || '8' }}
32-
TERRAFORM_VERSION: ${{ github.event.inputs.terraformVersion || '1.11.2' }}
32+
TERRAFORM_VERSION: ${{ github.event.inputs.terraformVersion || '1.12.0' }}
3333

3434
jobs:
3535
acceptance_tests_kind:

.github/workflows/golangci-lint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ jobs:
2323
- name: golangci-lint
2424
uses: golangci/golangci-lint-action@82d40c283aeb1f2b6595839195e95c2d6a49081b # v5.0.0
2525
with:
26-
version: 'v1.55.2'
26+
version: 'v1.64.2'
2727
skip-pkg-cache: true

.github/workflows/manifest_acc.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ jobs:
5050
isBaseMajorRelease: true
5151
kubernetes_version: v1.31.4@sha256:2cb39f7295fe7eafee0842b1052a599a4fb0f8bcf3f83d96c7f4864c357c6c30
5252
terraform_version:
53+
- 1.12.0
5354
- 1.11.2
5455
- 1.10.5
5556
- 1.9.8

go.mod

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,27 @@ go 1.24.1
55
require (
66
github.com/Masterminds/semver v1.5.0
77
github.com/getkin/kin-openapi v0.111.0
8-
github.com/google/go-cmp v0.6.0
8+
github.com/google/go-cmp v0.7.0
99
github.com/hashicorp/go-hclog v1.6.3
10-
github.com/hashicorp/go-plugin v1.6.2
10+
github.com/hashicorp/go-plugin v1.6.3
1111
github.com/hashicorp/go-version v1.7.0
12-
github.com/hashicorp/hc-install v0.9.1
12+
github.com/hashicorp/hc-install v0.9.2
1313
github.com/hashicorp/hcl/v2 v2.23.0
14-
github.com/hashicorp/terraform-exec v0.22.0
15-
github.com/hashicorp/terraform-json v0.24.0
14+
github.com/hashicorp/terraform-exec v0.23.0
15+
github.com/hashicorp/terraform-json v0.25.0
1616
github.com/hashicorp/terraform-plugin-docs v0.16.0
1717
github.com/hashicorp/terraform-plugin-framework v1.13.0
18-
github.com/hashicorp/terraform-plugin-go v0.26.0
18+
github.com/hashicorp/terraform-plugin-go v0.27.0
1919
github.com/hashicorp/terraform-plugin-log v0.9.0
20-
github.com/hashicorp/terraform-plugin-mux v0.17.0
21-
github.com/hashicorp/terraform-plugin-sdk/v2 v2.36.0
22-
github.com/hashicorp/terraform-plugin-testing v1.11.0
20+
github.com/hashicorp/terraform-plugin-mux v0.19.0
21+
github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0
22+
github.com/hashicorp/terraform-plugin-testing v1.13.0
2323
github.com/jinzhu/copier v0.3.5
2424
github.com/mitchellh/go-homedir v1.1.0
2525
github.com/mitchellh/hashstructure v1.1.0
2626
github.com/robfig/cron v1.2.0
2727
github.com/stretchr/testify v1.8.3
28-
golang.org/x/mod v0.22.0
28+
golang.org/x/mod v0.24.0
2929
k8s.io/api v0.28.6
3030
k8s.io/apiextensions-apiserver v0.28.6
3131
k8s.io/apimachinery v0.28.6
@@ -40,11 +40,11 @@ require (
4040
github.com/Masterminds/goutils v1.1.1 // indirect
4141
github.com/Masterminds/semver/v3 v3.2.0 // indirect
4242
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
43-
github.com/ProtonMail/go-crypto v1.1.3 // indirect
43+
github.com/ProtonMail/go-crypto v1.1.6 // indirect
4444
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
4545
github.com/armon/go-radix v1.0.0 // indirect
4646
github.com/bgentry/speakeasy v0.1.0 // indirect
47-
github.com/cloudflare/circl v1.3.7 // indirect
47+
github.com/cloudflare/circl v1.6.0 // indirect
4848
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
4949
github.com/google/gnostic-models v0.6.8 // indirect
5050
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
@@ -60,9 +60,9 @@ require (
6060
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
6161
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
6262
golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819 // indirect
63-
golang.org/x/sync v0.11.0 // indirect
63+
golang.org/x/sync v0.14.0 // indirect
6464
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
65-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
65+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
6666
)
6767

6868
require (
@@ -90,11 +90,11 @@ require (
9090
github.com/hashicorp/errwrap v1.1.0 // indirect
9191
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
9292
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
93-
github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
93+
github.com/hashicorp/go-cty v1.5.0
9494
github.com/hashicorp/go-multierror v1.1.1 // indirect
9595
github.com/hashicorp/go-uuid v1.0.3 // indirect
9696
github.com/hashicorp/logutils v1.0.0 // indirect
97-
github.com/hashicorp/terraform-registry-address v0.2.4 // indirect
97+
github.com/hashicorp/terraform-registry-address v0.2.5 // indirect
9898
github.com/hashicorp/terraform-svchost v0.1.1 // indirect
9999
github.com/hashicorp/yamux v0.1.1 // indirect
100100
github.com/imdario/mergo v0.3.15 // indirect
@@ -126,16 +126,16 @@ require (
126126
github.com/xlab/treeprint v1.2.0 // indirect
127127
github.com/zclconf/go-cty v1.16.2
128128
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
129-
golang.org/x/crypto v0.35.0 // indirect
130-
golang.org/x/net v0.36.0 // indirect
131-
golang.org/x/oauth2 v0.23.0 // indirect
132-
golang.org/x/sys v0.30.0 // indirect
133-
golang.org/x/term v0.29.0 // indirect
134-
golang.org/x/text v0.22.0 // indirect
129+
golang.org/x/crypto v0.38.0 // indirect
130+
golang.org/x/net v0.39.0 // indirect
131+
golang.org/x/oauth2 v0.26.0 // indirect
132+
golang.org/x/sys v0.33.0 // indirect
133+
golang.org/x/term v0.32.0 // indirect
134+
golang.org/x/text v0.25.0 // indirect
135135
golang.org/x/time v0.3.0 // indirect
136136
google.golang.org/appengine v1.6.8 // indirect
137-
google.golang.org/grpc v1.69.4
138-
google.golang.org/protobuf v1.36.3 // indirect
137+
google.golang.org/grpc v1.72.1
138+
google.golang.org/protobuf v1.36.6 // indirect
139139
gopkg.in/inf.v0 v0.9.1 // indirect
140140
gopkg.in/yaml.v2 v2.4.0 // indirect
141141
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)