Skip to content

Commit

Permalink
Merge pull request konflux-ci#292 from johnbieren/rhtaprel278_api
Browse files Browse the repository at this point in the history 
feat(RHTAPREL-278): add status fields to RPs and RPAs
  • Loading branch information
@johnbieren
johnbieren authored Nov 9, 2023
2 parents 0f13691 + 78d0ad1 commit aabaf9f
Show file tree
Hide file tree
Showing 5 changed files with 193 additions and 5 deletions.
9 changes: 9 additions & 0 deletions api/v1alpha1/releaseplan_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,15 @@ type ReleasePlanSpec struct {

// ReleasePlanStatus defines the observed state of ReleasePlan.
type ReleasePlanStatus struct {
// Conditions represent the latest available observations for the releasePlan
// +optional
Conditions []metav1.Condition `json:"conditions"`

// ReleasePlanAdmission contains the namespaced name of the releasePlanAdmission this ReleasePlan is
// matched to
// +kubebuilder:validation:Pattern=^[a-z0-9]([-a-z0-9]*[a-z0-9])?\/[a-z0-9]([-a-z0-9]*[a-z0-9])?$
// +optional
ReleasePlanAdmission string `json:"releasePlanAdmission,omitempty"`
}

// +kubebuilder:object:root=true
Expand Down
9 changes: 8 additions & 1 deletion api/v1alpha1/releaseplanadmission_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

// ReleasePlanAdmissionSpec defines the desired state of ReleasePlanAdmission.
type ReleasePlanAdmissionSpec struct {
// Applications is a list of references to application to be released in the managed namespace
// Applications is a list of references to applications to be released in the managed namespace
// +required
Applications []string `json:"applications"`

Expand Down Expand Up @@ -61,6 +61,13 @@ type ReleasePlanAdmissionSpec struct {

// ReleasePlanAdmissionStatus defines the observed state of ReleasePlanAdmission.
type ReleasePlanAdmissionStatus struct {
// Conditions represent the latest available observations for the releasePlanAdmission
// +optional
Conditions []metav1.Condition `json:"conditions"`

// ReleasePlan is a list of references to releasePlans matched to the ReleasePlanAdmission
// +optional
ReleasePlans []string `json:"releasePlans"`
}

// +kubebuilder:object:root=true
Expand Down
23 changes: 21 additions & 2 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.

81 changes: 79 additions & 2 deletions config/crd/bases/appstudio.redhat.com_releaseplanadmissions.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ spec:
description: ReleasePlanAdmissionSpec defines the desired state of ReleasePlanAdmission.
properties:
applications:
description: Applications is a list of references to application to
be released in the managed namespace
description: Applications is a list of references to applications
to be released in the managed namespace
items:
type: string
type: array
Expand Down Expand Up @@ -116,6 +116,83 @@ spec:
status:
description: ReleasePlanAdmissionStatus defines the observed state of
ReleasePlanAdmission.
properties:
conditions:
description: Conditions represent the latest available observations
for the releasePlanAdmission
items:
description: "Condition contains details for one aspect of the current
state of this API Resource. --- This struct is intended for direct
use as an array at the field path .status.conditions. For example,
\n type FooStatus struct{ // Represents the observations of a
foo's current state. // Known .status.conditions.type are: \"Available\",
\"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
// +listType=map // +listMapKey=type Conditions []metav1.Condition
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
properties:
lastTransitionTime:
description: lastTransitionTime is the last time the condition
transitioned from one status to another. This should be when
the underlying condition changed. If that is not known, then
using the time when the API field changed is acceptable.
format: date-time
type: string
message:
description: message is a human readable message indicating
details about the transition. This may be an empty string.
maxLength: 32768
type: string
observedGeneration:
description: observedGeneration represents the .metadata.generation
that the condition was set based upon. For instance, if .metadata.generation
is currently 12, but the .status.conditions[x].observedGeneration
is 9, the condition is out of date with respect to the current
state of the instance.
format: int64
minimum: 0
type: integer
reason:
description: reason contains a programmatic identifier indicating
the reason for the condition's last transition. Producers
of specific condition types may define expected values and
meanings for this field, and whether the values are considered
a guaranteed API. The value should be a CamelCase string.
This field may not be empty.
maxLength: 1024
minLength: 1
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
type: string
status:
description: status of the condition, one of True, False, Unknown.
enum:
- "True"
- "False"
- Unknown
type: string
type:
description: type of condition in CamelCase or in foo.example.com/CamelCase.
--- Many .condition.type values are consistent across resources
like Available, but because arbitrary conditions can be useful
(see .node.status.conditions), the ability to deconflict is
important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
maxLength: 316
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
required:
- lastTransitionTime
- message
- reason
- status
- type
type: object
type: array
releasePlans:
description: ReleasePlan is a list of references to releasePlans matched
to the ReleasePlanAdmission
items:
type: string
type: array
type: object
type: object
served: true
Expand Down
76 changes: 76 additions & 0 deletions config/crd/bases/appstudio.redhat.com_releaseplans.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,82 @@ spec:
type: object
status:
description: ReleasePlanStatus defines the observed state of ReleasePlan.
properties:
conditions:
description: Conditions represent the latest available observations
for the releasePlan
items:
description: "Condition contains details for one aspect of the current
state of this API Resource. --- This struct is intended for direct
use as an array at the field path .status.conditions. For example,
\n type FooStatus struct{ // Represents the observations of a
foo's current state. // Known .status.conditions.type are: \"Available\",
\"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
// +listType=map // +listMapKey=type Conditions []metav1.Condition
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
properties:
lastTransitionTime:
description: lastTransitionTime is the last time the condition
transitioned from one status to another. This should be when
the underlying condition changed. If that is not known, then
using the time when the API field changed is acceptable.
format: date-time
type: string
message:
description: message is a human readable message indicating
details about the transition. This may be an empty string.
maxLength: 32768
type: string
observedGeneration:
description: observedGeneration represents the .metadata.generation
that the condition was set based upon. For instance, if .metadata.generation
is currently 12, but the .status.conditions[x].observedGeneration
is 9, the condition is out of date with respect to the current
state of the instance.
format: int64
minimum: 0
type: integer
reason:
description: reason contains a programmatic identifier indicating
the reason for the condition's last transition. Producers
of specific condition types may define expected values and
meanings for this field, and whether the values are considered
a guaranteed API. The value should be a CamelCase string.
This field may not be empty.
maxLength: 1024
minLength: 1
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
type: string
status:
description: status of the condition, one of True, False, Unknown.
enum:
- "True"
- "False"
- Unknown
type: string
type:
description: type of condition in CamelCase or in foo.example.com/CamelCase.
--- Many .condition.type values are consistent across resources
like Available, but because arbitrary conditions can be useful
(see .node.status.conditions), the ability to deconflict is
important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
maxLength: 316
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
required:
- lastTransitionTime
- message
- reason
- status
- type
type: object
type: array
releasePlanAdmission:
description: ReleasePlanAdmission contains the namespaced name of
the releasePlanAdmission this ReleasePlan is matched to
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?\/[a-z0-9]([-a-z0-9]*[a-z0-9])?$
type: string
type: object
type: object
served: true
Expand Down

0 comments on commit aabaf9f

Please sign in to comment.