From b79ee0db6f5745daa60c92313da1e5c0a38f0802 Mon Sep 17 00:00:00 2001 From: Sergey Dudoladov Date: Thu, 11 Apr 2019 16:06:34 +0200 Subject: [PATCH] fix static check violations --- pkg/cluster/sync.go | 6 +++--- run_operator_locally.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/cluster/sync.go b/pkg/cluster/sync.go index 79af29957..017168063 100644 --- a/pkg/cluster/sync.go +++ b/pkg/cluster/sync.go @@ -542,8 +542,8 @@ func (c *Cluster) syncLogicalBackupJob() error { if job, err = c.KubeClient.CronJobsGetter.CronJobs(c.Namespace).Get(c.logicalBackupJob.Name, metav1.GetOptions{}); err == nil { desiredJob, err = c.generateLogicalBackupJob() - if err = c.updateCronJob(desiredJob); err != nil { - return fmt.Errorf("could not generate the desired job state: %v", err) + if err != nil { + return fmt.Errorf("could not generate the desired cron job state: %v", err) } if match, reason := k8sutil.SameCronJob(job, desiredJob); !match { c.logCronJobChanges(job, desiredJob, false, reason) @@ -567,7 +567,7 @@ func (c *Cluster) syncLogicalBackupJob() error { return fmt.Errorf("could not create missing logical backup job: %v", err) } c.logger.Infof("logical backup job %q already exists", util.NameFromMeta(job.ObjectMeta)) - if job, err = c.KubeClient.CronJobsGetter.CronJobs(c.Namespace).Get(c.logicalBackupJob.Name, metav1.GetOptions{}); err != nil { + if _, err = c.KubeClient.CronJobsGetter.CronJobs(c.Namespace).Get(c.logicalBackupJob.Name, metav1.GetOptions{}); err != nil { return fmt.Errorf("could not fetch existing logical backup job: %v", err) } } diff --git a/run_operator_locally.sh b/run_operator_locally.sh index ee0768354..db3d8e50f 100755 --- a/run_operator_locally.sh +++ b/run_operator_locally.sh @@ -256,7 +256,7 @@ function main(){ clean_up start_minikube start_operator - submit_postgresql_manifest + # submit_postgresql_manifest forward_ports check_health