Skip to content

Commit c688893

Browse files
authored
Merge branch 'main' into fix-tolerations-in-templates
2 parents ac02d5c + 299de2f commit c688893

File tree

133 files changed

+1288
-1016
lines changed

Some content is hidden

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

133 files changed

+1288
-1016
lines changed

.changelog/2622.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
Add `sub_path_expr` to volume mount options pod spec
3+
```

.changelog/2699.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
Fixed goroutine-safety in the CRD and metadata cache, resulting in far fewer provider metadata requests.
3+
```

.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+
```

.changelog/2733.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
Fixes issue #2732 where the provider would fail when used with Terraform >= v1.12.1 due to missing `GetResourceIdentitySchemas` implementation.
3+
```

.changelog/2737.txt

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

.github/pull_request_template.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
<!-- heimdall_github_prtemplate:grc-pci_dss-2024-01-05 -->
2+
3+
## Rollback Plan
4+
5+
If a change needs to be reverted, we will publish an updated version of the library.
6+
7+
## Changes to Security Controls
8+
9+
Are there any changes to security controls (access controls, encryption, logging) in this pull request? If so, explain.
10+
11+
<!--- Please leave a helpful description of the changes to security controls here. --->
12+
13+
114
### Description
215

316
<!--- Please leave a helpful description of the pull request here. --->

.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' }}

0 commit comments

Comments
 (0)