Skip to content

Commit 9df0102

Browse files
author
Paulo Gomes
authored
Merge pull request #875 from fluxcd/kube-1.25
Update Kubernetes packages to v1.25.0
2 parents 21bbb5c + 6a367ec commit 9df0102

10 files changed

+207
-355
lines changed

‎api/go.mod‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@ module github.com/fluxcd/source-controller/api
33
go 1.18
44

55
require (
6-
github.com/fluxcd/pkg/apis/acl v0.0.3
7-
github.com/fluxcd/pkg/apis/meta v0.14.2
8-
k8s.io/apimachinery v0.24.1
6+
github.com/fluxcd/pkg/apis/acl v0.1.0
7+
github.com/fluxcd/pkg/apis/meta v0.15.0
8+
k8s.io/apimachinery v0.25.0
99
sigs.k8s.io/controller-runtime v0.11.2
1010
)
1111

1212
// Fix CVE-2022-28948
1313
replace gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.1
1414

1515
require (
16-
github.com/go-logr/logr v1.2.2 // indirect
16+
github.com/go-logr/logr v1.2.3 // indirect
1717
github.com/gogo/protobuf v1.3.2 // indirect
1818
github.com/google/gofuzz v1.2.0 // indirect
1919
github.com/json-iterator/go v1.1.12 // indirect
2020
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
2121
github.com/modern-go/reflect2 v1.0.2 // indirect
22-
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
22+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
2323
golang.org/x/text v0.3.7 // indirect
2424
gopkg.in/inf.v0 v0.9.1 // indirect
2525
gopkg.in/yaml.v2 v2.4.0 // indirect
26-
k8s.io/klog/v2 v2.60.1 // indirect
27-
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
28-
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
29-
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
26+
k8s.io/klog/v2 v2.70.1 // indirect
27+
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
28+
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
29+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
3030
)

‎api/go.sum‎

Lines changed: 19 additions & 175 deletions
Large diffs are not rendered by default.

‎config/crd/bases/source.toolkit.fluxcd.io_buckets.yaml‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -167,13 +167,14 @@ spec:
167167
description: "Condition contains details for one aspect of the current
168168
state of this API Resource. --- This struct is intended for direct
169169
use as an array at the field path .status.conditions. For example,
170-
type FooStatus struct{ // Represents the observations of a
171-
foo's current state. // Known .status.conditions.type are:
172-
\"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type
173-
\ // +patchStrategy=merge // +listType=map // +listMapKey=type
174-
\ Conditions []metav1.Condition `json:\"conditions,omitempty\"
175-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`
176-
\n // other fields }"
170+
\n \ttype FooStatus struct{ \t // Represents the observations
171+
of a foo's current state. \t // Known .status.conditions.type
172+
are: \"Available\", \"Progressing\", and \"Degraded\" \t //
173+
+patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
174+
\t // +listMapKey=type \t Conditions []metav1.Condition
175+
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
176+
protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
177+
\t}"
177178
properties:
178179
lastTransitionTime:
179180
description: lastTransitionTime is the last time the condition
@@ -419,13 +420,14 @@ spec:
419420
description: "Condition contains details for one aspect of the current
420421
state of this API Resource. --- This struct is intended for direct
421422
use as an array at the field path .status.conditions. For example,
422-
type FooStatus struct{ // Represents the observations of a
423-
foo's current state. // Known .status.conditions.type are:
424-
\"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type
425-
\ // +patchStrategy=merge // +listType=map // +listMapKey=type
426-
\ Conditions []metav1.Condition `json:\"conditions,omitempty\"
427-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`
428-
\n // other fields }"
423+
\n \ttype FooStatus struct{ \t // Represents the observations
424+
of a foo's current state. \t // Known .status.conditions.type
425+
are: \"Available\", \"Progressing\", and \"Degraded\" \t //
426+
+patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
427+
\t // +listMapKey=type \t Conditions []metav1.Condition
428+
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
429+
protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
430+
\t}"
429431
properties:
430432
lastTransitionTime:
431433
description: lastTransitionTime is the last time the condition

‎config/crd/bases/source.toolkit.fluxcd.io_gitrepositories.yaml‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -236,13 +236,14 @@ spec:
236236
description: "Condition contains details for one aspect of the current
237237
state of this API Resource. --- This struct is intended for direct
238238
use as an array at the field path .status.conditions. For example,
239-
type FooStatus struct{ // Represents the observations of a
240-
foo's current state. // Known .status.conditions.type are:
241-
\"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type
242-
\ // +patchStrategy=merge // +listType=map // +listMapKey=type
243-
\ Conditions []metav1.Condition `json:\"conditions,omitempty\"
244-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`
245-
\n // other fields }"
239+
\n \ttype FooStatus struct{ \t // Represents the observations
240+
of a foo's current state. \t // Known .status.conditions.type
241+
are: \"Available\", \"Progressing\", and \"Degraded\" \t //
242+
+patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
243+
\t // +listMapKey=type \t Conditions []metav1.Condition
244+
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
245+
protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
246+
\t}"
246247
properties:
247248
lastTransitionTime:
248249
description: lastTransitionTime is the last time the condition
@@ -594,13 +595,14 @@ spec:
594595
description: "Condition contains details for one aspect of the current
595596
state of this API Resource. --- This struct is intended for direct
596597
use as an array at the field path .status.conditions. For example,
597-
type FooStatus struct{ // Represents the observations of a
598-
foo's current state. // Known .status.conditions.type are:
599-
\"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type
600-
\ // +patchStrategy=merge // +listType=map // +listMapKey=type
601-
\ Conditions []metav1.Condition `json:\"conditions,omitempty\"
602-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`
603-
\n // other fields }"
598+
\n \ttype FooStatus struct{ \t // Represents the observations
599+
of a foo's current state. \t // Known .status.conditions.type
600+
are: \"Available\", \"Progressing\", and \"Degraded\" \t //
601+
+patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
602+
\t // +listMapKey=type \t Conditions []metav1.Condition
603+
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
604+
protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
605+
\t}"
604606
properties:
605607
lastTransitionTime:
606608
description: lastTransitionTime is the last time the condition

‎config/crd/bases/source.toolkit.fluxcd.io_helmcharts.yaml‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -192,13 +192,14 @@ spec:
192192
description: "Condition contains details for one aspect of the current
193193
state of this API Resource. --- This struct is intended for direct
194194
use as an array at the field path .status.conditions. For example,
195-
type FooStatus struct{ // Represents the observations of a
196-
foo's current state. // Known .status.conditions.type are:
197-
\"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type
198-
\ // +patchStrategy=merge // +listType=map // +listMapKey=type
199-
\ Conditions []metav1.Condition `json:\"conditions,omitempty\"
200-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`
201-
\n // other fields }"
195+
\n \ttype FooStatus struct{ \t // Represents the observations
196+
of a foo's current state. \t // Known .status.conditions.type
197+
are: \"Available\", \"Progressing\", and \"Degraded\" \t //
198+
+patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
199+
\t // +listMapKey=type \t Conditions []metav1.Condition
200+
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
201+
protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
202+
\t}"
202203
properties:
203204
lastTransitionTime:
204205
description: lastTransitionTime is the last time the condition
@@ -467,13 +468,14 @@ spec:
467468
description: "Condition contains details for one aspect of the current
468469
state of this API Resource. --- This struct is intended for direct
469470
use as an array at the field path .status.conditions. For example,
470-
type FooStatus struct{ // Represents the observations of a
471-
foo's current state. // Known .status.conditions.type are:
472-
\"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type
473-
\ // +patchStrategy=merge // +listType=map // +listMapKey=type
474-
\ Conditions []metav1.Condition `json:\"conditions,omitempty\"
475-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`
476-
\n // other fields }"
471+
\n \ttype FooStatus struct{ \t // Represents the observations
472+
of a foo's current state. \t // Known .status.conditions.type
473+
are: \"Available\", \"Progressing\", and \"Degraded\" \t //
474+
+patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
475+
\t // +listMapKey=type \t Conditions []metav1.Condition
476+
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
477+
protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
478+
\t}"
477479
properties:
478480
lastTransitionTime:
479481
description: lastTransitionTime is the last time the condition

‎config/crd/bases/source.toolkit.fluxcd.io_helmrepositories.yaml‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -155,13 +155,14 @@ spec:
155155
description: "Condition contains details for one aspect of the current
156156
state of this API Resource. --- This struct is intended for direct
157157
use as an array at the field path .status.conditions. For example,
158-
type FooStatus struct{ // Represents the observations of a
159-
foo's current state. // Known .status.conditions.type are:
160-
\"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type
161-
\ // +patchStrategy=merge // +listType=map // +listMapKey=type
162-
\ Conditions []metav1.Condition `json:\"conditions,omitempty\"
163-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`
164-
\n // other fields }"
158+
\n \ttype FooStatus struct{ \t // Represents the observations
159+
of a foo's current state. \t // Known .status.conditions.type
160+
are: \"Available\", \"Progressing\", and \"Degraded\" \t //
161+
+patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
162+
\t // +listMapKey=type \t Conditions []metav1.Condition
163+
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
164+
protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
165+
\t}"
165166
properties:
166167
lastTransitionTime:
167168
description: lastTransitionTime is the last time the condition
@@ -411,13 +412,14 @@ spec:
411412
description: "Condition contains details for one aspect of the current
412413
state of this API Resource. --- This struct is intended for direct
413414
use as an array at the field path .status.conditions. For example,
414-
type FooStatus struct{ // Represents the observations of a
415-
foo's current state. // Known .status.conditions.type are:
416-
\"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type
417-
\ // +patchStrategy=merge // +listType=map // +listMapKey=type
418-
\ Conditions []metav1.Condition `json:\"conditions,omitempty\"
419-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`
420-
\n // other fields }"
415+
\n \ttype FooStatus struct{ \t // Represents the observations
416+
of a foo's current state. \t // Known .status.conditions.type
417+
are: \"Available\", \"Progressing\", and \"Degraded\" \t //
418+
+patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
419+
\t // +listMapKey=type \t Conditions []metav1.Condition
420+
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
421+
protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
422+
\t}"
421423
properties:
422424
lastTransitionTime:
423425
description: lastTransitionTime is the last time the condition

‎config/crd/bases/source.toolkit.fluxcd.io_ocirepositories.yaml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -198,13 +198,14 @@ spec:
198198
description: "Condition contains details for one aspect of the current
199199
state of this API Resource. --- This struct is intended for direct
200200
use as an array at the field path .status.conditions. For example,
201-
type FooStatus struct{ // Represents the observations of a
202-
foo's current state. // Known .status.conditions.type are:
203-
\"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type
204-
\ // +patchStrategy=merge // +listType=map // +listMapKey=type
205-
\ Conditions []metav1.Condition `json:\"conditions,omitempty\"
206-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`
207-
\n // other fields }"
201+
\n \ttype FooStatus struct{ \t // Represents the observations
202+
of a foo's current state. \t // Known .status.conditions.type
203+
are: \"Available\", \"Progressing\", and \"Degraded\" \t //
204+
+patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
205+
\t // +listMapKey=type \t Conditions []metav1.Condition
206+
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
207+
protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
208+
\t}"
208209
properties:
209210
lastTransitionTime:
210211
description: lastTransitionTime is the last time the condition

0 commit comments

Comments
 (0)