THREESCALE-9000 - resolve conflicts for merge to master

apis/apps/v1alpha1/apimanager_types.go

@@ -268,6 +268,8 @@ type ApicastProductionSpec struct {
 	// +optional
 	TopologySpreadConstraints []v1.TopologySpreadConstraint `json:"topologySpreadConstraints,omitempty"`
 	// +optional
+	Labels map[string]string `json:"labels,omitempty"`
+	// +optional
 	Annotations map[string]string `json:"annotations,omitempty"`
 }
 
@@ -332,6 +334,8 @@ type ApicastStagingSpec struct {
 	// +optional
 	TopologySpreadConstraints []v1.TopologySpreadConstraint `json:"topologySpreadConstraints,omitempty"`
 	// +optional
+	Labels map[string]string `json:"labels,omitempty"`
+	// +optional
 	Annotations map[string]string `json:"annotations,omitempty"`
 }
 
@@ -353,6 +357,8 @@ type BackendSpec struct {
 	// +optional
 	RedisTopologySpreadConstraints []v1.TopologySpreadConstraint `json:"redisTopologySpreadConstraints,omitempty"`
 	// +optional
+	RedisLabels map[string]string `json:"redisLabels,omitempty"`
+	// +optional
 	RedisAnnotations map[string]string `json:"redisAnnotations,omitempty"`
 
 	// +optional
@@ -382,6 +388,8 @@ type BackendListenerSpec struct {
 	// +optional
 	TopologySpreadConstraints []v1.TopologySpreadConstraint `json:"topologySpreadConstraints,omitempty"`
 	// +optional
+	Labels map[string]string `json:"labels,omitempty"`
+	// +optional
 	Annotations map[string]string `json:"annotations,omitempty"`
 }
 
@@ -399,6 +407,8 @@ type BackendWorkerSpec struct {
 	// +optional
 	TopologySpreadConstraints []v1.TopologySpreadConstraint `json:"topologySpreadConstraints,omitempty"`
 	// +optional
+	Labels map[string]string `json:"labels,omitempty"`
+	// +optional
 	Annotations map[string]string `json:"annotations,omitempty"`
 }
 
@@ -416,6 +426,8 @@ type BackendCronSpec struct {
 	// +optional
 	TopologySpreadConstraints []v1.TopologySpreadConstraint `json:"topologySpreadConstraints,omitempty"`
 	// +optional
+	Labels map[string]string `json:"labels,omitempty"`
+	// +optional
 	Annotations map[string]string `json:"annotations,omitempty"`
 }
 
@@ -437,6 +449,8 @@ type SystemSpec struct {
 	// +optional
 	MemcachedTopologySpreadConstraints []v1.TopologySpreadConstraint `json:"memcachedTopologySpreadConstraints,omitempty"`
 	// +optional
+	MemcachedLabels map[string]string `json:"memcachedLabels,omitempty"`
+	// +optional
 	MemcachedAnnotations map[string]string `json:"memcachedAnnotations,omitempty"`
 
 	// +optional
@@ -454,6 +468,8 @@ type SystemSpec struct {
 	// +optional
 	RedisTopologySpreadConstraints []v1.TopologySpreadConstraint `json:"redisTopologySpreadConstraints,omitempty"`
 	// +optional
+	RedisLabels map[string]string `json:"redisLabels,omitempty"`
+	// +optional
 	RedisAnnotations map[string]string `json:"redisAnnotations,omitempty"`
 
 	// TODO should this field be optional? We have different approaches in Kubernetes.
@@ -502,6 +518,8 @@ type SystemAppSpec struct {
 	// +optional
 	TopologySpreadConstraints []v1.TopologySpreadConstraint `json:"topologySpreadConstraints,omitempty"`
 	// +optional
+	Labels map[string]string `json:"labels,omitempty"`
+	// +optional
 	Annotations map[string]string `json:"annotations,omitempty"`
 }
 
@@ -519,6 +537,8 @@ type SystemSidekiqSpec struct {
 	// +optional
 	TopologySpreadConstraints []v1.TopologySpreadConstraint `json:"topologySpreadConstraints,omitempty"`
 	// +optional
+	Labels map[string]string `json:"labels,omitempty"`
+	// +optional
 	Annotations map[string]string `json:"annotations,omitempty"`
 }
 
@@ -538,6 +558,8 @@ type SystemSearchdSpec struct {
 	// +optional
 	TopologySpreadConstraints []v1.TopologySpreadConstraint `json:"topologySpreadConstraints,omitempty"`
 	// +optional
+	Labels map[string]string `json:"labels,omitempty"`
+	// +optional
 	Annotations map[string]string `json:"annotations,omitempty"`
 }
 
@@ -632,6 +654,8 @@ type SystemMySQLSpec struct {
 	// +optional
 	TopologySpreadConstraints []v1.TopologySpreadConstraint `json:"topologySpreadConstraints,omitempty"`
 	// +optional
+	Labels map[string]string `json:"labels,omitempty"`
+	// +optional
 	Annotations map[string]string `json:"annotations,omitempty"`
 }
 
@@ -652,6 +676,8 @@ type SystemPostgreSQLSpec struct {
 	// +optional
 	TopologySpreadConstraints []v1.TopologySpreadConstraint `json:"topologySpreadConstraints,omitempty"`
 	// +optional
+	Labels map[string]string `json:"labels,omitempty"`
+	// +optional
 	Annotations map[string]string `json:"annotations,omitempty"`
 }
 
@@ -679,6 +705,8 @@ type ZyncSpec struct {
 	// +optional
 	DatabaseTopologySpreadConstraints []v1.TopologySpreadConstraint `json:"databaseTopologySpreadConstraints,omitempty"`
 	// +optional
+	DatabaseLabels map[string]string `json:"databaseLabels,omitempty"`
+	// +optional
 	DatabaseAnnotations map[string]string `json:"databaseAnnotations,omitempty"`
 }
 
@@ -696,6 +724,8 @@ type ZyncAppSpec struct {
 	// +optional
 	TopologySpreadConstraints []v1.TopologySpreadConstraint `json:"topologySpreadConstraints,omitempty"`
 	// +optional
+	Labels map[string]string `json:"labels,omitempty"`
+	// +optional
 	Annotations map[string]string `json:"annotations,omitempty"`
 }
 
@@ -713,6 +743,8 @@ type ZyncQueSpec struct {
 	// +optional
 	TopologySpreadConstraints []v1.TopologySpreadConstraint `json:"topologySpreadConstraints,omitempty"`
 	// +optional
+	Labels map[string]string `json:"labels,omitempty"`
+	// +optional
 	Annotations map[string]string `json:"annotations,omitempty"`
 }