From c23a8108f88f4fbd0dcd75f8cb3a5e795291d947 Mon Sep 17 00:00:00 2001
From: Diego Alvarez <diego.alvarez@shopify.com>
Date: Wed, 28 Sep 2022 14:39:32 -0700
Subject: [PATCH] Validate better understanding of action matrix

---
 .github/workflows/ci.yml | 69 ++++++++++++----------------------------
 dev.yml                  |  2 +-
 2 files changed, 22 insertions(+), 49 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 715e239d2..b70de97ef 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,75 +6,48 @@ jobs:
   ruby-tests:
     runs-on: ubuntu-latest
 
-    name: "Tests - Ruby ${{ matrix.ruby }} with k8s ${{ matrix.kubernetes_version }}"
+    name: "Tests - Ruby ${{ matrix.ruby }} with Kubernetes ${{ matrix.kubernetes_version }}"
     strategy:
       fail-fast: false
       matrix:
         ruby:
-        # Use unique Ruby versions, or GitHub gets confused when building the rest of the matrix
-        - '3.1.2' # With k8s 1.24
-        - '3.0.4' # With k8s 1.23
-        - '2.7.6' # With k8s 1.22
+          # Use unique Ruby versions, or GitHub gets confused when building the rest of the matrix
+          - "3.1.2" # With k8s 1.24
+          - "3.0.4" # With k8s 1.23
+          - "2.7.6" # With k8s 1.22
+        kubernetes_version:
+          - "1.24.6"
+          - "1.23.0"
+          - "1.22.0"
         include:
-        # Match kind images with chosen version https://github.com/kubernetes-sigs/kind/releases
-        # When using the same ruby version, please add an additonal space at the end of the value,
-        # otherwise the job won't be created. Example: - ruby: "3.1.2", other test: - ruby: "3.1.2 "
-        - ruby: '3.1.2'
-          kind_version: 'v0.14.0'
-          kubernetes_version: '1.24.0'
-          kind_image: 'kindest/node:v1.24.0@sha256:0866296e693efe1fed79d5e6c7af8df71fc73ae45e3679af05342239cdc5bc8e'
-        - ruby: '3.0.4'
-          kind_version: 'v0.14.0'
-          kubernetes_version: '1.24.0'
-          kind_image: 'kindest/node:v1.24.0@sha256:0866296e693efe1fed79d5e6c7af8df71fc73ae45e3679af05342239cdc5bc8e'
-        - ruby: '2.7.6'
-          kind_version: 'v0.14.0'
-          kubernetes_version: '1.24.0'
-          kind_image: 'kindest/node:v1.24.0@sha256:0866296e693efe1fed79d5e6c7af8df71fc73ae45e3679af05342239cdc5bc8e'
-        - ruby: '3.1.2 '
-          kind_version: 'v0.11.1'
-          kubernetes_version: '1.23.0'
-          kind_image: 'kindest/node:v1.23.0@sha256:49824ab1727c04e56a21a5d8372a402fcd32ea51ac96a2706a12af38934f81ac'
-        - ruby: '3.0.4 '
-          kind_version: 'v0.11.1'
-          kubernetes_version: '1.23.0'
-          kind_image: 'kindest/node:v1.23.0@sha256:49824ab1727c04e56a21a5d8372a402fcd32ea51ac96a2706a12af38934f81ac'
-        - ruby: '2.7.6 '
-          kind_version: 'v0.11.1'
-          kubernetes_version: '1.23.0'
-          kind_image: 'kindest/node:v1.23.0@sha256:49824ab1727c04e56a21a5d8372a402fcd32ea51ac96a2706a12af38934f81ac'
-        - ruby: '3.1.2  '
-          kind_version: 'v0.11.1'
-          kubernetes_version: '1.22.0'
-          kind_image: 'kindest/node:v1.22.0@sha256:b8bda84bb3a190e6e028b1760d277454a72267a5454b57db34437c34a588d047'
-        - ruby: '3.0.4  '
-          kind_version: 'v0.11.1'
-          kubernetes_version: '1.22.0'
-          kind_image: 'kindest/node:v1.22.0@sha256:b8bda84bb3a190e6e028b1760d277454a72267a5454b57db34437c34a588d047'
-        - ruby: '2.7.6  '
-          kind_version: 'v0.11.1'
-          kubernetes_version: '1.22.0'
-          kind_image: 'kindest/node:v1.22.0@sha256:b8bda84bb3a190e6e028b1760d277454a72267a5454b57db34437c34a588d047'
+          # Match kind images with chosen version https://github.com/kubernetes-sigs/kind/releases
+          - kubernetes_version: "1.24.6"
+            kind_image: "kindest/node:v1.24.6@sha256:97e8d00bc37a7598a0b32d1fabd155a96355c49fa0d4d4790aab0f161bf31be1"
+          - kubernetes_version: "1.23.12"
+            kind_image: "kindest/node:v1.23.12@sha256:9402cf1330bbd3a0d097d2033fa489b2abe40d479cc5ef47d0b6a6960613148a"
+          - kubernetes_version: "1.22.15"
+            kind_image: "kindest/node:v1.22.15@sha256:bfd5eaae36849bfb3c1e3b9442f3da17d730718248939d9d547e86bbac5da586"
 
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up Ruby ${{ matrix.ruby }}
+      - name: Setup Ruby ${{ matrix.ruby }}
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
 
-      - name: Setup kubectl
+      - name: Setup kubectl ${{ matrix.kubernetes_version }}
         run: |
           mkdir -p "${GITHUB_WORKSPACE}/bin"
           curl -o "${GITHUB_WORKSPACE}/bin/kubectl" -LO "https://dl.k8s.io/release/v${{ matrix.kubernetes_version }}/bin/linux/amd64/kubectl"
           chmod +x "${GITHUB_WORKSPACE}/bin/kubectl"
           echo "PATH=$GITHUB_WORKSPACE/bin:${PATH}" >> $GITHUB_ENV
 
-      - uses: engineerd/setup-kind@v0.5.0
+      - name: Setup Kind v0.16.0
+        uses: engineerd/setup-kind@v0.5.0
         with:
-          version: "${{ matrix.kind_version }}"
+          version: v0.16.0
           image: "${{ matrix.kind_image }}"
 
       - name: Run tests
diff --git a/dev.yml b/dev.yml
index 8ae5a0371..000948fd7 100644
--- a/dev.yml
+++ b/dev.yml
@@ -6,7 +6,7 @@ up:
   - podman
   - kind:
       name: krane
-      image: kindest/node:v1.24.0@sha256:0866296e693efe1fed79d5e6c7af8df71fc73ae45e3679af05342239cdc5bc8e
+      image: kindest/node:v1.24.6@sha256:97e8d00bc37a7598a0b32d1fabd155a96355c49fa0d4d4790aab0f161bf31be1
 commands:
   test:
     run: bin/test