openkruise
/
rollouts
mirror of https://github.com/openkruise/rollouts.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update merge annotation for rollouts apis 

Signed-off-by: ricky <yricky509@gmail.com>
This commit is contained in:
ricky 2023-09-05 18:52:14 +08:00
parent 76d33b830a
commit d065f4d423
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/v1alpha1/batchrelease_plan_types.go
View File

@ -78,7 +78,9 @@ type ReleaseBatch struct {
// BatchReleaseStatus defines the observed state of a release plan
type BatchReleaseStatus struct {
// Conditions represents the observed process state of each phase during executing the release plan.
Conditions []RolloutCondition `json:"conditions,omitempty"`
// +patchMergeKey=type
// +patchStrategy=merge
Conditions []RolloutCondition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"`
// CanaryStatus describes the state of the canary rollout.
CanaryStatus BatchReleaseCanaryStatus `json:"canaryStatus,omitempty"`
// StableRevision is the pod-template-hash of stable revision pod template.

4
api/v1alpha1/rollout_types.go
View File

@ -167,8 +167,10 @@ type RolloutStatus struct {
// +optional
CanaryStatus *CanaryStatus `json:"canaryStatus,omitempty"`
// Conditions a list of conditions a rollout can have.
// +patchMergeKey=type
// +patchStrategy=merge
// +optional
Conditions []RolloutCondition `json:"conditions,omitempty"`
Conditions []RolloutCondition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"`
// +optional
//BlueGreenStatus *BlueGreenStatus `json:"blueGreenStatus,omitempty"`
// Phase is the rollout phase.