[WIP]Component versioning fix and e2e tests

design/one-pager-component-mutable-and-versioning.md

@@ -359,6 +359,34 @@ spec:
 
 Still, the `Traffic` trait should handle garbage collection things for the old workloads when no longer needed.
 
+#### Multiple revisions of one Component can exist together
+
+It's allowed to have multiple revisions of the same Component existing simultaneously.
+
+```yaml
+apiVersion: core.oam.dev/v1alpha2
+kind: ApplicationConfiguration
+metadata:
+  name: my-app-deployment
+  annotations:
+    version: v1.0.0
+    description: "Description of this deployment"
+spec:
+  components:
+    - revisionName: example-component-1
+      traits:
+        - apiversion:core.oam.dev/v1alpha2
+          kind: ManualScaler
+          spec:
+            replicaCount: 3
+    - revisionName: example-component-2
+      traits:
+        - apiversion:core.oam.dev/v1alpha2
+          kind: ManualScaler
+          spec:
+            replicaCount: 2
+```
+
 ## Example: A blue-green workflow
 
 Let's say we have a `Rollout` Trait with definition like below:

pkg/controller/v1alpha2/applicationconfiguration/component.go

@@ -144,7 +144,8 @@ func (c *ComponentHandler) createControllerRevision(mt metav1.Object, obj runtim
 	// set annotation to component
 	revision := appsv1.ControllerRevision{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: revisionName,
+			Name:      revisionName,
+			Namespace: curComp.Namespace,
 			OwnerReferences: []metav1.OwnerReference{
 				{
 					APIVersion: v1alpha2.SchemeGroupVersion.String(),

pkg/controller/v1alpha2/applicationconfiguration/render.go

@@ -149,7 +149,7 @@ func (r *components) renderComponent(ctx context.Context, acc v1alpha2.Applicati
 		traits = append(traits, &Trait{Object: *t})
 		traitDefs = append(traitDefs, *traitDef)
 	}
-	if err := SetWorkloadInstanceName(traitDefs, w, c); err != nil {
+	if err := SetWorkloadInstanceName(acc.RevisionName, traitDefs, w, c); err != nil {
 		return nil, err
 	}
 
@@ -212,12 +212,20 @@ func setTraitProperties(t *unstructured.Unstructured, traitName, namespace strin
 }
 
 // SetWorkloadInstanceName will set metadata.name for workload CR according to createRevision flag in traitDefinition
-func SetWorkloadInstanceName(traitDefs []v1alpha2.TraitDefinition, w *unstructured.Unstructured, c *v1alpha2.Component) error {
+func SetWorkloadInstanceName(revisionName string, traitDefs []v1alpha2.TraitDefinition, w *unstructured.Unstructured, c *v1alpha2.Component) error {
 	//Don't override the specified name
 	if w.GetName() != "" {
 		return nil
 	}
 	pv := fieldpath.Pave(w.UnstructuredContent())
+
+	// if specified revisionName assigned, use revisionName as the workload name
+	if revisionName != "" {
+		if err := pv.SetString(instanceNamePath, revisionName); err != nil {
+			return errors.Wrapf(err, errSetValueForField, instanceNamePath, revisionName)
+		}
+		return nil
+	}
 	if isRevisionEnabled(traitDefs) {
 		// if revisionEnabled, use revisionName as the workload name
 		if err := pv.SetString(instanceNamePath, c.Status.LatestRevision.Name); err != nil {

pkg/controller/v1alpha2/applicationconfiguration/render_test.go

@@ -255,7 +255,7 @@ func TestRenderComponents(t *testing.T) {
 						Workload: func() *unstructured.Unstructured {
 							w := &unstructured.Unstructured{}
 							w.SetNamespace(namespace)
-							w.SetName(componentName)
+							w.SetName(revisionName)
 							w.SetOwnerReferences([]metav1.OwnerReference{*ref})
 							return w
 						}(),
@@ -721,6 +721,7 @@ func TestGetCRDName(t *testing.T) {
 
 func TestSetWorkloadInstanceName(t *testing.T) {
 	tests := map[string]struct {
+		rName     string
 		traitDefs []v1alpha2.TraitDefinition
 		u         *unstructured.Unstructured
 		c         *v1alpha2.Component
@@ -742,6 +743,17 @@ func TestSetWorkloadInstanceName(t *testing.T) {
 			}},
 			reason: "workloadName should not change if already set",
 		},
+		"with a specified revisionName": {
+			rName: "specifiedRevisionName",
+			u:     &unstructured.Unstructured{Object: map[string]interface{}{}},
+			exp: &unstructured.Unstructured{Object: map[string]interface{}{
+				"metadata": map[string]interface{}{
+					"name": "specifiedRevisionName",
+				},
+			}},
+			expErr: nil,
+			reason: "workloadName should use specified revisionName if provide",
+		},
 		"revisionEnabled true, set revisionName": {
 			traitDefs: []v1alpha2.TraitDefinition{
 				{
@@ -795,9 +807,9 @@ func TestSetWorkloadInstanceName(t *testing.T) {
 	for name, ti := range tests {
 		t.Run(name, func(t *testing.T) {
 			if ti.expErr != nil {
-				assert.Equal(t, ti.expErr.Error(), SetWorkloadInstanceName(ti.traitDefs, ti.u, ti.c).Error())
+				assert.Equal(t, ti.expErr.Error(), SetWorkloadInstanceName(ti.rName, ti.traitDefs, ti.u, ti.c).Error())
 			} else {
-				err := SetWorkloadInstanceName(ti.traitDefs, ti.u, ti.c)
+				err := SetWorkloadInstanceName(ti.rName, ti.traitDefs, ti.u, ti.c)
 				assert.NoError(t, err)
 				assert.Equal(t, ti.exp, ti.u, ti.reason)
 			}