Merge branch 'main' into buildstatus

uselagoon · Nov 8, 2022 · a1b00fd · a1b00fd
2 parents 3920379 + b0daee2
commit a1b00fd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/controllers/v1beta1/podmonitor_buildhandlers.go b/controllers/v1beta1/podmonitor_buildhandlers.go
@@ -515,6 +515,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
@@ -325,6 +325,7 @@ Task %s
 					"lagoon.sh/taskStatus": string(taskCondition),
 				},
 			},
+			"statusMessages": map[string]interface{}{},
 		}
 
 		condition := lagoonv1beta1.LagoonTaskConditions{

diff --git 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)")
-Original file line number
+Diff line change
@@ Expand Up / @@ -515,6 +515,7 @@ Build %s @@
     					"lagoon.sh/buildStarted": "true",
     				},
     			},
+    			"statusMessages": map[string]interface{}{},
     		}
     		condition := lagoonv1beta1.LagoonBuildConditions{
@@ Expand Down @@