From b43306657732a9e3ddb122b1535e1d4dd81bea93 Mon Sep 17 00:00:00 2001 From: inovindasari Date: Wed, 27 Nov 2024 16:19:48 +0100 Subject: [PATCH] remove leftover unused variable --- pkg/controller/operator_config.go | 1 - pkg/util/config/config.go | 1 - 2 files changed, 2 deletions(-) diff --git a/pkg/controller/operator_config.go b/pkg/controller/operator_config.go index 90583216f..b77036da9 100644 --- a/pkg/controller/operator_config.go +++ b/pkg/controller/operator_config.go @@ -111,7 +111,6 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur result.PodRoleLabel = util.Coalesce(fromCRD.Kubernetes.PodRoleLabel, "spilo-role") result.PodLeaderLabelValue = util.Coalesce(fromCRD.Kubernetes.PodLeaderLabelValue, "master") - result.PodStandbyLeaderLabelValue = util.Coalesce(fromCRD.Kubernetes.PodStandbyLeaderLabelValue, "master") result.ClusterLabels = util.CoalesceStrMap(fromCRD.Kubernetes.ClusterLabels, map[string]string{"application": "spilo"}) result.InheritedLabels = fromCRD.Kubernetes.InheritedLabels result.InheritedAnnotations = fromCRD.Kubernetes.InheritedAnnotations diff --git a/pkg/util/config/config.go b/pkg/util/config/config.go index 452ce9645..09a5a9a93 100644 --- a/pkg/util/config/config.go +++ b/pkg/util/config/config.go @@ -49,7 +49,6 @@ type Resources struct { DeleteAnnotationNameKey string `name:"delete_annotation_name_key"` PodRoleLabel string `name:"pod_role_label" default:"spilo-role"` PodLeaderLabelValue string `name:"pod_leader_label_value" default:"master"` - PodStandbyLeaderLabelValue string `name:"pod_standby_leader_label_value" default:"master"` PodToleration map[string]string `name:"toleration" default:""` DefaultCPURequest string `name:"default_cpu_request"` DefaultMemoryRequest string `name:"default_memory_request"`