public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

No need to quote valid K8s identifiers.

This commit is contained in:
Jan Mußler 2020-10-27 21:11:04 +01:00
parent e3f32d20e5
commit d24c1285b9
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/cluster/sync.go
View File

@ -804,7 +804,7 @@ func (c *Cluster) syncLogicalBackupJob() error {
return fmt.Errorf("could not generate the desired logical backup job state: %v", err) return fmt.Errorf("could not generate the desired logical backup job state: %v", err)
} }
if match, reason := k8sutil.SameLogicalBackupJob(job, desiredJob); !match { if match, reason := k8sutil.SameLogicalBackupJob(job, desiredJob); !match {
c.logger.Infof("logical job %q is not in the desired state and needs to be updated", c.logger.Infof("logical job %s is not in the desired state and needs to be updated",
c.getLogicalBackupJobName(), c.getLogicalBackupJobName(),
) )
if reason != "" { if reason != "" {
@ -825,12 +825,12 @@ func (c *Cluster) syncLogicalBackupJob() error {
c.logger.Info("could not find the cluster's logical backup job") c.logger.Info("could not find the cluster's logical backup job")
if err = c.createLogicalBackupJob(); err == nil { if err = c.createLogicalBackupJob(); err == nil {
c.logger.Infof("created missing logical backup job %q", jobName) c.logger.Infof("created missing logical backup job %s", jobName)
} else { } else {
if !k8sutil.ResourceAlreadyExists(err) { if !k8sutil.ResourceAlreadyExists(err) {
return fmt.Errorf("could not create missing logical backup job: %v", err) return fmt.Errorf("could not create missing logical backup job: %v", err)
} }
c.logger.Infof("logical backup job %q already exists", jobName) c.logger.Infof("logical backup job %s already exists", jobName)
if _, err = c.KubeClient.CronJobsGetter.CronJobs(c.Namespace).Get(context.TODO(), jobName, metav1.GetOptions{}); err != nil { if _, err = c.KubeClient.CronJobsGetter.CronJobs(c.Namespace).Get(context.TODO(), jobName, metav1.GetOptions{}); err != nil {
return fmt.Errorf("could not fetch existing logical backup job: %v", err) return fmt.Errorf("could not fetch existing logical backup job: %v", err)
} }

8
pkg/cluster/util.go
View File

@ -188,9 +188,9 @@ func logNiceDiff(log *logrus.Entry, old, new interface{}) {
func (c *Cluster) logStatefulSetChanges(old, new *appsv1.StatefulSet, isUpdate bool, reasons []string) { func (c *Cluster) logStatefulSetChanges(old, new *appsv1.StatefulSet, isUpdate bool, reasons []string) {
if isUpdate { if isUpdate {
c.logger.Infof("statefulset %q has been changed", util.NameFromMeta(old.ObjectMeta)) c.logger.Infof("statefulset %s has been changed", util.NameFromMeta(old.ObjectMeta))
} else { } else {
c.logger.Infof("statefulset %q is not in the desired state and needs to be updated", c.logger.Infof("statefulset %s is not in the desired state and needs to be updated",
util.NameFromMeta(old.ObjectMeta), util.NameFromMeta(old.ObjectMeta),
) )
} }
@ -211,11 +211,11 @@ func (c *Cluster) logStatefulSetChanges(old, new *appsv1.StatefulSet, isUpdate b
func (c *Cluster) logServiceChanges(role PostgresRole, old, new *v1.Service, isUpdate bool, reason string) { func (c *Cluster) logServiceChanges(role PostgresRole, old, new *v1.Service, isUpdate bool, reason string) {
if isUpdate { if isUpdate {
c.logger.Infof("%s service %q has been changed", c.logger.Infof("%s service %s has been changed",
role, util.NameFromMeta(old.ObjectMeta), role, util.NameFromMeta(old.ObjectMeta),
) )
} else { } else {
c.logger.Infof("%s service %q is not in the desired state and needs to be updated", c.logger.Infof("%s service %s is not in the desired state and needs to be updated",
role, util.NameFromMeta(old.ObjectMeta), role, util.NameFromMeta(old.ObjectMeta),
) )
} }