Skip to content

Commit 876d472

Browse files
OverOrionOverOrion
authored
Merge pull request #16 from kube-logging/minor-fixes
fix(test): fix typos, missing exporters from conf gen test
2 parents bc083af + 08962bb commit 876d472

File tree

7 files changed

+169
-141
lines changed

7 files changed

+169
-141
lines changed

‎config/crd/bases/telemetry.kube-logging.dev_collectors.yaml

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.13.0
6+
controller-gen.kubebuilder.io/version: v0.14.0
77
name: collectors.telemetry.kube-logging.dev
88
spec:
99
group: telemetry.kube-logging.dev
@@ -24,14 +24,19 @@ spec:
2424
description: Collector is the Schema for the collectors API
2525
properties:
2626
apiVersion:
27-
description: 'APIVersion defines the versioned schema of this representation
28-
of an object. Servers should convert recognized schemas to the latest
29-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
27+
description: |-
28+
APIVersion defines the versioned schema of this representation of an object.
29+
Servers should convert recognized schemas to the latest internal value, and
30+
may reject unrecognized values.
31+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
3032
type: string
3133
kind:
32-
description: 'Kind is a string value representing the REST resource this
33-
object represents. Servers may infer this from the endpoint the client
34-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
34+
description: |-
35+
Kind is a string value representing the REST resource this object represents.
36+
Servers may infer this from the endpoint the client submits requests to.
37+
Cannot be updated.
38+
In CamelCase.
39+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3540
type: string
3641
metadata:
3742
type: object
@@ -41,33 +46,33 @@ spec:
4146
controlNamespace:
4247
type: string
4348
tenantSelector:
44-
description: A label selector is a label query over a set of resources.
45-
The result of matchLabels and matchExpressions are ANDed. An empty
46-
label selector matches all objects. A null label selector matches
47-
no objects.
49+
description: |-
50+
A label selector is a label query over a set of resources. The result of matchLabels and
51+
matchExpressions are ANDed. An empty label selector matches all objects. A null
52+
label selector matches no objects.
4853
properties:
4954
matchExpressions:
5055
description: matchExpressions is a list of label selector requirements.
5156
The requirements are ANDed.
5257
items:
53-
description: A label selector requirement is a selector that
54-
contains values, a key, and an operator that relates the key
55-
and values.
58+
description: |-
59+
A label selector requirement is a selector that contains values, a key, and an operator that
60+
relates the key and values.
5661
properties:
5762
key:
5863
description: key is the label key that the selector applies
5964
to.
6065
type: string
6166
operator:
62-
description: operator represents a key's relationship to
63-
a set of values. Valid operators are In, NotIn, Exists
64-
and DoesNotExist.
67+
description: |-
68+
operator represents a key's relationship to a set of values.
69+
Valid operators are In, NotIn, Exists and DoesNotExist.
6570
type: string
6671
values:
67-
description: values is an array of string values. If the
68-
operator is In or NotIn, the values array must be non-empty.
69-
If the operator is Exists or DoesNotExist, the values
70-
array must be empty. This array is replaced during a strategic
72+
description: |-
73+
values is an array of string values. If the operator is In or NotIn,
74+
the values array must be non-empty. If the operator is Exists or DoesNotExist,
75+
the values array must be empty. This array is replaced during a strategic
7176
merge patch.
7277
items:
7378
type: string
@@ -80,11 +85,10 @@ spec:
8085
matchLabels:
8186
additionalProperties:
8287
type: string
83-
description: matchLabels is a map of {key,value} pairs. A single
84-
{key,value} in the matchLabels map is equivalent to an element
85-
of matchExpressions, whose key field is "key", the operator
86-
is "In", and the values array contains only "value". The requirements
87-
are ANDed.
88+
description: |-
89+
matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
90+
map is equivalent to an element of matchExpressions, whose key field is "key", the
91+
operator is "In", and the values array contains only "value". The requirements are ANDed.
8892
type: object
8993
type: object
9094
x-kubernetes-map-type: atomic

‎config/crd/bases/telemetry.kube-logging.dev_oteloutputs.yaml

Lines changed: 68 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.13.0
6+
controller-gen.kubebuilder.io/version: v0.14.0
77
name: oteloutputs.telemetry.kube-logging.dev
88
spec:
99
group: telemetry.kube-logging.dev
@@ -20,14 +20,19 @@ spec:
2020
description: OtelOutput is the Schema for the oteloutputs API
2121
properties:
2222
apiVersion:
23-
description: 'APIVersion defines the versioned schema of this representation
24-
of an object. Servers should convert recognized schemas to the latest
25-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
23+
description: |-
24+
APIVersion defines the versioned schema of this representation of an object.
25+
Servers should convert recognized schemas to the latest internal value, and
26+
may reject unrecognized values.
27+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2628
type: string
2729
kind:
28-
description: 'Kind is a string value representing the REST resource this
29-
object represents. Servers may infer this from the endpoint the client
30-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
30+
description: |-
31+
Kind is a string value representing the REST resource this object represents.
32+
Servers may infer this from the endpoint the client submits requests to.
33+
Cannot be updated.
34+
In CamelCase.
35+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3136
type: string
3237
metadata:
3338
type: object
@@ -42,56 +47,61 @@ spec:
4247
description: Auth configuration for outgoing RPCs.
4348
type: string
4449
authority:
45-
description: WithAuthority parameter configures client to rewrite
46-
":authority" header (godoc.org/google.golang.org/grpc#WithAuthority)
50+
description: |-
51+
WithAuthority parameter configures client to rewrite ":authority" header
52+
(godoc.org/google.golang.org/grpc#WithAuthority)
4753
type: string
4854
balancer_name:
49-
description: Sets the balancer in grpclb_policy to discover the
50-
servers. Default is pick_first. https://github.com/grpc/grpc-go/blob/master/examples/features/load_balancing/README.md
55+
description: |-
56+
Sets the balancer in grpclb_policy to discover the servers. Default is pick_first.
57+
https://github.com/grpc/grpc-go/blob/master/examples/features/load_balancing/README.md
5158
type: string
5259
compression:
5360
description: The compression key for supported compression types
5461
within collector.
5562
type: string
5663
endpoint:
57-
description: The target to which the exporter is going to send
58-
traces or metrics, using the gRPC protocol. The valid syntax
59-
is described at https://github.com/grpc/grpc/blob/master/doc/naming.md.
64+
description: |-
65+
The target to which the exporter is going to send traces or metrics,
66+
using the gRPC protocol. The valid syntax is described at
67+
https://github.com/grpc/grpc/blob/master/doc/naming.md.
6068
type: string
6169
headers:
6270
additionalProperties:
6371
type: string
6472
description: The headers associated with gRPC requests.
6573
type: object
6674
keepalive:
67-
description: The keepalive parameters for gRPC client. See grpc.WithKeepaliveParams.
75+
description: |-
76+
The keepalive parameters for gRPC client. See grpc.WithKeepaliveParams.
6877
(https://godoc.org/google.golang.org/grpc#WithKeepaliveParams).
6978
properties:
7079
permit_without_stream:
7180
type: boolean
7281
time:
73-
description: A Duration represents the elapsed time between
74-
two instants as an int64 nanosecond count. The representation
75-
limits the largest representable duration to approximately
76-
290 years.
82+
description: |-
83+
A Duration represents the elapsed time between two instants
84+
as an int64 nanosecond count. The representation limits the
85+
largest representable duration to approximately 290 years.
7786
format: int64
7887
type: integer
7988
timeout:
80-
description: A Duration represents the elapsed time between
81-
two instants as an int64 nanosecond count. The representation
82-
limits the largest representable duration to approximately
83-
290 years.
89+
description: |-
90+
A Duration represents the elapsed time between two instants
91+
as an int64 nanosecond count. The representation limits the
92+
largest representable duration to approximately 290 years.
8493
format: int64
8594
type: integer
8695
type: object
8796
read_buffer_size:
88-
description: ReadBufferSize for gRPC client. See grpc.WithReadBufferSize.
97+
description: |-
98+
ReadBufferSize for gRPC client. See grpc.WithReadBufferSize.
8999
(https://godoc.org/google.golang.org/grpc#WithReadBufferSize).
90100
type: integer
91101
retry_on_failure:
92-
description: BackOffConfig defines configuration for retrying
93-
batches in case of export failure. The current supported strategy
94-
is exponential backoff.
102+
description: |-
103+
BackOffConfig defines configuration for retrying batches in case of export failure.
104+
The current supported strategy is exponential backoff.
95105
properties:
96106
enabled:
97107
description: Enabled indicates whether to not retry sending
@@ -103,26 +113,25 @@ spec:
103113
format: int64
104114
type: integer
105115
max_elapsed_time:
106-
description: MaxElapsedTime is the maximum amount of time
107-
(including retries) spent trying to send a request/batch.
108-
Once this value is reached, the data is discarded. If set
109-
to 0, the retries are never stopped.
116+
description: |-
117+
MaxElapsedTime is the maximum amount of time (including retries) spent trying to send a request/batch.
118+
Once this value is reached, the data is discarded. If set to 0, the retries are never stopped.
110119
format: int64
111120
type: integer
112121
max_interval:
113-
description: MaxInterval is the upper bound on backoff interval.
114-
Once this value is reached the delay between consecutive
115-
retries will always be `MaxInterval`.
122+
description: |-
123+
MaxInterval is the upper bound on backoff interval. Once this value is reached the delay between
124+
consecutive retries will always be `MaxInterval`.
116125
format: int64
117126
type: integer
118127
multiplier:
119128
description: Multiplier is the value multiplied by the backoff
120129
interval bounds
121130
type: string
122131
randomization_factor:
123-
description: RandomizationFactor is a random factor used to
124-
calculate next backoffs Randomized interval = RetryInterval
125-
* (1 ± RandomizationFactor)
132+
description: |-
133+
RandomizationFactor is a random factor used to calculate next backoffs
134+
Randomized interval = RetryInterval * (1 ± RandomizationFactor)
126135
type: string
127136
type: object
128137
sending_queue:
@@ -142,44 +151,48 @@ spec:
142151
in queue at a given time.
143152
type: integer
144153
storage:
145-
description: StorageID if not empty, enables the persistent
146-
storage and uses the component specified as a storage extension
147-
for the persistent queue
154+
description: |-
155+
StorageID if not empty, enables the persistent storage and uses the component specified
156+
as a storage extension for the persistent queue
148157
type: string
149158
type: object
150159
timeout:
151-
description: Timeout is the timeout for every attempt to send
152-
data to the backend. A zero timeout means no timeout.
160+
description: |-
161+
Timeout is the timeout for every attempt to send data to the backend.
162+
A zero timeout means no timeout.
153163
format: int64
154164
type: integer
155165
tls:
156166
description: TLSSetting struct exposes TLS client configuration.
157167
properties:
158168
insecure:
159-
description: In gRPC when set to true, this is used to disable
160-
the client transport security. See https://godoc.org/google.golang.org/grpc#WithInsecure.
161-
In HTTP, this disables verifying the server's certificate
162-
chain and host name (InsecureSkipVerify in the tls Config).
163-
Please refer to https://godoc.org/crypto/tls#Config for
164-
more information. (optional, default false)
169+
description: |-
170+
In gRPC when set to true, this is used to disable the client transport security.
171+
See https://godoc.org/google.golang.org/grpc#WithInsecure.
172+
In HTTP, this disables verifying the server's certificate chain and host name
173+
(InsecureSkipVerify in the tls Config). Please refer to
174+
https://godoc.org/crypto/tls#Config for more information.
175+
(optional, default false)
165176
type: boolean
166177
insecure_skip_verify:
167178
description: InsecureSkipVerify will enable TLS but not verify
168179
the certificate.
169180
type: boolean
170181
server_name_override:
171-
description: ServerName requested by client for virtual hosting.
172-
This sets the ServerName in the TLSConfig. Please refer
173-
to https://godoc.org/crypto/tls#Config for more information.
174-
(optional)
182+
description: |-
183+
ServerName requested by client for virtual hosting.
184+
This sets the ServerName in the TLSConfig. Please refer to
185+
https://godoc.org/crypto/tls#Config for more information. (optional)
175186
type: string
176187
type: object
177188
wait_for_ready:
178-
description: WaitForReady parameter configures client to wait
179-
for ready state before sending data. (https://github.com/grpc/grpc/blob/master/doc/wait-for-ready.md)
189+
description: |-
190+
WaitForReady parameter configures client to wait for ready state before sending data.
191+
(https://github.com/grpc/grpc/blob/master/doc/wait-for-ready.md)
180192
type: boolean
181193
write_buffer_size:
182-
description: WriteBufferSize for gRPC gRPC. See grpc.WithWriteBufferSize.
194+
description: |-
195+
WriteBufferSize for gRPC gRPC. See grpc.WithWriteBufferSize.
183196
(https://godoc.org/google.golang.org/grpc#WithWriteBufferSize).
184197
type: integer
185198
required:

0 commit comments

Comments
 (0)