From 28cfeb6c91561af00d12236ac1eb99b055befbed Mon Sep 17 00:00:00 2001 From: shreddedbacon Date: Tue, 1 Nov 2022 19:48:39 +1100 Subject: [PATCH 1/2] fix: ensure statusmessages exists to save into --- controllers/v1beta1/podmonitor_buildhandlers.go | 1 + controllers/v1beta1/podmonitor_taskhandlers.go | 1 + 2 files changed, 2 insertions(+) diff --git a/controllers/v1beta1/podmonitor_buildhandlers.go b/controllers/v1beta1/podmonitor_buildhandlers.go index 09eb8aeb..9176a4f1 100644 --- a/controllers/v1beta1/podmonitor_buildhandlers.go +++ b/controllers/v1beta1/podmonitor_buildhandlers.go @@ -479,6 +479,7 @@ Build %s "lagoon.sh/buildStarted": "true", }, }, + "statusMessages": map[string]interface{}{}, } condition := lagoonv1beta1.LagoonBuildConditions{ diff --git a/controllers/v1beta1/podmonitor_taskhandlers.go b/controllers/v1beta1/podmonitor_taskhandlers.go index 0622876f..6961a337 100644 --- a/controllers/v1beta1/podmonitor_taskhandlers.go +++ b/controllers/v1beta1/podmonitor_taskhandlers.go @@ -333,6 +333,7 @@ Task %s "lagoon.sh/taskStatus": string(taskCondition), }, }, + "statusMessages": map[string]interface{}{}, } condition := lagoonv1beta1.LagoonTaskConditions{ From 8e9c4d083b004a8287ffa3b2c9e3b95dadb28bfc Mon Sep 17 00:00:00 2001 From: shreddedbacon Date: Thu, 3 Nov 2022 19:45:24 +1100 Subject: [PATCH 2/2] chore: change the controller to use the latest build-deploy-image --- main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.go b/main.go index cc85ba57..36d2d679 100644 --- a/main.go +++ b/main.go @@ -194,7 +194,7 @@ func main() { "Enable leader election for controller manager. Enabling this will ensure there is only one active controller manager.") flag.BoolVar(&enableMQ, "enable-message-queue", true, "Enable message queue to provide updates back to Lagoon.") - flag.StringVar(&overrideBuildDeployImage, "override-builddeploy-image", "uselagoon/kubectl-build-deploy-dind:latest", + flag.StringVar(&overrideBuildDeployImage, "override-builddeploy-image", "uselagoon/build-deploy-image:latest", "The build and deploy image that should be used by builds started by the controller.") flag.StringVar(&namespacePrefix, "namespace-prefix", "", "The prefix that will be added to all namespaces that are generated, maximum 8 characters. (only used if random-prefix is set false)")