add CurrentWorkingRevision flag in workload status

Signed-off-by: 天元 <jianbo.sjb@alibaba-inc.com>
crossplane · Sep 2, 2020 · 2beaae7 · 2beaae7
1 parent f8b539c
commit 2beaae7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/apis/core/v1alpha2/core_types.go b/apis/core/v1alpha2/core_types.go
@@ -364,6 +364,9 @@ type WorkloadStatus struct {
 	// if it needs a single place to summarize the entire status of the workload
 	Status string `json:"status,omitempty"`
 
+	// HistoryWorkingRevision is a flag showing if it's history revision but still working
+	HistoryWorkingRevision bool `json:"currentWorkingRevision,omitempty"`
+
 	// ComponentName that produced this workload.
 	ComponentName string `json:"componentName,omitempty"`
 

diff --git a/charts/oam-kubernetes-runtime/crds/core.oam.dev_applicationconfigurations.yaml b/charts/oam-kubernetes-runtime/crds/core.oam.dev_applicationconfigurations.yaml
@@ -385,6 +385,10 @@ spec:
                     componentRevisionName:
                       description: ComponentRevisionName of current component
                       type: string
+                    currentWorkingRevision:
+                      description: HistoryWorkingRevision is a flag showing if it's
+                        history revision but still working
+                      type: boolean
                     scopes:
                       description: Scopes associated with this workload.
                       items:

diff --git a/pkg/controller/v1alpha2/applicationconfiguration/applicationconfiguration.go b/pkg/controller/v1alpha2/applicationconfiguration/applicationconfiguration.go
@@ -333,8 +333,9 @@ func (r *OAMApplicationReconciler) updateStatus(ctx context.Context, ac *v1alpha
 			// These workload exists means the component is under progress of rollout
 			// Trait will not work for these remaining workload
 			revisionStatus = append(revisionStatus, v1alpha2.WorkloadStatus{
-				ComponentName:         w.ComponentName,
-				ComponentRevisionName: v.GetName(),
+				ComponentName:          w.ComponentName,
+				ComponentRevisionName:  v.GetName(),
+				HistoryWorkingRevision: true,
 				Reference: v1alpha1.TypedReference{
 					APIVersion: v.GetAPIVersion(),
 					Kind:       v.GetKind(),

diff --git a/test/e2e-test/component_version_test.go b/test/e2e-test/component_version_test.go
@@ -390,7 +390,9 @@ var _ = Describe("Versioning mechanism of components", func() {
 
 			Expect(len(appconfig.Status.Workloads)).Should(BeEquivalentTo(2))
 			Expect(appconfig.Status.Workloads[0].ComponentRevisionName).Should(BeEquivalentTo(revisionNameV2))
+			Expect(appconfig.Status.Workloads[0].HistoryWorkingRevision).Should(BeEquivalentTo(false))
 			Expect(appconfig.Status.Workloads[1].ComponentRevisionName).Should(BeEquivalentTo(revisionNameV1))
+			Expect(appconfig.Status.Workloads[1].HistoryWorkingRevision).Should(BeEquivalentTo(true))
 
 			//Clean
 			k8sClient.Delete(ctx, &appconfig)