Skip to content

Commit

Permalink
[profile][CECO-795] Add dap status (#1155)
Browse files Browse the repository at this point in the history
* Add dap status

* Review suggestions

* Fix tests
  • Loading branch information
khewonc committed May 30, 2024
1 parent 0a3c6d4 commit d3c4ca5
Show file tree
Hide file tree
Showing 11 changed files with 1,389 additions and 393 deletions.
35 changes: 29 additions & 6 deletions apis/datadoghq/v1alpha1/datadogagentprofile_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,39 @@ type Container struct {
}

// DatadogAgentProfileStatus defines the observed state of DatadogAgentProfile
// +k8s:openapi-gen=true
type DatadogAgentProfileStatus struct {
// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
// Important: Run "make" to regenerate code after modifying this file
}
// LastUpdate is the last time the status was updated.
// +optional
LastUpdate *metav1.Time `json:"lastUpdate,omitempty"`

//+kubebuilder:object:root=true
//+kubebuilder:subresource:status
//+kubebuilder:resource:path=datadogagentprofiles,shortName=dap
// CurrentHash is the stored hash of the DatadogAgentProfile.
// +optional
CurrentHash string `json:"currentHash,omitempty"`

// Conditions represents the latest available observations of a DatadogAgentProfile's current state.
// +optional
// +listType=map
// +listMapKey=type
Conditions []metav1.Condition `json:"conditions"`

// Valid shows if the DatadogAgentProfile has a valid config spec.
// +optional
Valid metav1.ConditionStatus `json:"valid,omitempty"`

// Applied shows whether the DatadogAgentProfile conflicts with an existing DatadogAgentProfile.
// +optional
Applied metav1.ConditionStatus `json:"applied,omitempty"`
}

// DatadogAgentProfile is the Schema for the datadogagentprofiles API
// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
// +kubebuilder:resource:path=datadogagentprofiles,shortName=dap
// +kubebuilder:printcolumn:name="valid",type="string",JSONPath=".status.valid"
// +kubebuilder:printcolumn:name="applied",type="string",JSONPath=".status.applied"
// +kubebuilder:printcolumn:name="age",type="date",JSONPath=".metadata.creationTimestamp"
// +k8s:openapi-gen=true
type DatadogAgentProfile struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
13 changes: 12 additions & 1 deletion apis/datadoghq/v1alpha1/zz_generated.deepcopy.go

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

113 changes: 113 additions & 0 deletions apis/datadoghq/v1alpha1/zz_generated.openapi.go

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

73 changes: 72 additions & 1 deletion config/crd/bases/v1/datadoghq.com_datadogagentprofiles.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,17 @@ spec:
singular: datadogagentprofile
scope: Namespaced
versions:
- name: v1alpha1
- additionalPrinterColumns:
- jsonPath: .status.valid
name: valid
type: string
- jsonPath: .status.applied
name: applied
type: string
- jsonPath: .metadata.creationTimestamp
name: age
type: date
name: v1alpha1
schema:
openAPIV3Schema:
description: DatadogAgentProfile is the Schema for the datadogagentprofiles API
Expand Down Expand Up @@ -99,6 +109,67 @@ spec:
type: object
status:
description: DatadogAgentProfileStatus defines the observed state of DatadogAgentProfile
properties:
applied:
description: Applied shows whether the DatadogAgentProfile conflicts with an existing DatadogAgentProfile.
type: string
conditions:
description: Conditions represents the latest available observations of a DatadogAgentProfile's current state.
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, 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
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
currentHash:
description: CurrentHash is the stored hash of the DatadogAgentProfile.
type: string
lastUpdate:
description: LastUpdate is the last time the status was updated.
format: date-time
type: string
valid:
description: Valid shows if the DatadogAgentProfile has a valid config spec.
type: string
type: object
type: object
served: true
Expand Down
71 changes: 71 additions & 0 deletions config/crd/bases/v1beta1/datadoghq.com_datadogagentprofiles.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,16 @@ metadata:
creationTimestamp: null
name: datadogagentprofiles.datadoghq.com
spec:
additionalPrinterColumns:
- JSONPath: .status.valid
name: valid
type: string
- JSONPath: .status.applied
name: applied
type: string
- JSONPath: .metadata.creationTimestamp
name: age
type: date
group: datadoghq.com
names:
kind: DatadogAgentProfile
Expand Down Expand Up @@ -100,6 +110,67 @@ spec:
type: object
status:
description: DatadogAgentProfileStatus defines the observed state of DatadogAgentProfile
properties:
applied:
description: Applied shows whether the DatadogAgentProfile conflicts with an existing DatadogAgentProfile.
type: string
conditions:
description: Conditions represents the latest available observations of a DatadogAgentProfile's current state.
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, 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
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
currentHash:
description: CurrentHash is the stored hash of the DatadogAgentProfile.
type: string
lastUpdate:
description: LastUpdate is the last time the status was updated.
format: date-time
type: string
valid:
description: Valid shows if the DatadogAgentProfile has a valid config spec.
type: string
type: object
type: object
version: v1alpha1
Expand Down
Loading

0 comments on commit d3c4ca5

Please sign in to comment.