remove leftover unused variable
This commit is contained in:
parent
8ad5dabe84
commit
b433066577
|
|
@ -111,7 +111,6 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur
|
||||||
|
|
||||||
result.PodRoleLabel = util.Coalesce(fromCRD.Kubernetes.PodRoleLabel, "spilo-role")
|
result.PodRoleLabel = util.Coalesce(fromCRD.Kubernetes.PodRoleLabel, "spilo-role")
|
||||||
result.PodLeaderLabelValue = util.Coalesce(fromCRD.Kubernetes.PodLeaderLabelValue, "master")
|
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.ClusterLabels = util.CoalesceStrMap(fromCRD.Kubernetes.ClusterLabels, map[string]string{"application": "spilo"})
|
||||||
result.InheritedLabels = fromCRD.Kubernetes.InheritedLabels
|
result.InheritedLabels = fromCRD.Kubernetes.InheritedLabels
|
||||||
result.InheritedAnnotations = fromCRD.Kubernetes.InheritedAnnotations
|
result.InheritedAnnotations = fromCRD.Kubernetes.InheritedAnnotations
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,6 @@ type Resources struct {
|
||||||
DeleteAnnotationNameKey string `name:"delete_annotation_name_key"`
|
DeleteAnnotationNameKey string `name:"delete_annotation_name_key"`
|
||||||
PodRoleLabel string `name:"pod_role_label" default:"spilo-role"`
|
PodRoleLabel string `name:"pod_role_label" default:"spilo-role"`
|
||||||
PodLeaderLabelValue string `name:"pod_leader_label_value" default:"master"`
|
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:""`
|
PodToleration map[string]string `name:"toleration" default:""`
|
||||||
DefaultCPURequest string `name:"default_cpu_request"`
|
DefaultCPURequest string `name:"default_cpu_request"`
|
||||||
DefaultMemoryRequest string `name:"default_memory_request"`
|
DefaultMemoryRequest string `name:"default_memory_request"`
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue