From 6dc6755bc4ad8b99c8a9ad511a2699fdf2dcda2d Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Tue, 17 Sep 2024 13:24:06 +1000 Subject: [PATCH] chore: update k8s versions and upstream branch --- Makefile | 10 +++++----- k3d-calico.config.yaml.tpl | 2 +- k3d.config.yaml.tpl | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 7549a55e86..8072c3de43 100644 --- a/Makefile +++ b/Makefile @@ -392,15 +392,15 @@ compose-api-logs-development: ## CI targets -KUBECTL_VERSION := v1.30.1 -HELM_VERSION := v3.15.2 -K3D_VERSION = v5.6.3 +KUBECTL_VERSION := v1.31.0 +HELM_VERSION := v3.16.1 +K3D_VERSION = v5.7.4 GOJQ_VERSION = v0.12.16 STERN_VERSION = v2.6.1 CHART_TESTING_VERSION = v3.11.0 -K3D_IMAGE = docker.io/rancher/k3s:v1.30.1-k3s1 +K3D_IMAGE = docker.io/rancher/k3s:v1.31.0-k3s1 TESTS = [nginx,api,features-kubernetes,bulk-deployment,features-kubernetes-2,features-variables,active-standby-kubernetes,tasks,drush,python,gitlab,github,bitbucket,services,workflows] -CHARTS_TREEISH = lagoon_v221 +CHARTS_TREEISH = main TASK_IMAGES = task-activestandby # the name of the docker network to create diff --git a/k3d-calico.config.yaml.tpl b/k3d-calico.config.yaml.tpl index cf2a975c3d..5a381653cd 100644 --- a/k3d-calico.config.yaml.tpl +++ b/k3d-calico.config.yaml.tpl @@ -1,4 +1,4 @@ -apiVersion: k3d.io/v1alpha4 +apiVersion: k3d.io/v1alpha5 kind: Simple servers: 1 agents: 0 diff --git a/k3d.config.yaml.tpl b/k3d.config.yaml.tpl index 984198351f..ef5cba805b 100644 --- a/k3d.config.yaml.tpl +++ b/k3d.config.yaml.tpl @@ -1,4 +1,4 @@ -apiVersion: k3d.io/v1alpha4 +apiVersion: k3d.io/v1alpha5 kind: Simple servers: 1 agents: 0