try harder

Signed-off-by: Ville Aikas <vaikas@chainguard.dev>
sigstore · Mar 25, 2022 · f0f591f · f0f591f
1 parent a54e03a
commit f0f591f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 30 deletions.
diff --git a/.github/workflows/kind-cluster-image-policy.yaml b/.github/workflows/kind-cluster-image-policy.yaml
@@ -70,17 +70,8 @@ jobs:
     - name: Install knative
       uses: chainguard-dev/actions/setup-knative@main
       with:
-        version: 1.2.0
-        serving-features: >
-          {
-            "kubernetes.podspec-fieldref": "enabled",
-            "kubernetes.podspec-securitycontext": "enabled"
-          }
-        serving-autoscaler: >
-          {
-            "min-scale": "1",
-            "max-scale": "1"
-          }
+        serving-features: '{"kubernetes.podspec-fieldref":"enabled", "kubernetes.podspec-volumes-emptydir":"enabled", "kubernetes.podspec-init-containers": "enabled", "kubernetes.podspec-securitycontext":"enabled"}'
+        serving-autoscaler: '{"min-scale":"1","max-scale":"1"}'
 
     - name: Setup mirror
       uses: chainguard-dev/actions/setup-mirror@main

diff --git a/.github/workflows/kind-e2e-cosigned.yaml b/.github/workflows/kind-e2e-cosigned.yaml
@@ -33,23 +33,6 @@ jobs:
         - v1.22.x
         - v1.23.x
 
-        include:
-          # Map between K8s and KinD versions.
-          # This is attempting to make it a bit clearer what's being tested.
-          # See: https://github.com/kubernetes-sigs/kind/releases
-        - k8s-version: v1.21.x
-          kind-version: 0.11.1
-          kind-image-sha: sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6
-          cluster-suffix: c${{ github.run_id }}.local
-        - k8s-version: v1.22.x
-          kind-version: 0.11.1
-          kind-image-sha: sha256:ca3587e6e545a96c07bf82e2c46503d9ef86fc704f44c17577fca7bcabf5f978
-          cluster-suffix: c${{ github.run_id }}.local
-        - k8s-version: v1.23.x
-          kind-version: 0.11.1
-          kind-image-sha: sha256:2f93d3c7b12a3e93e6c1f34f331415e105979961fcddbe69a4e3ab5a93ccbb35
-          cluster-suffix: c${{ github.run_id }}.local
-
     env:
       # https://github.com/google/go-containerregistry/pull/125 allows insecure registry for
       # '*.local' hostnames.
@@ -78,8 +61,7 @@ jobs:
       uses: chainguard-dev/actions/setup-kind@main
       with:
         k8s-version: ${{ matrix.k8s-version }}
-        cluster-suffix: ${{ matrix.cluster-suffix }}
-        kind-version: ${{ matrix.kind-version }}
+        cluster-suffix: c${{ github.run_id }}.local
 
     - name: Setup mirror
       uses: chainguard-dev/actions/setup-mirror@main