Skip to content

Commit 62555bd

Browse files
philipgoughphilipgough
authored
ci: Update api version in tenant tempalte and re-generate (#701)
1 parent 0a6afee commit 62555bd

5 files changed

+51
-41
lines changed

Diff for: ‎crds/loki.grafana.com_alertingrules.libsonnet

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
kind: 'CustomResourceDefinition',
44
metadata: {
55
annotations: {
6-
'controller-gen.kubebuilder.io/version': 'v0.14.0',
6+
'controller-gen.kubebuilder.io/version': 'v0.16.3',
77
},
88
creationTimestamp: null,
99
labels: {
@@ -147,7 +147,7 @@
147147
conditions: {
148148
description: 'Conditions of the AlertingRule generation health.',
149149
items: {
150-
description: "Condition contains details for one aspect of the current state of this API Resource.\n---\nThis struct is intended for direct use as an array at the field path .status.conditions. For example,\n\n\n\ttype FooStatus struct{\n\t // Represents the observations of a foo's current state.\n\t // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\"\n\t // +patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t // other fields\n\t}",
150+
description: 'Condition contains details for one aspect of the current state of this API Resource.',
151151
properties: {
152152
lastTransitionTime: {
153153
description: 'lastTransitionTime is the last time the condition transitioned from one status to another.\nThis should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.',
@@ -182,7 +182,7 @@
182182
type: 'string',
183183
},
184184
type: {
185-
description: 'type of condition in CamelCase or in foo.example.com/CamelCase.\n---\nMany .condition.type values are consistent across resources like Available, but because arbitrary conditions can be\nuseful (see .node.status.conditions), the ability to deconflict is important.\nThe regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)',
185+
description: 'type of condition in CamelCase or in foo.example.com/CamelCase.',
186186
maxLength: 316,
187187
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])$',
188188
type: 'string',
@@ -317,7 +317,7 @@
317317
conditions: {
318318
description: 'Conditions of the AlertingRule generation health.',
319319
items: {
320-
description: "Condition contains details for one aspect of the current state of this API Resource.\n---\nThis struct is intended for direct use as an array at the field path .status.conditions. For example,\n\n\n\ttype FooStatus struct{\n\t // Represents the observations of a foo's current state.\n\t // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\"\n\t // +patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t // other fields\n\t}",
320+
description: 'Condition contains details for one aspect of the current state of this API Resource.',
321321
properties: {
322322
lastTransitionTime: {
323323
description: 'lastTransitionTime is the last time the condition transitioned from one status to another.\nThis should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.',
@@ -352,7 +352,7 @@
352352
type: 'string',
353353
},
354354
type: {
355-
description: 'type of condition in CamelCase or in foo.example.com/CamelCase.\n---\nMany .condition.type values are consistent across resources like Available, but because arbitrary conditions can be\nuseful (see .node.status.conditions), the ability to deconflict is important.\nThe regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)',
355+
description: 'type of condition in CamelCase or in foo.example.com/CamelCase.',
356356
maxLength: 316,
357357
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])$',
358358
type: 'string',

Diff for: ‎crds/loki.grafana.com_recordingrules.libsonnet

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
kind: 'CustomResourceDefinition',
44
metadata: {
55
annotations: {
6-
'controller-gen.kubebuilder.io/version': 'v0.14.0',
6+
'controller-gen.kubebuilder.io/version': 'v0.16.3',
77
},
88
creationTimestamp: null,
99
labels: {
@@ -135,7 +135,7 @@
135135
conditions: {
136136
description: 'Conditions of the RecordingRule generation health.',
137137
items: {
138-
description: "Condition contains details for one aspect of the current state of this API Resource.\n---\nThis struct is intended for direct use as an array at the field path .status.conditions. For example,\n\n\n\ttype FooStatus struct{\n\t // Represents the observations of a foo's current state.\n\t // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\"\n\t // +patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t // other fields\n\t}",
138+
description: 'Condition contains details for one aspect of the current state of this API Resource.',
139139
properties: {
140140
lastTransitionTime: {
141141
description: 'lastTransitionTime is the last time the condition transitioned from one status to another.\nThis should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.',
@@ -170,7 +170,7 @@
170170
type: 'string',
171171
},
172172
type: {
173-
description: 'type of condition in CamelCase or in foo.example.com/CamelCase.\n---\nMany .condition.type values are consistent across resources like Available, but because arbitrary conditions can be\nuseful (see .node.status.conditions), the ability to deconflict is important.\nThe regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)',
173+
description: 'type of condition in CamelCase or in foo.example.com/CamelCase.',
174174
maxLength: 316,
175175
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])$',
176176
type: 'string',
@@ -286,7 +286,7 @@
286286
conditions: {
287287
description: 'Conditions of the RecordingRule generation health.',
288288
items: {
289-
description: "Condition contains details for one aspect of the current state of this API Resource.\n---\nThis struct is intended for direct use as an array at the field path .status.conditions. For example,\n\n\n\ttype FooStatus struct{\n\t // Represents the observations of a foo's current state.\n\t // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\"\n\t // +patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t // other fields\n\t}",
289+
description: 'Condition contains details for one aspect of the current state of this API Resource.',
290290
properties: {
291291
lastTransitionTime: {
292292
description: 'lastTransitionTime is the last time the condition transitioned from one status to another.\nThis should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.',
@@ -321,7 +321,7 @@
321321
type: 'string',
322322
},
323323
type: {
324-
description: 'type of condition in CamelCase or in foo.example.com/CamelCase.\n---\nMany .condition.type values are consistent across resources like Available, but because arbitrary conditions can be\nuseful (see .node.status.conditions), the ability to deconflict is important.\nThe regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)',
324+
description: 'type of condition in CamelCase or in foo.example.com/CamelCase.',
325325
maxLength: 316,
326326
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])$',
327327
type: 'string',

Diff for: ‎resources/crds/observatorium-logs-crds-template.yaml

+10-30
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ objects:
77
kind: CustomResourceDefinition
88
metadata:
99
annotations:
10-
controller-gen.kubebuilder.io/version: v0.14.0
10+
controller-gen.kubebuilder.io/version: v0.16.3
1111
creationTimestamp: null
1212
labels:
1313
app.kubernetes.io/instance: loki-operator-v0.6.2
@@ -120,7 +120,7 @@ objects:
120120
conditions:
121121
description: Conditions of the AlertingRule generation health.
122122
items:
123-
description: "Condition contains details for one aspect of the current state of this API Resource.\n---\nThis struct is intended for direct use as an array at the field path .status.conditions. For example,\n\n\n\ttype FooStatus struct{\n\t // Represents the observations of a foo's current state.\n\t // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\"\n\t // +patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t // other fields\n\t}"
123+
description: Condition contains details for one aspect of the current state of this API Resource.
124124
properties:
125125
lastTransitionTime:
126126
description: |-
@@ -161,12 +161,7 @@ objects:
161161
- Unknown
162162
type: string
163163
type:
164-
description: |-
165-
type of condition in CamelCase or in foo.example.com/CamelCase.
166-
---
167-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
168-
useful (see .node.status.conditions), the ability to deconflict is important.
169-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
164+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
170165
maxLength: 316
171166
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])$
172167
type: string
@@ -279,7 +274,7 @@ objects:
279274
conditions:
280275
description: Conditions of the AlertingRule generation health.
281276
items:
282-
description: "Condition contains details for one aspect of the current state of this API Resource.\n---\nThis struct is intended for direct use as an array at the field path .status.conditions. For example,\n\n\n\ttype FooStatus struct{\n\t // Represents the observations of a foo's current state.\n\t // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\"\n\t // +patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t // other fields\n\t}"
277+
description: Condition contains details for one aspect of the current state of this API Resource.
283278
properties:
284279
lastTransitionTime:
285280
description: |-
@@ -320,12 +315,7 @@ objects:
320315
- Unknown
321316
type: string
322317
type:
323-
description: |-
324-
type of condition in CamelCase or in foo.example.com/CamelCase.
325-
---
326-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
327-
useful (see .node.status.conditions), the ability to deconflict is important.
328-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
318+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
329319
maxLength: 316
330320
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])$
331321
type: string
@@ -353,7 +343,7 @@ objects:
353343
kind: CustomResourceDefinition
354344
metadata:
355345
annotations:
356-
controller-gen.kubebuilder.io/version: v0.14.0
346+
controller-gen.kubebuilder.io/version: v0.16.3
357347
creationTimestamp: null
358348
labels:
359349
app.kubernetes.io/instance: loki-operator-v0.6.2
@@ -455,7 +445,7 @@ objects:
455445
conditions:
456446
description: Conditions of the RecordingRule generation health.
457447
items:
458-
description: "Condition contains details for one aspect of the current state of this API Resource.\n---\nThis struct is intended for direct use as an array at the field path .status.conditions. For example,\n\n\n\ttype FooStatus struct{\n\t // Represents the observations of a foo's current state.\n\t // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\"\n\t // +patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t // other fields\n\t}"
448+
description: Condition contains details for one aspect of the current state of this API Resource.
459449
properties:
460450
lastTransitionTime:
461451
description: |-
@@ -496,12 +486,7 @@ objects:
496486
- Unknown
497487
type: string
498488
type:
499-
description: |-
500-
type of condition in CamelCase or in foo.example.com/CamelCase.
501-
---
502-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
503-
useful (see .node.status.conditions), the ability to deconflict is important.
504-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
489+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
505490
maxLength: 316
506491
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])$
507492
type: string
@@ -598,7 +583,7 @@ objects:
598583
conditions:
599584
description: Conditions of the RecordingRule generation health.
600585
items:
601-
description: "Condition contains details for one aspect of the current state of this API Resource.\n---\nThis struct is intended for direct use as an array at the field path .status.conditions. For example,\n\n\n\ttype FooStatus struct{\n\t // Represents the observations of a foo's current state.\n\t // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\"\n\t // +patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t // other fields\n\t}"
586+
description: Condition contains details for one aspect of the current state of this API Resource.
602587
properties:
603588
lastTransitionTime:
604589
description: |-
@@ -639,12 +624,7 @@ objects:
639624
- Unknown
640625
type: string
641626
type:
642-
description: |-
643-
type of condition in CamelCase or in foo.example.com/CamelCase.
644-
---
645-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
646-
useful (see .node.status.conditions), the ability to deconflict is important.
647-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
627+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
648628
maxLength: 316
649629
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])$
650630
type: string

0 commit comments

Comments
 (0)