From 27b35cc5bbeece71c3c261de1e41d6e0e95591b9 Mon Sep 17 00:00:00 2001
From: Hasan Turken <turkenh@gmail.com>
Date: Wed, 16 Aug 2023 14:14:52 +0300
Subject: [PATCH] E2E Fixes - use latest wordpress chart

Signed-off-by: Hasan Turken <turkenh@gmail.com>
---
 .github/workflows/ci.yml                 | 2 +-
 Makefile                                 | 4 +---
 cluster/integration/integration_tests.sh | 4 ++--
 examples/sample/release.yaml             | 2 +-
 go.mod                                   | 2 ++
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8732c10..4edff87 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ on:
 
 env:
   # Common versions
-  GO_VERSION: '1.19.5'
+  GO_VERSION: '1.20.7'
   GOLANGCI_VERSION: 'v1.54.1'
   DOCKER_BUILDX_VERSION: 'v0.8.2'
 
diff --git a/Makefile b/Makefile
index 47e6331..4ae8ec8 100644
--- a/Makefile
+++ b/Makefile
@@ -33,9 +33,7 @@ GOLANGCILINT_VERSION ?= 1.54.1
 # ====================================================================================
 # Setup Kubernetes tools
 
-#UP_VERSION = v0.13.0
-#UP_CHANNEL = stable
-KIND_NODE_IMAGE_TAG ?= v1.24.0
+KIND_NODE_IMAGE_TAG ?= v1.27.3
 USE_HELM3 = true
 -include build/makelib/k8s_tools.mk
 
diff --git a/cluster/integration/integration_tests.sh b/cluster/integration/integration_tests.sh
index 523ff62..2d61e8b 100755
--- a/cluster/integration/integration_tests.sh
+++ b/cluster/integration/integration_tests.sh
@@ -65,7 +65,7 @@ echo_step "setting up local package cache"
 CACHE_PATH="${projectdir}/.work/inttest-package-cache"
 mkdir -p "${CACHE_PATH}"
 echo "created cache dir at ${CACHE_PATH}"
-"${UP}" alpha xpkg xp-extract --from-xpkg "${OUTPUT_DIR}"/xpkg/"${HOSTOS}"_"${SAFEHOSTARCH}"/"${PACKAGE_NAME}"-"${VERSION}".xpkg -o "${CACHE_PATH}/${PACKAGE_NAME}.gz" && chmod 644 "${CACHE_PATH}/${PACKAGE_NAME}.gz"
+"${UP}" alpha xpkg xp-extract --from-xpkg "${OUTPUT_DIR}"/xpkg/linux_"${SAFEHOSTARCH}"/"${PACKAGE_NAME}"-"${VERSION}".xpkg -o "${CACHE_PATH}/${PACKAGE_NAME}.gz" && chmod 644 "${CACHE_PATH}/${PACKAGE_NAME}.gz"
 
 # create kind cluster with extra mounts
 KIND_NODE_IMAGE="kindest/node:${KIND_NODE_IMAGE_TAG}"
@@ -181,7 +181,7 @@ echo_step "install example chart"
 "${KUBECTL}" wait --for=condition=Ready release --all --timeout=1m
 
 echo_step "waiting for wordpress pods to be ready"
-"${KUBECTL}" -n wordpress wait --for=condition=Ready pods --all --timeout=3m
+"${KUBECTL}" -n wordpress wait --for=condition=Ready pods --all --timeout=5m
 
 echo_sub_step "check namespace label"
 if $("${KUBECTL}" get namespaces --no-headers --selector="app.kubernetes.io/managed-by=provider-helm" | grep -iq 'No resources found'); then
diff --git a/examples/sample/release.yaml b/examples/sample/release.yaml
index c668236..23c7f95 100644
--- a/examples/sample/release.yaml
+++ b/examples/sample/release.yaml
@@ -8,7 +8,7 @@ spec:
     chart:
       name: wordpress
       repository: https://charts.bitnami.com/bitnami
-      version: 15.2.5 ## To use devlopment versions, set ">0.0.0-0"
+      version: 17.0.5 ## To use devlopment versions, set ">0.0.0-0"
 #     pullSecretRef:
 #       name: museum-creds
 #       namespace: default
diff --git a/go.mod b/go.mod
index 29a80a9..de09b0e 100644
--- a/go.mod
+++ b/go.mod
@@ -162,4 +162,6 @@ require (
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 )
 
+// Note(turkenh): registry package in docker/docker has a breaking change introduced with https://github.com/moby/moby/commit/7b3acdff5d01c6bbac5ddd38d3bc01277f06ee64
+// This is a temporary workaround until our dependencies are updated to use the new API.
 replace github.com/docker/docker v24.0.4+incompatible => github.com/docker/docker v23.0.3+incompatible