controller: change default flavor apply order

tsuru · Jan 22, 2024 · 25278c0 · 25278c0
1 parent fdb8873
commit 25278c0
Show file tree

Hide file tree

Showing 2 changed files with 104 additions and 6 deletions.
diff --git a/controllers/controller.go b/controllers/controller.go
@@ -174,6 +174,12 @@ func (r *RpaasInstanceReconciler) mergeInstanceWithFlavors(ctx context.Context,
 		return nil, err
 	}
 
+	for _, defaultFlavor := range defaultFlavors {
+		if err := mergeInstanceWithFlavor(instance, defaultFlavor); err != nil {
+			return nil, err
+		}
+	}
+
 	for _, flavorName := range instance.Spec.Flavors {
 		flavorObjectKey := types.NamespacedName{
 			Name:      flavorName,
@@ -198,12 +204,6 @@ func (r *RpaasInstanceReconciler) mergeInstanceWithFlavors(ctx context.Context,
 		}
 	}
 
-	for _, defaultFlavor := range defaultFlavors {
-		if err := mergeInstanceWithFlavor(instance, defaultFlavor); err != nil {
-			return nil, err
-		}
-	}
-
 	return instance, nil
 }
 

diff --git a/controllers/controller_test.go b/controllers/controller_test.go
@@ -649,6 +649,104 @@ func TestReconcileRpaasInstance_getRpaasInstance(t *testing.T) {
 				return i
 			},
 		},
+
+		"when there are multiple flavors and one of them is default": {
+			resources: []runtime.Object{
+				&v1alpha1.RpaasFlavor{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "default",
+						Namespace: "default",
+					},
+					Spec: v1alpha1.RpaasFlavorSpec{
+						Default: true,
+						InstanceTemplate: &v1alpha1.RpaasInstanceSpec{
+							Service: &nginxv1alpha1.NginxService{
+								Annotations: map[string]string{
+									"rpaas.extensions.tsuru.io/custom-annotation-svc": "custom svc annotation",
+								},
+							},
+
+							PodTemplate: nginxv1alpha1.NginxPodTemplateSpec{
+								ServiceAccountName: "my-service-account",
+								Annotations: map[string]string{
+									"prometheus.io/path": "/status",
+								},
+							},
+						},
+					},
+				},
+				&v1alpha1.RpaasFlavor{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "flavor-a",
+						Namespace: "default",
+					},
+					Spec: v1alpha1.RpaasFlavorSpec{
+						InstanceTemplate: &v1alpha1.RpaasInstanceSpec{
+							PodTemplate: nginxv1alpha1.NginxPodTemplateSpec{
+								Annotations: map[string]string{
+									"logging.tsuru.io/sample": "0.5",
+								},
+							},
+						},
+					},
+				},
+				&v1alpha1.RpaasFlavor{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "flavor-b",
+						Namespace: "default",
+					},
+					Spec: v1alpha1.RpaasFlavorSpec{
+						InstanceTemplate: &v1alpha1.RpaasInstanceSpec{
+							PodTemplate: nginxv1alpha1.NginxPodTemplateSpec{
+								ServiceAccountName: "flavor-b-service-account",
+							},
+							Ingress: &nginxv1alpha1.NginxIngress{
+								Annotations: map[string]string{
+									"ingress.tsuru.io": "flavor-b",
+								},
+							},
+						},
+					},
+				},
+				&v1alpha1.RpaasFlavor{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "flavor-c",
+						Namespace: "default",
+					},
+					Spec: v1alpha1.RpaasFlavorSpec{
+						InstanceTemplate: &v1alpha1.RpaasInstanceSpec{
+							PodTemplate: nginxv1alpha1.NginxPodTemplateSpec{
+								ServiceAccountName: "flavor-c-service-account",
+							},
+						},
+					},
+				},
+			},
+			instance: func(i *v1alpha1.RpaasInstance) *v1alpha1.RpaasInstance {
+				i.Spec.Flavors = []string{"flavor-a", "flavor-b", "flavor-c"}
+				return i
+			},
+			expected: func(i *v1alpha1.RpaasInstance) *v1alpha1.RpaasInstance {
+				i.Spec.Service = &nginxv1alpha1.NginxService{
+					Annotations: map[string]string{
+						"rpaas.extensions.tsuru.io/custom-annotation-svc": "custom svc annotation",
+					},
+				}
+				i.Spec.PodTemplate = nginxv1alpha1.NginxPodTemplateSpec{
+					ServiceAccountName: "flavor-c-service-account",
+					Annotations: map[string]string{
+						"prometheus.io/path":      "/status",
+						"logging.tsuru.io/sample": "0.5",
+					},
+				}
+				i.Spec.Ingress = &nginxv1alpha1.NginxIngress{
+					Annotations: map[string]string{
+						"ingress.tsuru.io": "flavor-b",
+					},
+				}
+				return i
+			},
+		},
 	}
 
 	for name, tt := range tests {