THREESCALE-8999 Addressing Further Comments

3scale · Jul 3, 2023 · 2d0b31e · 2d0b31e
1 parent 93a8ab7
commit 2d0b31e
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 54 deletions.
diff --git a/doc/operator-user-guide.md b/doc/operator-user-guide.md
@@ -769,8 +769,7 @@ spec:
 ```
 
 #### Setting custom labels
-[Labels](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/)
-Labels can be customized through the APIManager CR `labels` attribute for each DeploymentConfig and are applied to  their pods.
+[Labels](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/) can be customized through the APIManager CR `labels` attribute for each DeploymentConfig and are applied to  their pods.
 Example for apicast-staging and backend-listener:
 ```yaml
  apiVersion: apps.3scale.net/v1alpha1

diff --git a/pkg/3scale/amp/operator/backend_options_provider.go b/pkg/3scale/amp/operator/backend_options_provider.go
@@ -192,10 +192,8 @@ func (o *OperatorBackendOptionsProvider) listenerPodTemplateLabels() map[string]
 		labels[k] = v
 	}
 
-	if o.apimanager.Spec.Backend.ListenerSpec.Labels != nil {
-		for k, v := range o.apimanager.Spec.Backend.ListenerSpec.Labels {
-			labels[k] = v
-		}
+	for k, v := range o.apimanager.Spec.Backend.ListenerSpec.Labels {
+		labels[k] = v
 	}
 
 	labels["deploymentConfig"] = "backend-listener"
@@ -210,10 +208,8 @@ func (o *OperatorBackendOptionsProvider) workerPodTemplateLabels() map[string]st
 		labels[k] = v
 	}
 
-	if o.apimanager.Spec.Backend.WorkerSpec.Labels != nil {
-		for k, v := range o.apimanager.Spec.Backend.WorkerSpec.Labels {
-			labels[k] = v
-		}
+	for k, v := range o.apimanager.Spec.Backend.WorkerSpec.Labels {
+		labels[k] = v
 	}
 
 	labels["deploymentConfig"] = "backend-worker"
@@ -228,10 +224,8 @@ func (o *OperatorBackendOptionsProvider) cronPodTemplateLabels() map[string]stri
 		labels[k] = v
 	}
 
-	if o.apimanager.Spec.Backend.CronSpec.Labels != nil {
-		for k, v := range o.apimanager.Spec.Backend.CronSpec.Labels {
-			labels[k] = v
-		}
+	for k, v := range o.apimanager.Spec.Backend.CronSpec.Labels {
+		labels[k] = v
 	}
 
 	labels["deploymentConfig"] = "backend-cron"

diff --git a/pkg/3scale/amp/operator/memcached_options_provider.go b/pkg/3scale/amp/operator/memcached_options_provider.go
@@ -75,10 +75,8 @@ func (m *MemcachedOptionsProvider) podTemplateLabels() map[string]string {
 		labels[k] = v
 	}
 
-	if m.apimanager.Spec.System.MemcachedLabels != nil {
-		for k, v := range m.apimanager.Spec.System.MemcachedLabels {
-			labels[k] = v
-		}
+	for k, v := range m.apimanager.Spec.System.MemcachedLabels {
+		labels[k] = v
 	}
 
 	labels["deploymentConfig"] = "system-memcache"

diff --git a/pkg/3scale/amp/operator/redis_options_provider.go b/pkg/3scale/amp/operator/redis_options_provider.go
@@ -228,10 +228,8 @@ func (r *RedisOptionsProvider) systemRedisPodTemplateLabels() map[string]string
 		labels[k] = v
 	}
 
-	if r.apimanager.Spec.System != nil && r.apimanager.Spec.System.RedisLabels != nil {
-		for k, v := range r.apimanager.Spec.System.RedisLabels {
-			labels[k] = v
-		}
+	for k, v := range r.apimanager.Spec.System.RedisLabels {
+		labels[k] = v
 	}
 
 	labels["deploymentConfig"] = "system-redis"
@@ -246,10 +244,8 @@ func (r *RedisOptionsProvider) backendRedisPodTemplateLabels() map[string]string
 		labels[k] = v
 	}
 
-	if r.apimanager.Spec.Backend != nil && r.apimanager.Spec.Backend.RedisLabels != nil {
-		for k, v := range r.apimanager.Spec.Backend.RedisLabels {
-			labels[k] = v
-		}
+	for k, v := range r.apimanager.Spec.Backend.RedisLabels {
+		labels[k] = v
 	}
 
 	labels["deploymentConfig"] = "backend-redis"

diff --git a/pkg/3scale/amp/operator/system_options_provider.go b/pkg/3scale/amp/operator/system_options_provider.go
@@ -540,10 +540,8 @@ func (s *SystemOptionsProvider) appPodTemplateLabels() map[string]string {
 		labels[k] = v
 	}
 
-	if s.apimanager.Spec.System.AppSpec.Labels != nil {
-		for k, v := range s.apimanager.Spec.System.AppSpec.Labels {
-			labels[k] = v
-		}
+	for k, v := range s.apimanager.Spec.System.AppSpec.Labels {
+		labels[k] = v
 	}
 
 	labels["deploymentConfig"] = "system-app"
@@ -563,10 +561,9 @@ func (s *SystemOptionsProvider) sidekiqPodTemplateLabels() map[string]string {
 	for k, v := range s.commonSidekiqLabels() {
 		labels[k] = v
 	}
-	if s.apimanager.Spec.System.SidekiqSpec.Labels != nil {
-		for k, v := range s.apimanager.Spec.System.SidekiqSpec.Labels {
-			labels[k] = v
-		}
+
+	for k, v := range s.apimanager.Spec.System.SidekiqSpec.Labels {
+		labels[k] = v
 	}
 
 	labels["deploymentConfig"] = "system-sidekiq"

diff --git a/pkg/3scale/amp/operator/system_postgresql_options_provider.go b/pkg/3scale/amp/operator/system_postgresql_options_provider.go
@@ -187,12 +187,12 @@ func (s *SystemPostgresqlOptionsProvider) podTemplateLabels() map[string]string
 		labels[k] = v
 	}
 
-	if s.apimanager.IsSystemPostgreSQLEnabled() &&
-		s.apimanager.Spec.System.DatabaseSpec.PostgreSQL.Labels != nil {
+	if s.apimanager.IsSystemPostgreSQLEnabled() {
 		for k, v := range s.apimanager.Spec.System.DatabaseSpec.PostgreSQL.Labels {
 			labels[k] = v
 		}
 	}
+
 	labels["deploymentConfig"] = "system-postgresql"
 
 	return labels

diff --git a/pkg/3scale/amp/operator/system_searchd_options_provider.go b/pkg/3scale/amp/operator/system_searchd_options_provider.go
@@ -80,12 +80,8 @@ func (s *SystemSearchdOptionsProvider) podTemplateLabels() map[string]string {
 		labels[k] = v
 	}
 
-	if s.apimanager.Spec.System != nil &&
-		s.apimanager.Spec.System.SearchdSpec != nil &&
-		s.apimanager.Spec.System.SearchdSpec.Labels != nil {
-		for k, v := range s.apimanager.Spec.System.SearchdSpec.Labels {
-			labels[k] = v
-		}
+	for k, v := range s.apimanager.Spec.System.SearchdSpec.Labels {
+		labels[k] = v
 	}
 
 	labels["deploymentConfig"] = "system-searchd"

diff --git a/pkg/3scale/amp/operator/zync_options_provider.go b/pkg/3scale/amp/operator/zync_options_provider.go
@@ -242,10 +242,8 @@ func (z *ZyncOptionsProvider) zyncPodTemplateLabels() map[string]string {
 		labels[k] = v
 	}
 
-	if z.apimanager.Spec.Zync.AppSpec.Labels != nil {
-		for k, v := range z.apimanager.Spec.Zync.AppSpec.Labels {
-			labels[k] = v
-		}
+	for k, v := range z.apimanager.Spec.Zync.AppSpec.Labels {
+		labels[k] = v
 	}
 
 	labels["deploymentConfig"] = "zync"
@@ -260,10 +258,8 @@ func (z *ZyncOptionsProvider) zyncQuePodTemplateLabels() map[string]string {
 		labels[k] = v
 	}
 
-	if z.apimanager.Spec.Zync.QueSpec.Labels != nil {
-		for k, v := range z.apimanager.Spec.Zync.QueSpec.Labels {
-			labels[k] = v
-		}
+	for k, v := range z.apimanager.Spec.Zync.QueSpec.Labels {
+		labels[k] = v
 	}
 
 	labels["deploymentConfig"] = "zync-que"
@@ -278,10 +274,8 @@ func (z *ZyncOptionsProvider) zyncDatabasePodTemplateLabels() map[string]string
 		labels[k] = v
 	}
 
-	if z.apimanager.Spec.Zync.DatabaseLabels != nil {
-		for k, v := range z.apimanager.Spec.Zync.DatabaseLabels {
-			labels[k] = v
-		}
+	for k, v := range z.apimanager.Spec.Zync.DatabaseLabels {
+		labels[k] = v
 	}
 
 	labels["deploymentConfig"] = "zync-database"