Skip to content

Commit

Permalink
Fix openAPI warning link to CRD definition (#367)
Browse files Browse the repository at this point in the history
  • Loading branch information
@clamoriniere
clamoriniere committed Aug 26, 2021
1 parent aa76649 commit c388bdc
Show file tree
Hide file tree
Showing 5 changed files with 85 additions and 44 deletions.
5 changes: 4 additions & 1 deletion api/v1alpha1/datadogagent_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ type LogCollectionConfig struct {
// Defaults to `/var/log/containers`
//
// +optional
ContainerSymlinksPath *string `json:"ContainerSymlinksPath,omitempty"`
ContainerSymlinksPath *string `json:"containerSymlinksPath,omitempty"`

// This path (always mounted from the host) is used by Datadog Agent to store information about processed log files.
// If the Datadog Agent is restarted, it starts tailing the log files immediately.
Expand Down Expand Up @@ -722,6 +722,9 @@ type ConfigDirSpec struct {
// ConfigMapName name of a ConfigMap used to mount a directory.
ConfigMapName string `json:"configMapName,omitempty"`
// items mapping between configMap data key and file path mount.
// +optional
// +listType=map
// +listMapKey=key
Items []corev1.KeyToPath `json:"items,omitempty"`
}

Expand Down
10 changes: 9 additions & 1 deletion api/v1alpha1/zz_generated.openapi.go
View file

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

70 changes: 50 additions & 20 deletions config/crd/bases/v1/datadoghq.com_datadogagents.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1088,6 +1088,9 @@ spec:
- path
type: object
type: array
x-kubernetes-list-map-keys:
- key
x-kubernetes-list-type: map
type: object
collectEvents:
description: 'Enables this to start event collection from
Expand Down Expand Up @@ -1142,6 +1145,9 @@ spec:
- path
type: object
type: array
x-kubernetes-list-map-keys:
- key
x-kubernetes-list-type: map
type: object
criSocket:
description: Configure the CRI Socket.
Expand Down Expand Up @@ -3942,11 +3948,6 @@ spec:
log:
description: Log Agent configuration
properties:
ContainerSymlinksPath:
description: Allows the log collection to use symbolic links
in this directory to validate container ID -> pod. Defaults
to `/var/log/containers`
type: string
containerCollectUsingFiles:
description: 'Collect logs from files in `/var/log/pods instead`
of using the container runtime API. Collecting logs from
Expand All @@ -3960,6 +3961,11 @@ spec:
runtime. See also: https://docs.datadoghq.com/agent/kubernetes/daemonset_setup/?tab=k8sfile#create-manifest
Defaults to `/var/lib/docker/containers`'
type: string
containerSymlinksPath:
description: Allows the log collection to use symbolic links
in this directory to validate container ID -> pod. Defaults
to `/var/log/containers`
type: string
enabled:
description: 'Enable this option to activate Datadog Agent
log collection. See also: https://docs.datadoghq.com/agent/basic_agent_usage/kubernetes/#log-collection-setup'
Expand Down Expand Up @@ -4295,6 +4301,9 @@ spec:
- path
type: object
type: array
x-kubernetes-list-map-keys:
- key
x-kubernetes-list-type: map
type: object
enabled:
description: Enables continuous compliance monitoring.
Expand Down Expand Up @@ -4493,6 +4502,9 @@ spec:
- path
type: object
type: array
x-kubernetes-list-map-keys:
- key
x-kubernetes-list-type: map
type: object
syscallMonitor:
description: Syscall monitor configuration.
Expand Down Expand Up @@ -5701,6 +5713,9 @@ spec:
- path
type: object
type: array
x-kubernetes-list-map-keys:
- key
x-kubernetes-list-type: map
type: object
env:
description: 'The Datadog Agent supports many environment
Expand Down Expand Up @@ -10608,11 +10623,6 @@ spec:
logCollection:
description: LogCollection configuration.
properties:
ContainerSymlinksPath:
description: Allows the log collection to use symbolic links
in this directory to validate container ID -> pod. Defaults
to `/var/log/containers`
type: string
containerCollectUsingFiles:
description: 'Collect logs from files in `/var/log/pods instead`
of using the container runtime API. Collecting logs from
Expand All @@ -10626,6 +10636,11 @@ spec:
runtime. See also: https://docs.datadoghq.com/agent/kubernetes/daemonset_setup/?tab=k8sfile#create-manifest
Defaults to `/var/lib/docker/containers`'
type: string
containerSymlinksPath:
description: Allows the log collection to use symbolic links
in this directory to validate container ID -> pod. Defaults
to `/var/log/containers`
type: string
enabled:
description: 'Enable this option to activate Datadog Agent
log collection. See also: https://docs.datadoghq.com/agent/basic_agent_usage/kubernetes/#log-collection-setup'
Expand Down Expand Up @@ -12001,6 +12016,9 @@ spec:
- path
type: object
type: array
x-kubernetes-list-map-keys:
- key
x-kubernetes-list-type: map
type: object
collectEvents:
description: 'Enables this to start event collection from
Expand Down Expand Up @@ -12057,6 +12075,9 @@ spec:
- path
type: object
type: array
x-kubernetes-list-map-keys:
- key
x-kubernetes-list-type: map
type: object
criSocket:
description: Configure the CRI Socket.
Expand Down Expand Up @@ -14965,11 +14986,6 @@ spec:
log:
description: Log Agent configuration
properties:
ContainerSymlinksPath:
description: Allows the log collection to use symbolic
links in this directory to validate container ID ->
pod. Defaults to `/var/log/containers`
type: string
containerCollectUsingFiles:
description: 'Collect logs from files in `/var/log/pods
instead` of using the container runtime API. Collecting
Expand All @@ -14983,6 +14999,11 @@ spec:
the Docker runtime. See also: https://docs.datadoghq.com/agent/kubernetes/daemonset_setup/?tab=k8sfile#create-manifest
Defaults to `/var/lib/docker/containers`'
type: string
containerSymlinksPath:
description: Allows the log collection to use symbolic
links in this directory to validate container ID ->
pod. Defaults to `/var/log/containers`
type: string
enabled:
description: 'Enable this option to activate Datadog Agent
log collection. See also: https://docs.datadoghq.com/agent/basic_agent_usage/kubernetes/#log-collection-setup'
Expand Down Expand Up @@ -15325,6 +15346,9 @@ spec:
- path
type: object
type: array
x-kubernetes-list-map-keys:
- key
x-kubernetes-list-type: map
type: object
enabled:
description: Enables continuous compliance monitoring.
Expand Down Expand Up @@ -15526,6 +15550,9 @@ spec:
- path
type: object
type: array
x-kubernetes-list-map-keys:
- key
x-kubernetes-list-type: map
type: object
syscallMonitor:
description: Syscall monitor configuration.
Expand Down Expand Up @@ -16771,6 +16798,9 @@ spec:
- path
type: object
type: array
x-kubernetes-list-map-keys:
- key
x-kubernetes-list-type: map
type: object
env:
description: 'The Datadog Agent supports many environment
Expand Down Expand Up @@ -21890,11 +21920,6 @@ spec:
logCollection:
description: LogCollection configuration.
properties:
ContainerSymlinksPath:
description: Allows the log collection to use symbolic
links in this directory to validate container ID ->
pod. Defaults to `/var/log/containers`
type: string
containerCollectUsingFiles:
description: 'Collect logs from files in `/var/log/pods
instead` of using the container runtime API. Collecting
Expand All @@ -21908,6 +21933,11 @@ spec:
the Docker runtime. See also: https://docs.datadoghq.com/agent/kubernetes/daemonset_setup/?tab=k8sfile#create-manifest
Defaults to `/var/lib/docker/containers`'
type: string
containerSymlinksPath:
description: Allows the log collection to use symbolic
links in this directory to validate container ID ->
pod. Defaults to `/var/log/containers`
type: string
enabled:
description: 'Enable this option to activate Datadog Agent
log collection. See also: https://docs.datadoghq.com/agent/basic_agent_usage/kubernetes/#log-collection-setup'
Expand Down
40 changes: 20 additions & 20 deletions config/crd/bases/v1beta1/datadoghq.com_datadogagents.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3816,11 +3816,6 @@ spec:
log:
description: Log Agent configuration
properties:
ContainerSymlinksPath:
description: Allows the log collection to use symbolic links
in this directory to validate container ID -> pod. Defaults
to `/var/log/containers`
type: string
containerCollectUsingFiles:
description: 'Collect logs from files in `/var/log/pods instead`
of using the container runtime API. Collecting logs from files
Expand All @@ -3834,6 +3829,11 @@ spec:
See also: https://docs.datadoghq.com/agent/kubernetes/daemonset_setup/?tab=k8sfile#create-manifest
Defaults to `/var/lib/docker/containers`'
type: string
containerSymlinksPath:
description: Allows the log collection to use symbolic links
in this directory to validate container ID -> pod. Defaults
to `/var/log/containers`
type: string
enabled:
description: 'Enable this option to activate Datadog Agent log
collection. See also: https://docs.datadoghq.com/agent/basic_agent_usage/kubernetes/#log-collection-setup'
Expand Down Expand Up @@ -10260,11 +10260,6 @@ spec:
logCollection:
description: LogCollection configuration.
properties:
ContainerSymlinksPath:
description: Allows the log collection to use symbolic links
in this directory to validate container ID -> pod. Defaults
to `/var/log/containers`
type: string
containerCollectUsingFiles:
description: 'Collect logs from files in `/var/log/pods instead`
of using the container runtime API. Collecting logs from files
Expand All @@ -10278,6 +10273,11 @@ spec:
See also: https://docs.datadoghq.com/agent/kubernetes/daemonset_setup/?tab=k8sfile#create-manifest
Defaults to `/var/lib/docker/containers`'
type: string
containerSymlinksPath:
description: Allows the log collection to use symbolic links
in this directory to validate container ID -> pod. Defaults
to `/var/log/containers`
type: string
enabled:
description: 'Enable this option to activate Datadog Agent log
collection. See also: https://docs.datadoghq.com/agent/basic_agent_usage/kubernetes/#log-collection-setup'
Expand Down Expand Up @@ -14480,11 +14480,6 @@ spec:
log:
description: Log Agent configuration
properties:
ContainerSymlinksPath:
description: Allows the log collection to use symbolic links
in this directory to validate container ID -> pod. Defaults
to `/var/log/containers`
type: string
containerCollectUsingFiles:
description: 'Collect logs from files in `/var/log/pods
instead` of using the container runtime API. Collecting
Expand All @@ -14498,6 +14493,11 @@ spec:
Docker runtime. See also: https://docs.datadoghq.com/agent/kubernetes/daemonset_setup/?tab=k8sfile#create-manifest
Defaults to `/var/lib/docker/containers`'
type: string
containerSymlinksPath:
description: Allows the log collection to use symbolic links
in this directory to validate container ID -> pod. Defaults
to `/var/log/containers`
type: string
enabled:
description: 'Enable this option to activate Datadog Agent
log collection. See also: https://docs.datadoghq.com/agent/basic_agent_usage/kubernetes/#log-collection-setup'
Expand Down Expand Up @@ -21169,11 +21169,6 @@ spec:
logCollection:
description: LogCollection configuration.
properties:
ContainerSymlinksPath:
description: Allows the log collection to use symbolic links
in this directory to validate container ID -> pod. Defaults
to `/var/log/containers`
type: string
containerCollectUsingFiles:
description: 'Collect logs from files in `/var/log/pods
instead` of using the container runtime API. Collecting
Expand All @@ -21187,6 +21182,11 @@ spec:
Docker runtime. See also: https://docs.datadoghq.com/agent/kubernetes/daemonset_setup/?tab=k8sfile#create-manifest
Defaults to `/var/lib/docker/containers`'
type: string
containerSymlinksPath:
description: Allows the log collection to use symbolic links
in this directory to validate container ID -> pod. Defaults
to `/var/log/containers`
type: string
enabled:
description: 'Enable this option to activate Datadog Agent
log collection. See also: https://docs.datadoghq.com/agent/basic_agent_usage/kubernetes/#log-collection-setup'
Expand Down

0 comments on commit c388bdc

Please sign in to comment.