Skip to content

Commit

Permalink
run codegen
Browse files Browse the repository at this point in the history 
Signed-off-by: Kent Rancourt <[email protected]>
  • Loading branch information
@krancour
krancour committed Jan 7, 2025
1 parent 88bcdeb commit e8e2583
Show file tree
Hide file tree
Showing 11 changed files with 999 additions and 361 deletions.
6 changes: 3 additions & 3 deletions api/v1alpha1/freight_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ func (g *GitCommit) Equals(rhs *GitCommit) bool {
// FreightStatus describes a piece of Freight's most recently observed state.
type FreightStatus struct {
// CurrentlyIn describes the Stages in which this Freight is currently in use.
CurrentlyIn map[string]CurrentStage `json:"currentlyIn,omitempty"`
CurrentlyIn map[string]CurrentStage `json:"currentlyIn,omitempty" protobuf:"bytes,3,rep,name=currentlyIn" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
// VerifiedIn describes the Stages in which this Freight has been verified
// through promotion and subsequent health checks.
VerifiedIn map[string]VerifiedStage `json:"verifiedIn,omitempty" protobuf:"bytes,1,rep,name=verifiedIn" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
Expand All @@ -179,7 +179,7 @@ type CurrentStage struct {
// Since is the time at which the Stage most recently started using the
// Freight. This can be used to calculate how long the Freight has been in use
// by the Stage.
Since *metav1.Time `json:"since,omitempty"`
Since *metav1.Time `json:"since,omitempty" protobuf:"bytes,1,opt,name=since"`
}

// VerifiedStage describes a Stage in which Freight has been verified.
Expand All @@ -191,7 +191,7 @@ type VerifiedStage struct {
// Freight EXITS the Stage. If the Freight is currently in use by the Stage,
// the time elapsed since the Freight ENTERED the Stage is its current soak
// time, which may exceed the value of this field.
LongestCompletedSoak *metav1.Duration `json:"longestSoak,omitempty"`
LongestCompletedSoak *metav1.Duration `json:"longestSoak,omitempty" protobuf:"bytes,2,opt,name=longestSoak"`
}

// ApprovedStage describes a Stage for which Freight has been (manually)
Expand Down
1,038 changes: 752 additions & 286 deletions api/v1alpha1/generated.pb.go
View file

Large diffs are not rendered by default.

29 changes: 28 additions & 1 deletion api/v1alpha1/generated.proto
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 36 additions & 0 deletions api/v1alpha1/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 24 additions & 1 deletion charts/kargo/resources/crds/kargo.akuity.io_freights.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ spec:
name:
description: |-
Name is the name of the resource of the kind indicated by the Kind field
from which Freight may originated.
from which Freight may originate.
type: string
required:
- kind
Expand All @@ -187,11 +187,34 @@ spec:
might wish to promote a piece of Freight to a given Stage without
transiting the entire pipeline.
type: object
currentlyIn:
additionalProperties:
description: CurrentStage reflects a Stage's current use of Freight.
properties:
since:
description: |-
Since is the time at which the Stage most recently started using the
Freight. This can be used to calculate how long the Freight has been in use
by the Stage.
format: date-time
type: string
type: object
description: CurrentlyIn describes the Stages in which this Freight
is currently in use.
type: object
verifiedIn:
additionalProperties:
description: VerifiedStage describes a Stage in which Freight has
been verified.
properties:
longestSoak:
description: |-
LongestCompletedSoak represents the longest definite time interval wherein
the Freight was in CONTINUOUS use by the Stage. This value is updated as
Freight EXITS the Stage. If the Freight is currently in use by the Stage,
the time elapsed since the Freight ENTERED the Stage is its current soak
time, which may exceed the value of this field.
type: string
verifiedAt:
description: VerifiedAt is the time at which the Freight was
verified in the Stage.
Expand Down
4 changes: 2 additions & 2 deletions charts/kargo/resources/crds/kargo.akuity.io_promotions.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ spec:
name:
description: |-
Name is the name of the resource of the kind indicated by the Kind field
from which Freight may originated.
from which Freight may originate.
type: string
required:
- kind
Expand Down Expand Up @@ -441,7 +441,7 @@ spec:
name:
description: |-
Name is the name of the resource of the kind indicated by the Kind field
from which Freight may originated.
from which Freight may originate.
type: string
required:
- kind
Expand Down
24 changes: 16 additions & 8 deletions charts/kargo/resources/crds/kargo.akuity.io_stages.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ spec:
name:
description: |-
Name is the name of the resource of the kind indicated by the Kind field
from which Freight may originated.
from which Freight may originate.
type: string
required:
- kind
Expand All @@ -228,6 +228,14 @@ spec:
items:
type: string
type: array
verifiedFor:
description: |-
VerifiedFor specifies the duration for which the requested Freight must
have been verified in the upstream Stages before it can be considered
for promotion to this Stage. This is an optional field, and if not set,
the default value is "0s" (i.e. immediate promotion is allowed).
pattern: ^([0-9]+(\.[0-9]+)?(s|m|h))+$
type: string
type: object
required:
- origin
Expand Down Expand Up @@ -493,7 +501,7 @@ spec:
name:
description: |-
Name is the name of the resource of the kind indicated by the Kind field
from which Freight may originated.
from which Freight may originate.
type: string
required:
- kind
Expand Down Expand Up @@ -634,7 +642,7 @@ spec:
name:
description: |-
Name is the name of the resource of the kind indicated by the Kind field
from which Freight may originated.
from which Freight may originate.
type: string
required:
- kind
Expand Down Expand Up @@ -771,7 +779,7 @@ spec:
name:
description: |-
Name is the name of the resource of the kind indicated by the Kind field
from which Freight may originated.
from which Freight may originate.
type: string
required:
- kind
Expand Down Expand Up @@ -1069,7 +1077,7 @@ spec:
name:
description: |-
Name is the name of the resource of the kind indicated by the Kind field
from which Freight may originated.
from which Freight may originate.
type: string
required:
- kind
Expand Down Expand Up @@ -1310,7 +1318,7 @@ spec:
name:
description: |-
Name is the name of the resource of the kind indicated by the Kind field
from which Freight may originated.
from which Freight may originate.
type: string
required:
- kind
Expand Down Expand Up @@ -1451,7 +1459,7 @@ spec:
name:
description: |-
Name is the name of the resource of the kind indicated by the Kind field
from which Freight may originated.
from which Freight may originate.
type: string
required:
- kind
Expand Down Expand Up @@ -1588,7 +1596,7 @@ spec:
name:
description: |-
Name is the name of the resource of the kind indicated by the Kind field
from which Freight may originated.
from which Freight may originate.
type: string
required:
- kind
Expand Down
21 changes: 20 additions & 1 deletion ui/src/gen/schema/freights.kargo.akuity.io_v1alpha1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
"type": "string"
},
"name": {
"description": "Name is the name of the resource of the kind indicated by the Kind field\nfrom which Freight may originated.",
"description": "Name is the name of the resource of the kind indicated by the Kind field\nfrom which Freight may originate.",
"type": "string"
}
},
Expand Down Expand Up @@ -142,10 +142,29 @@
"description": "ApprovedFor describes the Stages for which this Freight has been approved\npreemptively/manually by a user. This is useful for hotfixes, where one\nmight wish to promote a piece of Freight to a given Stage without\ntransiting the entire pipeline.",
"type": "object"
},
"currentlyIn": {
"additionalProperties": {
"description": "CurrentStage reflects a Stage's current use of Freight.",
"properties": {
"since": {
"description": "Since is the time at which the Stage most recently started using the\nFreight. This can be used to calculate how long the Freight has been in use\nby the Stage.",
"format": "date-time",
"type": "string"
}
},
"type": "object"
},
"description": "CurrentlyIn describes the Stages in which this Freight is currently in use.",
"type": "object"
},
"verifiedIn": {
"additionalProperties": {
"description": "VerifiedStage describes a Stage in which Freight has been verified.",
"properties": {
"longestSoak": {
"description": "LongestCompletedSoak represents the longest definite time interval wherein\nthe Freight was in CONTINUOUS use by the Stage. This value is updated as\nFreight EXITS the Stage. If the Freight is currently in use by the Stage,\nthe time elapsed since the Freight ENTERED the Stage is its current soak\ntime, which may exceed the value of this field.",
"type": "string"
},
"verifiedAt": {
"description": "VerifiedAt is the time at which the Freight was verified in the Stage.",
"format": "date-time",
Expand Down
4 changes: 2 additions & 2 deletions ui/src/gen/schema/promotions.kargo.akuity.io_v1alpha1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@
"type": "string"
},
"name": {
"description": "Name is the name of the resource of the kind indicated by the Kind field\nfrom which Freight may originated.",
"description": "Name is the name of the resource of the kind indicated by the Kind field\nfrom which Freight may originate.",
"type": "string"
}
},
Expand Down Expand Up @@ -345,7 +345,7 @@
"type": "string"
},
"name": {
"description": "Name is the name of the resource of the kind indicated by the Kind field\nfrom which Freight may originated.",
"description": "Name is the name of the resource of the kind indicated by the Kind field\nfrom which Freight may originate.",
"type": "string"
}
},
Expand Down
Loading

0 comments on commit e8e2583

Please sign in to comment.