Skip to content

Commit

Permalink
E2E Fixes - use latest wordpress chart
Browse files Browse the repository at this point in the history
Signed-off-by: Hasan Turken <[email protected]>
  • Loading branch information
turkenh committed Aug 16, 2023
1 parent c09f188 commit 27b35cc
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
4 changes: 1 addition & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions cluster/integration/integration_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/sample/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 27b35cc

Please sign in to comment.