Merge pull request kurator-dev#562 from LiZhenCheng9527/app-api-rollo…

…utstatus fix incorrect expression of rolloutStatus
LiZhenCheng9527 · Jan 12, 2024 · ab41efe · ab41efe
2 parents a96200d + d1f755d
commit ab41efe
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/docs/content/en/references/apps_v1alpha1_types.html b/docs/content/en/references/apps_v1alpha1_types.html
@@ -1919,7 +1919,7 @@ <h3 id="apps.kurator.dev/v1alpha1.RolloutStatus">RolloutStatus
 </tr>
 <tr>
 <td>
-<code>backupNameInCluster</code><br>
+<code>rolloutNameInCluster</code><br>
 <em>
 string
 </em>
@@ -1931,7 +1931,7 @@ <h3 id="apps.kurator.dev/v1alpha1.RolloutStatus">RolloutStatus
 </tr>
 <tr>
 <td>
-<code>backupStatusInCluster</code><br>
+<code>rolloutStatusInCluster</code><br>
 <em>
 github.com/fluxcd/flagger/pkg/apis/flagger/v1beta1.CanaryStatus
 </em>

diff --git a/manifests/charts/fleet-manager/crds/apps.kurator.dev_applications.yaml b/manifests/charts/fleet-manager/crds/apps.kurator.dev_applications.yaml
@@ -2683,11 +2683,15 @@ spec:
                     rolloutStatus:
                       description: RolloutStatus defines the observed state of Rollout.
                       properties:
-                        backupNameInCluster:
+                        clusterName:
+                          description: ClusterName is the Name of the cluster where
+                            the rollout is being performed.
+                          type: string
+                        rolloutNameInCluster:
                           description: RolloutNameInCluster is the name of the rollout
                             being performed within this cluster.
                           type: string
-                        backupStatusInCluster:
+                        rolloutStatusInCluster:
                           description: RolloutStatusInCluster is the current status
                             of the Rollout performed within this cluster.
                           properties:
@@ -2753,10 +2757,6 @@ spec:
                           - iterations
                           - phase
                           type: object
-                        clusterName:
-                          description: ClusterName is the Name of the cluster where
-                            the rollout is being performed.
-                          type: string
                       type: object
                   type: object
                 type: array

diff --git a/pkg/apis/apps/v1alpha1/types.go b/pkg/apis/apps/v1alpha1/types.go
@@ -461,11 +461,11 @@ type RolloutStatus struct {
 
 	// RolloutNameInCluster is the name of the rollout being performed within this cluster.
 	// +optional
-	RolloutNameInCluster string `json:"backupNameInCluster,omitempty"`
+	RolloutNameInCluster string `json:"rolloutNameInCluster,omitempty"`
 
 	// RolloutStatusInCluster is the current status of the Rollout performed within this cluster.
 	// +optional
-	RolloutStatusInCluster *flaggerv1b1.CanaryStatus `json:"backupStatusInCluster,omitempty"`
+	RolloutStatusInCluster *flaggerv1b1.CanaryStatus `json:"rolloutStatusInCluster,omitempty"`
 }
 
 // ApplicationList contains a list of Application.