From 512ef230e685365d38fa6c0ac97a98297ef277f5 Mon Sep 17 00:00:00 2001
From: Luke Kingland <luke@lukekingland.com>
Date: Thu, 22 Jun 2023 00:30:34 +0900
Subject: [PATCH] chore: test cluster versions update (#1819)

* test cluster versions update

Updates versions used for the test clutser, and includes a change
to use a specific kind node version rather than the kubernetes version per
Kind's docs.

- knative_serving v1.10.1
- knative_eventing v1.10.1
- contour v1.10.0
- kubectl v1.27.2
- dapr v1.10.0
- helm v3.12.0
- kind v0.19.0
- kind_node v1.27.1

* remove dapr dashboard patch

* dapr init flags resuscitation
---
 hack/allocate.sh | 40 +++++++++-------------------------------
 hack/binaries.sh |  8 ++++----
 2 files changed, 13 insertions(+), 35 deletions(-)

diff --git a/hack/allocate.sh b/hack/allocate.sh
index 772e20c0f5..5eabb0e640 100755
--- a/hack/allocate.sh
+++ b/hack/allocate.sh
@@ -24,10 +24,13 @@ export TERM="${TERM:-dumb}"
 
 main() {
 
-  local kubernetes_version=v1.24.6
-  local knative_serving_version=v1.8.0
-  local knative_eventing_version=v1.8.0
-  local contour_version=v1.8.0
+  local knative_serving_version=v1.10.1
+  local knative_eventing_version=v1.10.1
+  local contour_version=v1.10.0
+
+  # Kubernetes Version node image per Kind releases (full hash is suggested):
+  # https://github.com/kubernetes-sigs/kind/releases
+  local kind_node_version=v1.27.1@sha256:b7d12ed662b873bd8510879c1846e87c7e676a79fefc93e17b2a52989d3ff42b
 
   # shellcheck disable=SC2155
   local em=$(tput bold)$(tput setaf 2)
@@ -56,7 +59,7 @@ kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
 nodes:
   - role: control-plane
-    image: kindest/node:${kubernetes_version}
+    image: kindest/node:${kind_node_version}
     extraPortMappings:
     - containerPort: 80
       hostPort: 80
@@ -271,37 +274,12 @@ EOF
 
 }
 
-# temporary fix for https://github.com/dapr/cli/issues/1311
-fixup_dapr_dashboard_deployment() {
-  kubectl patch deploy/dapr-dashboard -n dapr-system --patch-file /dev/stdin <<EOF
-{
-  "spec": {
-    "template": {
-      "spec": {
-        "\$setElementOrder/containers": [
-          {
-            "name": "dapr-dashboard"
-          }
-        ],
-        "containers": [
-          {
-            "image": "ghcr.io/dapr/dashboard:0.12.0",
-            "name": "dapr-dashboard"
-          }
-        ]
-      }
-    }
-  }
-}
-EOF
-}
-
 dapr_runtime() {
   echo "${em}⑦ Dapr${me}"
+  echo "Version:\\n$(dapr version)"
 
   local dapr_flags=""
   if [ "${GITHUB_ACTIONS:-false}" = "true" ]; then
-    (sleep 10; fixup_dapr_dashboard_deployment)&
     dapr_flags="--image-registry=ghcr.io/dapr --log-as-json"
   fi
 
diff --git a/hack/binaries.sh b/hack/binaries.sh
index 6639db292e..07df54f3f2 100755
--- a/hack/binaries.sh
+++ b/hack/binaries.sh
@@ -12,10 +12,10 @@ set -o pipefail
 export TERM="${TERM:-dumb}"
 
 main() {
-  local kubectl_version=v1.24.6
-  local kind_version=v0.16.0
-  local dapr_version=v1.9.1
-  local helm_version=v3.11.0
+  local kubectl_version=v1.27.2
+  local kind_version=v0.19.0
+  local dapr_version=v1.10.0
+  local helm_version=v3.12.0
   local stern_version=1.25.0
 
   local em=$(tput bold)$(tput setaf 2)