fix: Add owner reference update-check job

mattermost · May 27, 2022 · 5227975 · 5227975
1 parent 52ddaa2
commit 5227975
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/controllers/mattermost/clusterinstallation/mattermost.go b/controllers/mattermost/clusterinstallation/mattermost.go
@@ -397,7 +397,7 @@ func (r *ClusterInstallationReconciler) checkUpdateJob(
 		if k8sErrors.IsNotFound(err) {
 			// Job is not running, let's launch
 			reqLogger.Info("Launching update image job")
-			if err = r.Resources.LaunchMattermostUpdateJob(mattermost.Namespace, desired); err != nil {
+			if err = r.Resources.LaunchMattermostUpdateJob(mattermost.Namespace, desired, reqLogger); err != nil {
 				return nil, errors.Wrap(err, "Launching update image job failed")
 			}
 			return nil, errors.New("Began update image job")

diff --git a/controllers/mattermost/mattermost/mattermost.go b/controllers/mattermost/mattermost/mattermost.go
@@ -3,6 +3,7 @@ package mattermost
 import (
 	"context"
 	"fmt"
+
 	"github.com/mattermost/mattermost-operator/pkg/resources"
 
 	"github.com/go-logr/logr"
@@ -353,7 +354,7 @@ func (r *MattermostReconciler) checkUpdateJob(
 	if err != nil {
 		if k8sErrors.IsNotFound(err) {
 			reqLogger.Info("Launching update image job")
-			if err = r.Resources.LaunchMattermostUpdateJob(jobNamespace, baseDeployment); err != nil {
+			if err = r.Resources.LaunchMattermostUpdateJob(jobNamespace, baseDeployment, reqLogger); err != nil {
 				return nil, errors.Wrap(err, "Launching update image job failed")
 			}
 			return nil, errors.New("Began update image job")

diff --git a/pkg/resources/update_job.go b/pkg/resources/update_job.go
@@ -3,6 +3,7 @@ package resources
 import (
 	"context"
 
+	"github.com/go-logr/logr"
 	mattermostApp "github.com/mattermost/mattermost-operator/pkg/mattermost"
 	"github.com/pkg/errors"
 	appsv1 "k8s.io/api/apps/v1"
@@ -19,10 +20,11 @@ const UpdateJobName = "mattermost-update-check"
 func (r *ResourceHelper) LaunchMattermostUpdateJob(
 	jobNamespace string,
 	baseDeployment *appsv1.Deployment,
+	reqLogger logr.Logger,
 ) error {
 	job := PrepareMattermostJobTemplate(UpdateJobName, jobNamespace, baseDeployment)
 
-	err := r.client.Create(context.TODO(), job)
+	err := r.Create(job, baseDeployment, reqLogger)
 	if err != nil && !k8sErrors.IsAlreadyExists(err) {
 		return err
 	}