Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into fix-rbac
Browse files Browse the repository at this point in the history
  • Loading branch information
jscaltreto committed Feb 10, 2025
2 parents b712380 + 6885b61 commit 973c186
Show file tree
Hide file tree
Showing 39 changed files with 1,004 additions and 93 deletions.
8 changes: 8 additions & 0 deletions charts/datadog-crds/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

# 2.4.1

* Add DatadogGenericResources CRD.

# 2.4.0

* Update CRDs from Datadog Operator v1.12.0 tag.

# 2.3.0

* Update CRDs from Datadog Operator v1.11.0 tag.
Expand Down
2 changes: 1 addition & 1 deletion charts/datadog-crds/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
name: datadog-crds
description: Datadog Kubernetes CRDs chart
version: 2.3.0
version: 2.4.1
appVersion: "1"
keywords:
- monitoring
Expand Down
3 changes: 2 additions & 1 deletion charts/datadog-crds/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Datadog CRDs

![Version: 2.3.0](https://img.shields.io/badge/Version-2.3.0-informational?style=flat-square) ![AppVersion: 1](https://img.shields.io/badge/AppVersion-1-informational?style=flat-square)
![Version: 2.4.1](https://img.shields.io/badge/Version-2.4.1-informational?style=flat-square) ![AppVersion: 1](https://img.shields.io/badge/AppVersion-1-informational?style=flat-square)

This chart was designed to allow other "datadog" charts to share `CustomResourceDefinitions` such as the `DatadogMetric`.

Expand All @@ -25,6 +25,7 @@ But the recommended Kubernetes versions are `1.16+`.
| crds.datadogAgentProfiles | bool | `false` | Set to true to deploy the DatadogAgentProfiles CRD |
| crds.datadogAgents | bool | `false` | Set to true to deploy the DatadogAgents CRD |
| crds.datadogDashboards | bool | `false` | Set to true to deploy the DatadogDashboards CRD |
| crds.datadogGenericResources | bool | `false` | Set to true to deploy the DatadogGenericResources CRD |
| crds.datadogMetrics | bool | `false` | Set to true to deploy the DatadogMetrics CRD |
| crds.datadogMonitors | bool | `false` | Set to true to deploy the DatadogMonitors CRD |
| crds.datadogPodAutoscalers | bool | `false` | Set to true to deploy the DatadogPodAutoscalers CRD |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,12 @@ spec:
If not specified, the pod priority will be default or zero if there is no
default.
type: string
runtimeClassName:
description: |-
If specified, indicates the pod's RuntimeClass kubelet should use to run the pod.
If the named RuntimeClass does not exist, or the CRI cannot run the corresponding handler, the pod enters the Failed terminal phase.
If no runtimeClassName is specified, the default RuntimeHandler is used, which is equivalent to the behavior when the RuntimeClass feature is disabled.
type: string
updateStrategy:
description: |-
The deployment strategy to use to replace existing pods with new ones.
Expand Down
138 changes: 138 additions & 0 deletions charts/datadog-crds/templates/datadoghq.com_datadogagents_v1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,11 @@ spec:
type: boolean
failurePolicy:
type: string
kubernetesAdmissionEvents:
properties:
enabled:
type: boolean
type: object
mutateUnlabelled:
type: boolean
mutation:
Expand Down Expand Up @@ -708,6 +713,69 @@ spec:
scrubContainers:
type: boolean
type: object
otelCollector:
properties:
conf:
properties:
configData:
type: string
configMap:
properties:
items:
items:
properties:
key:
type: string
mode:
format: int32
type: integer
path:
type: string
required:
- key
- path
type: object
type: array
x-kubernetes-list-map-keys:
- key
x-kubernetes-list-type: map
name:
type: string
type: object
type: object
coreConfig:
properties:
enabled:
type: boolean
extensionTimeout:
type: integer
extensionURL:
type: string
type: object
enabled:
type: boolean
ports:
items:
properties:
containerPort:
format: int32
type: integer
hostIP:
type: string
hostPort:
format: int32
type: integer
name:
type: string
protocol:
default: TCP
type: string
required:
- containerPort
type: object
type: array
x-kubernetes-list-type: atomic
type: object
otlp:
properties:
receiver:
Expand Down Expand Up @@ -2444,6 +2512,8 @@ spec:
replicas:
format: int32
type: integer
runtimeClassName:
type: string
securityContext:
properties:
appArmorProfile:
Expand Down Expand Up @@ -3741,6 +3811,11 @@ spec:
type: boolean
failurePolicy:
type: string
kubernetesAdmissionEvents:
properties:
enabled:
type: boolean
type: object
mutateUnlabelled:
type: boolean
mutation:
Expand Down Expand Up @@ -4188,6 +4263,69 @@ spec:
scrubContainers:
type: boolean
type: object
otelCollector:
properties:
conf:
properties:
configData:
type: string
configMap:
properties:
items:
items:
properties:
key:
type: string
mode:
format: int32
type: integer
path:
type: string
required:
- key
- path
type: object
type: array
x-kubernetes-list-map-keys:
- key
x-kubernetes-list-type: map
name:
type: string
type: object
type: object
coreConfig:
properties:
enabled:
type: boolean
extensionTimeout:
type: integer
extensionURL:
type: string
type: object
enabled:
type: boolean
ports:
items:
properties:
containerPort:
format: int32
type: integer
hostIP:
type: string
hostPort:
format: int32
type: integer
name:
type: string
protocol:
default: TCP
type: string
required:
- containerPort
type: object
type: array
x-kubernetes-list-type: atomic
type: object
otlp:
properties:
receiver:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
{{- if and .Values.crds.datadogGenericResources (semverCompare ">1.21-0" .Capabilities.KubeVersion.GitVersion ) }}
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
name: datadoggenericresources.datadoghq.com
labels:
helm.sh/chart: '{{ include "datadog-crds.chart" . }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
app.kubernetes.io/name: '{{ include "datadog-crds.name" . }}'
app.kubernetes.io/instance: '{{ .Release.Name }}'
spec:
group: datadoghq.com
names:
kind: DatadogGenericResource
listKind: DatadogGenericResourceList
plural: datadoggenericresources
shortNames:
- ddgr
singular: datadoggenericresource
scope: Namespaced
versions:
- additionalPrinterColumns:
- jsonPath: .status.id
name: id
type: string
- jsonPath: .status.syncStatus
name: sync status
type: string
- jsonPath: .metadata.creationTimestamp
name: age
type: date
name: v1alpha1
schema:
openAPIV3Schema:
description: DatadogGenericResource is the Schema for the DatadogGenericResources API
properties:
apiVersion:
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
spec:
description: DatadogGenericResourceSpec defines the desired state of DatadogGenericResource
properties:
jsonSpec:
description: JsonSpec is the specification of the API object
type: string
type:
description: Type is the type of the API object
enum:
- notebook
- synthetics_api_test
- synthetics_browser_test
type: string
required:
- jsonSpec
- type
type: object
status:
description: DatadogGenericResourceStatus defines the observed state of DatadogGenericResource
properties:
conditions:
description: Conditions represents the latest available observations of the state of a DatadogGenericResource.
items:
description: Condition contains details for one aspect of the current state of this API Resource.
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.
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
created:
description: Created is the time the object was created.
format: date-time
type: string
creator:
description: Creator is the identity of the creator.
type: string
currentHash:
description: |-
CurrentHash tracks the hash of the current DatadogGenericResourceSpec to know
if the JsonSpec has changed and needs an update.
type: string
id:
description: Id is the object unique identifier generated in Datadog.
type: string
lastForceSyncTime:
description: LastForceSyncTime is the last time the API object was last force synced with the custom resource
format: date-time
type: string
syncStatus:
description: SyncStatus shows the health of syncing the object state to Datadog.
type: string
type: object
type: object
served: true
storage: true
subresources:
status: {}
{{- end }}
Loading

0 comments on commit 973c186

Please sign in to comment.