Skip to content

Commit 59a6aa5

Browse files
Merge branch 'main' into deprecate-unversioned-resources
2 parents f1feeb0 + 83324e7 commit 59a6aa5

36 files changed

+456
-1906
lines changed

.changelog/2774.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
Bump Kubernetes dependencies to v1.33
3+
```

.changelog/2784.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 `ip_mode` attribute to service status
3+
```

.changelog/2786.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 support for sidecar containers via restart_policy field in init_container spec
3+
````
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
name: Acceptance Tests (kind)
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
kindVersion:
7+
description: The kind version
8+
default: 0.20.0
9+
runTests:
10+
description: The regex passed to the -run option of `go test`
11+
default: "^TestAcc"
12+
terraformVersion:
13+
description: Terraform version
14+
default: 1.12.0
15+
parallelRuns:
16+
description: The maximum number of tests to run simultaneously
17+
default: 8
18+
schedule:
19+
- cron: '0 21 * * *'
20+
21+
env:
22+
KUBECONFIG: ${{ github.workspace }}/.kube/config
23+
KIND_VERSION: ${{ github.event.inputs.kindVersion || '0.30.0' }}
24+
PARALLEL_RUNS: ${{ github.event.inputs.parallelRuns || '8' }}
25+
TERRAFORM_VERSION: ${{ github.event.inputs.terraformVersion || '1.12.0' }}
26+
27+
jobs:
28+
acceptance_tests_kind:
29+
if: ${{ github.repository_owner == 'hashicorp' }}
30+
runs-on: custom-linux-large
31+
steps:
32+
- name: Checkout repository
33+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
34+
- name: Set up Go
35+
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
36+
with:
37+
go-version-file: 'go.mod'
38+
- name: Install Terraform From Source
39+
run: |
40+
git clone https://github.com/hashicorp/terraform.git
41+
cd terraform
42+
git switch main
43+
go build -o terraform
44+
mv terraform /usr/bin/terraform
45+
- name: Setup kind
46+
uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0
47+
with:
48+
wait: 2m
49+
version: v${{ env.KIND_VERSION }}
50+
node_image: kindest/node:v1.34.0@sha256:7416a61b42b1662ca6ca89f02028ac133a309a2a30ba309614e8ec94d976dc5a
51+
config: .github/config/acceptance_tests_kind_config.yaml
52+
- name: Run Acceptance Test Suite
53+
env:
54+
KUBE_CONFIG_PATH: ${{ env.KUBECONFIG }}
55+
TESTARGS: -run ${{ github.event.inputs.runTests || '^TestAcc' }}
56+
# Do not set TF_ACC_TERRAFORM_PATH or TF_ACC_TERRAFORM_VERSION.
57+
# In this case, the framework will search for the Terraform CLI binary based on the operating system PATH.
58+
# Eventually, it will use the one we set up.
59+
# More information: https://developer.hashicorp.com/terraform/plugin/sdkv2/testing/acceptance-tests#terraform-cli-installation-behaviors
60+
run: |
61+
make testacc
62+
make frameworkacc

.github/workflows/acceptance_tests_kind.yaml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,25 @@ on:
2727

2828
env:
2929
KUBECONFIG: ${{ github.workspace }}/.kube/config
30-
KIND_VERSION: ${{ github.event.inputs.kindVersion || '0.25.0' }}
30+
KIND_VERSION: ${{ github.event.inputs.kindVersion || '0.30.0' }}
3131
PARALLEL_RUNS: ${{ github.event.inputs.parallelRuns || '8' }}
3232
TERRAFORM_VERSION: ${{ github.event.inputs.terraformVersion || '1.12.0' }}
3333

3434
jobs:
3535
acceptance_tests_kind:
3636
if: ${{ github.repository_owner == 'hashicorp' }}
37-
runs-on: custom-linux-medium
37+
runs-on: custom-linux-large
3838
strategy:
3939
# Don't cancel all in-progress and queued jobs in the matrix if any job in the matrix fails.
4040
# That will be helpful to catch any issues related to a particular Kubernetes version.
4141
fail-fast: false
4242
matrix:
4343
kubernetes_version:
4444
# kind images: https://github.com/kubernetes-sigs/kind/releases (note the images are kind release specific)
45-
- v1.30.6@sha256:b6d08db72079ba5ae1f4a88a09025c0a904af3b52387643c285442afb05ab994
46-
- v1.29.10@sha256:3b2d8c31753e6c8069d4fc4517264cd20e86fd36220671fb7d0a5855103aa84b
47-
- v1.28.15@sha256:a7c05c7ae043a0b8c818f5a06188bc2c4098f6cb59ca7d1856df00375d839251
48-
- v1.27.16@sha256:2d21a61643eafc439905e18705b8186f3296384750a835ad7a005dceb9546d20
49-
- v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb
50-
- v1.26.15@sha256:c79602a44b4056d7e48dc20f7504350f1e87530fe953428b792def00bc1076dd
45+
- v1.34.0@sha256:7416a61b42b1662ca6ca89f02028ac133a309a2a30ba309614e8ec94d976dc5a
46+
- v1.33.4@sha256:25a6018e48dfcaee478f4a59af81157a437f15e6e140bf103f85a2e7cd0cbbf2
47+
- v1.32.8@sha256:abd489f042d2b644e2d033f5c2d900bc707798d075e8186cb65e3f1367a9d5a1
48+
- v1.31.12@sha256:0f5cc49c5e73c0c2bb6e2df56e7df189240d83cf94edfa30946482eb08ec57d2
5149
isMajorReleaseBranch:
5250
- ${{ contains(github.ref, 'v3-major-release') }}
5351
isBaseMajorRelease:
@@ -74,7 +72,7 @@ jobs:
7472
terraform_version: ${{ env.TERRAFORM_VERSION }}
7573
terraform_wrapper: false
7674
- name: Setup kind
77-
uses: helm/kind-action@99576bfa6ddf9a8e612d83b513da5a75875caced # v1.9.0
75+
uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0
7876
with:
7977
wait: 2m
8078
version: v${{ env.KIND_VERSION }}

docs/data-sources/pod_v1.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -868,6 +868,7 @@ Read-Only:
868868
- `tty` (Boolean)
869869
- `volume_mount` (List of Object) (see [below for nested schema](#nestedobjatt--spec--init_container--volume_mount))
870870
- `working_dir` (String)
871+
- `restart_policy` (String)
871872

872873
<a id="nestedobjatt--spec--init_container--env"></a>
873874
### Nested Schema for `spec.init_container.env`

docs/resources/daemon_set_v1.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -978,6 +978,8 @@ Optional:
978978
- `volume_mount` (Block List) Pod volumes to mount into the container's filesystem. Cannot be updated. (see [below for nested schema](#nestedblock--spec--template--spec--init_container--volume_mount))
979979
- `volume_device` (Block List) Raw volume devices to attach into the container's filesystem as raw block devices. Cannot be updated. More info: https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#volumes-1 (see [below for nested schema](#nestedblock--spec--template--spec--init_container--volume_device))
980980
- `working_dir` (String) Container's working directory. If not specified, the container runtime's default will be used, which might be configured in the container image. Cannot be updated.
981+
- `restart_policy` (String) Restart policy for designating init container as a sidecar. Can only be `Always`. More info: https://kubernetes.io/docs/concepts/workloads/pods/sidecar-containers/#pod-sidecar-containers.
982+
981983

982984
<a id="nestedblock--spec--template--spec--init_container--env"></a>
983985
### Nested Schema for `spec.template.spec.init_container.env`

docs/resources/deployment_v1.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -986,6 +986,8 @@ Optional:
986986
- `volume_mount` (Block List) Pod volumes to mount into the container's filesystem. Cannot be updated. (see [below for nested schema](#nestedblock--spec--template--spec--init_container--volume_mount))
987987
- `volume_device` (Block List) Raw volume devices to attach into the container's filesystem as raw block devices. Cannot be updated. More info: https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#volumes-1 (see [below for nested schema](#nestedblock--spec--template--spec--init_container--volume_device))
988988
- `working_dir` (String) Container's working directory. If not specified, the container runtime's default will be used, which might be configured in the container image. Cannot be updated.
989+
- `restart_policy` (String) Restart policy for designating init container as a sidecar. Can only be `Always`. More info: https://kubernetes.io/docs/concepts/workloads/pods/sidecar-containers/#pod-sidecar-containers.
990+
989991

990992
<a id="nestedblock--spec--template--spec--init_container--env"></a>
991993
### Nested Schema for `spec.template.spec.init_container.env`

docs/resources/pod_v1.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,7 @@ Optional:
375375
- `volume_device` (Block List) Raw volume devices to attach into the container's filesystem as raw block devices. Cannot be updated. More info: https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#volumes-1 (see [below for nested schema](#nestedblock--spec--container--volume_device))
376376
- `working_dir` (String) Container's working directory. If not specified, the container runtime's default will be used, which might be configured in the container image. Cannot be updated.
377377

378+
378379
<a id="nestedblock--spec--container--env"></a>
379380
### Nested Schema for `spec.container.env`
380381

@@ -936,6 +937,7 @@ Optional:
936937
- `volume_mount` (Block List) Pod volumes to mount into the container's filesystem. Cannot be updated. (see [below for nested schema](#nestedblock--spec--init_container--volume_mount))
937938
- `volume_device` (Block List) Raw volume devices to attach into the container's filesystem as raw block devices. Cannot be updated. More info: https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#volumes-1 (see [below for nested schema](#nestedblock--spec--init_container--volume_device))
938939
- `working_dir` (String) Container's working directory. If not specified, the container runtime's default will be used, which might be configured in the container image. Cannot be updated.
940+
- `restart_policy` (String) Restart policy for designating init container as a sidecar. Can only be `Always`. More info: https://kubernetes.io/docs/concepts/workloads/pods/sidecar-containers/#pod-sidecar-containers.
939941

940942
<a id="nestedblock--spec--init_container--env"></a>
941943
### Nested Schema for `spec.init_container.env`

docs/resources/service_v1.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ Read-Only:
132132

133133
- `hostname` (String)
134134
- `ip` (String)
135-
135+
- `ip_mode` (String)
136136

137137

138138

0 commit comments

Comments
 (0)