Update manifest tests, their dependencies and GH workflows (#2000)

Author: arybolovlev

.github/workflows/check_examples.yaml

@@ -21,7 +21,7 @@ jobs:
           - "1.0.11"
           - "1.1.9"
           - "1.2.9"
-          - "1.3.6"
+          - "1.3.8"
     env:
       TF_X_KUBERNETES_MANIFEST_RESOURCE: 1
       KUBE_CONFIG_PATH: "~/.kube/config"

.github/workflows/manifest_acc.yaml

@@ -1,4 +1,5 @@
-name: kubernetes_manifest acceptance tests
+name: Manifest acceptance tests
+
 on:
   push:
     branches:
@@ -10,23 +11,30 @@ on:
       - main
     paths:
       - "manifest/**/*.go"
+  workflow_dispatch:
+
 jobs:
   acceptance_tests:
     runs-on: ubuntu-latest
     strategy:
+      # Don't cancel all in-progress and queued jobs in the matrix if any job in the matrix fails.
+      # That will be helpful to catch any issues related to a particular Kubernetes version.
+      fail-fast: false
       matrix:
         kubernetes_version:
-          # NOTE exact sha for image is required for kind
-          - v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6
-          - v1.20.7@sha256:cbeaf907fc78ac97ce7b625e4bf0de16e3ea725daf6b04f930bd14c67c671ff9
-          # FIXME this is disabled for now as there is a regression in v1.19.11
-          # and there is no image available for the latest v1.19.x
-          # - v1.19.11@sha256:07db187ae84b4b7de440a73886f008cf903fcf5764ba8106a9fd5243d6f32729
+          # kind images: https://github.com/kubernetes-sigs/kind/releases
+          - v1.25.3@sha256:f52781bc0d7a19fb6c405c2af83abfeb311f130707a0e219175677e366cc45d1
+          - v1.24.7@sha256:577c630ce8e509131eab1aea12c022190978dd2f745aac5eb1fe65c0807eb315
+          - v1.23.13@sha256:ef453bb7c79f0e3caba88d2067d4196f427794086a7d0df8df4f019d5e336b61
         terraform_version:
-          - 1.3.6
+          - 1.3.8
           - 1.2.9
           - 1.1.9
           - 1.0.11
+        # BONUS: Run tests on the latest available Kubernetes(1.X) and Terraform(1.X) versions.
+        include:
+          - kubernetes_version: v1.26.0@sha256:691e24bd2417609db7e589e1a479b902d2e209892a10ce375fab60a8407c7352
+            terraform_version: 1.3.8
     steps:
       - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
       - name: Set up Go
@@ -35,7 +43,7 @@ jobs:
           go-version-file: 'go.mod'
       - uses: engineerd/setup-kind@aa272fe2a7309878ffc2a81c56cfe3ef108ae7d0 # v0.5.0
         with:
-          version: v0.11.1
+          version: v0.17.0
           image: kindest/node:${{ matrix.kubernetes_version }}
       - name: Build annotations webhook
         run: |

.github/workflows/manifest_unit.yaml

@@ -1,16 +1,18 @@
-name: Unit tests
+name: Manifest unit tests
+
 on:
   push:
     branches:
-      - master
       - main
     paths:
-      - "**.go"
+      - "manifest/**/*.go"
   pull_request:
     branches:
-      - master
+      - main
     paths:
-      - "**.go"
+      - "manifest/**/*.go"
+  workflow_dispatch:
+
 jobs:
   unit_tests:
     runs-on: ubuntu-latest

manifest/test/acceptance/cronjob_test.go

@@ -29,7 +29,7 @@ func TestKubernetesManifest_CronJob(t *testing.T) {
 	defer func() {
 		tf.Destroy(ctx)
 		tf.Close()
-		k8shelper.AssertNamespacedResourceDoesNotExist(t, "batch/v1beta1", "cronjobs", namespace, name)
+		k8shelper.AssertNamespacedResourceDoesNotExist(t, "batch/v1", "cronjobs", namespace, name)
 	}()
 
 	k8shelper.CreateNamespace(t, namespace)
@@ -44,7 +44,7 @@ func TestKubernetesManifest_CronJob(t *testing.T) {
 	tf.Init(ctx)
 	tf.Apply(ctx)
 
-	k8shelper.AssertNamespacedResourceExists(t, "batch/v1beta1", "cronjobs", namespace, name)
+	k8shelper.AssertNamespacedResourceExists(t, "batch/v1", "cronjobs", namespace, name)
 
 	s, err := tf.State(ctx)
 	if err != nil {

manifest/test/acceptance/hpa_test.go

@@ -30,7 +30,7 @@ func TestKubernetesManifest_HPA(t *testing.T) {
 		tf.Destroy(ctx)
 		tf.Close()
 		k8shelper.AssertNamespacedResourceDoesNotExist(t,
-			"autoscaling/v2beta2", "horizontalpodautoscalers", namespace, name)
+			"autoscaling/v2", "horizontalpodautoscalers", namespace, name)
 	}()
 
 	k8shelper.CreateNamespace(t, namespace)
@@ -46,7 +46,7 @@ func TestKubernetesManifest_HPA(t *testing.T) {
 	tf.Apply(ctx)
 
 	k8shelper.AssertNamespacedResourceExists(t,
-		"autoscaling/v2beta2", "horizontalpodautoscalers", namespace, name)
+		"autoscaling/v2", "horizontalpodautoscalers", namespace, name)
 
 	s, err := tf.State(ctx)
 	if err != nil {

manifest/test/acceptance/testdata/ComputedFields/webhook/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.17 AS builder
+FROM golang:1.19 AS builder
 WORKDIR /src/k8s-manifest-hook
 ADD *.go ./
 ADD go.* ./
@@ -7,4 +7,4 @@ RUN CGO_ENABLED=0 go build
 FROM alpine:latest
 COPY  --from=builder /src/k8s-manifest-hook/k8s-manifest-hook /k8s-manifest-hook
 VOLUME /etc/webhook/certs
-ENTRYPOINT /k8s-manifest-hook
+ENTRYPOINT /k8s-manifest-hook

manifest/test/acceptance/testdata/ComputedFields/webhook/go.mod

@@ -1,31 +1,32 @@
 module github.com/hashicorp/k8s-manifest-hook
 
-go 1.17
+go 1.19
 
 require (
-	github.com/sirupsen/logrus v1.8.1
-	github.com/slok/kubewebhook/v2 v2.1.0
-	k8s.io/api v0.22.1
-	k8s.io/apimachinery v0.22.1
+	github.com/sirupsen/logrus v1.9.0
+	github.com/slok/kubewebhook/v2 v2.5.0
+	k8s.io/apimachinery v0.25.5
 )
 
 require (
-	github.com/go-logr/logr v0.4.0 // indirect
+	github.com/go-logr/logr v1.2.3 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/google/go-cmp v0.5.5 // indirect
 	github.com/google/gofuzz v1.1.0 // indirect
-	github.com/json-iterator/go v1.1.11 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.1 // indirect
-	golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect
-	golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 // indirect
-	golang.org/x/text v0.3.6 // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 // indirect
+	golang.org/x/sys v0.3.0 // indirect
+	golang.org/x/text v0.5.0 // indirect
 	gomodules.xyz/jsonpatch/v3 v3.0.1 // indirect
 	gomodules.xyz/orderedmap v0.1.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	k8s.io/client-go v0.21.1 // indirect
-	k8s.io/klog/v2 v2.9.0 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
+	k8s.io/api v0.25.5 // indirect
+	k8s.io/client-go v0.25.3 // indirect
+	k8s.io/klog/v2 v2.70.1 // indirect
+	k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
+	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 	sigs.k8s.io/yaml v1.2.0 // indirect
 )