Skip to content

Commit 2303aea

Browse files
jrhoustonalexsomesan
authored andcommitted
Add build matrix for multiple k8s versions
1 parent 98b61f5 commit 2303aea

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

.github/workflows/manifest_acc.yaml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,17 @@ jobs:
1515
runs-on: ubuntu-latest
1616
strategy:
1717
matrix:
18+
kubernetes_version:
19+
# NOTE exact sha for image is required for kind
20+
- v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6
21+
- v1.20.7@sha256:cbeaf907fc78ac97ce7b625e4bf0de16e3ea725daf6b04f930bd14c67c671ff9
22+
# FIXME this is disabled for now as there is a regression in v1.19.11
23+
# and there is no image available for the latest v1.19.x
24+
# - v1.19.11@sha256:07db187ae84b4b7de440a73886f008cf903fcf5764ba8106a9fd5243d6f32729
1825
terraform_version:
19-
- "0.14.10"
20-
- "0.15.5"
21-
- "1.0.3"
26+
- 1.0.8
27+
- 0.15.5
28+
- 0.14.11
2229
steps:
2330
- uses: actions/checkout@v2
2431
- name: Read go-version
@@ -32,7 +39,8 @@ jobs:
3239
go-version: ${{ steps.go-version.outputs.content }}
3340
- uses: engineerd/[email protected]
3441
with:
35-
version: "v0.11.1"
42+
version: v0.11.1
43+
image: kindest/node:${{ matrix.kubernetes_version }}
3644
- name: Build annotations webhook
3745
run: |
3846
docker build --rm -t tf-k8s-acc-webhook ./manifest/test/acceptance/testdata/ComputedFields/webhook/

manifest/test/acceptance/wait_for_test.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
package acceptance
44

55
import (
6-
"os"
76
"testing"
87
"time"
98

@@ -12,10 +11,6 @@ import (
1211
)
1312

1413
func TestKubernetesManifest_WaitForFields_Pod(t *testing.T) {
15-
if os.Getenv("GITHUB_ACTIONS") == "true" {
16-
t.Skip("skipping this test for now as it is broken inside GitHub actions") // FIXME
17-
}
18-
1914
name := randName()
2015
namespace := randName()
2116

0 commit comments

Comments
 (0)