Skip to content

Commit fb45c9c

Browse files
committed
Increase default timeout to 60s
Increase the default timeout from 20s to 60s for Git repository cloning and Bucket download Signed-off-by: Stefan Prodan <[email protected]>
1 parent f1e69d1 commit fb45c9c

8 files changed

+344
-112
lines changed

api/v1beta1/bucket_types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ type BucketSpec struct {
6262
// +required
6363
Interval metav1.Duration `json:"interval"`
6464

65-
// The timeout for download operations, defaults to 20s.
66-
// +kubebuilder:default="20s"
65+
// The timeout for download operations, defaults to 60s.
66+
// +kubebuilder:default="60s"
6767
// +optional
6868
Timeout *metav1.Duration `json:"timeout,omitempty"`
6969

api/v1beta1/gitrepository_types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ type GitRepositorySpec struct {
5353
// +required
5454
Interval metav1.Duration `json:"interval"`
5555

56-
// The timeout for remote Git operations like cloning, defaults to 20s.
57-
// +kubebuilder:default="20s"
56+
// The timeout for remote Git operations like cloning, defaults to 60s.
57+
// +kubebuilder:default="60s"
5858
// +optional
5959
Timeout *metav1.Duration `json:"timeout,omitempty"`
6060

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

Lines changed: 75 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.5.0
7+
controller-gen.kubebuilder.io/version: v0.7.0
88
creationTimestamp: null
99
name: buckets.source.toolkit.fluxcd.io
1010
spec:
@@ -35,28 +35,42 @@ spec:
3535
description: Bucket is the Schema for the buckets API
3636
properties:
3737
apiVersion:
38-
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'
38+
description: 'APIVersion defines the versioned schema of this representation
39+
of an object. Servers should convert recognized schemas to the latest
40+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
3941
type: string
4042
kind:
41-
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'
43+
description: 'Kind is a string value representing the REST resource this
44+
object represents. Servers may infer this from the endpoint the client
45+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
4246
type: string
4347
metadata:
4448
type: object
4549
spec:
46-
description: BucketSpec defines the desired state of an S3 compatible bucket
50+
description: BucketSpec defines the desired state of an S3 compatible
51+
bucket
4752
properties:
4853
accessFrom:
49-
description: AccessFrom defines an Access Control List for allowing cross-namespace references to this object.
54+
description: AccessFrom defines an Access Control List for allowing
55+
cross-namespace references to this object.
5056
properties:
5157
namespaceSelectors:
52-
description: NamespaceSelectors is the list of namespace selectors to which this ACL applies. Items in this list are evaluated using a logical OR operation.
58+
description: NamespaceSelectors is the list of namespace selectors
59+
to which this ACL applies. Items in this list are evaluated
60+
using a logical OR operation.
5361
items:
54-
description: NamespaceSelector selects the namespaces to which this ACL applies. An empty map of MatchLabels matches all namespaces in a cluster.
62+
description: NamespaceSelector selects the namespaces to which
63+
this ACL applies. An empty map of MatchLabels matches all
64+
namespaces in a cluster.
5565
properties:
5666
matchLabels:
5767
additionalProperties:
5868
type: string
59-
description: MatchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
69+
description: MatchLabels is a map of {key,value} pairs.
70+
A single {key,value} in the matchLabels map is equivalent
71+
to an element of matchExpressions, whose key field is
72+
"key", the operator is "In", and the values array contains
73+
only "value". The requirements are ANDed.
6074
type: object
6175
type: object
6276
type: array
@@ -70,7 +84,10 @@ spec:
7084
description: The bucket endpoint address.
7185
type: string
7286
ignore:
73-
description: Ignore overrides the set of excluded patterns in the .sourceignore format (which is the same as .gitignore). If not provided, a default will be used, consult the documentation for your version to find out what those are.
87+
description: Ignore overrides the set of excluded patterns in the
88+
.sourceignore format (which is the same as .gitignore). If not provided,
89+
a default will be used, consult the documentation for your version
90+
to find out what those are.
7491
type: string
7592
insecure:
7693
description: Insecure allows connecting to a non-TLS S3 HTTP endpoint.
@@ -90,7 +107,8 @@ spec:
90107
description: The bucket region.
91108
type: string
92109
secretRef:
93-
description: The name of the secret containing authentication credentials for the Bucket.
110+
description: The name of the secret containing authentication credentials
111+
for the Bucket.
94112
properties:
95113
name:
96114
description: Name of the referent
@@ -99,11 +117,12 @@ spec:
99117
- name
100118
type: object
101119
suspend:
102-
description: This flag tells the controller to suspend the reconciliation of this source.
120+
description: This flag tells the controller to suspend the reconciliation
121+
of this source.
103122
type: boolean
104123
timeout:
105-
default: 20s
106-
description: The timeout for download operations, defaults to 20s.
124+
default: 60s
125+
description: The timeout for download operations, defaults to 60s.
107126
type: string
108127
required:
109128
- bucketName
@@ -116,20 +135,24 @@ spec:
116135
description: BucketStatus defines the observed state of a bucket
117136
properties:
118137
artifact:
119-
description: Artifact represents the output of the last successful Bucket sync.
138+
description: Artifact represents the output of the last successful
139+
Bucket sync.
120140
properties:
121141
checksum:
122142
description: Checksum is the SHA256 checksum of the artifact.
123143
type: string
124144
lastUpdateTime:
125-
description: LastUpdateTime is the timestamp corresponding to the last update of this artifact.
145+
description: LastUpdateTime is the timestamp corresponding to
146+
the last update of this artifact.
126147
format: date-time
127148
type: string
128149
path:
129150
description: Path is the relative file path of this artifact.
130151
type: string
131152
revision:
132-
description: Revision is a human readable identifier traceable in the origin source system. It can be a Git commit SHA, Git tag, a Helm index timestamp, a Helm chart version, etc.
153+
description: Revision is a human readable identifier traceable
154+
in the origin source system. It can be a Git commit SHA, Git
155+
tag, a Helm index timestamp, a Helm chart version, etc.
133156
type: string
134157
url:
135158
description: URL is the HTTP address of this artifact.
@@ -141,23 +164,45 @@ spec:
141164
conditions:
142165
description: Conditions holds the conditions for the Bucket.
143166
items:
144-
description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
167+
description: "Condition contains details for one aspect of the current
168+
state of this API Resource. --- This struct is intended for direct
169+
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 }"
145177
properties:
146178
lastTransitionTime:
147-
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.
179+
description: lastTransitionTime is the last time the condition
180+
transitioned from one status to another. This should be when
181+
the underlying condition changed. If that is not known, then
182+
using the time when the API field changed is acceptable.
148183
format: date-time
149184
type: string
150185
message:
151-
description: message is a human readable message indicating details about the transition. This may be an empty string.
186+
description: message is a human readable message indicating
187+
details about the transition. This may be an empty string.
152188
maxLength: 32768
153189
type: string
154190
observedGeneration:
155-
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.
191+
description: observedGeneration represents the .metadata.generation
192+
that the condition was set based upon. For instance, if .metadata.generation
193+
is currently 12, but the .status.conditions[x].observedGeneration
194+
is 9, the condition is out of date with respect to the current
195+
state of the instance.
156196
format: int64
157197
minimum: 0
158198
type: integer
159199
reason:
160-
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.
200+
description: reason contains a programmatic identifier indicating
201+
the reason for the condition's last transition. Producers
202+
of specific condition types may define expected values and
203+
meanings for this field, and whether the values are considered
204+
a guaranteed API. The value should be a CamelCase string.
205+
This field may not be empty.
161206
maxLength: 1024
162207
minLength: 1
163208
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
@@ -170,7 +215,11 @@ spec:
170215
- Unknown
171216
type: string
172217
type:
173-
description: type of condition in CamelCase or in foo.example.com/CamelCase. --- Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
218+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
219+
--- Many .condition.type values are consistent across resources
220+
like Available, but because arbitrary conditions can be useful
221+
(see .node.status.conditions), the ability to deconflict is
222+
important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
174223
maxLength: 316
175224
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])$
176225
type: string
@@ -183,14 +232,16 @@ spec:
183232
type: object
184233
type: array
185234
lastHandledReconcileAt:
186-
description: LastHandledReconcileAt holds the value of the most recent reconcile request value, so a change can be detected.
235+
description: LastHandledReconcileAt holds the value of the most recent
236+
reconcile request value, so a change can be detected.
187237
type: string
188238
observedGeneration:
189239
description: ObservedGeneration is the last observed generation.
190240
format: int64
191241
type: integer
192242
url:
193-
description: URL is the download link for the artifact output of the last Bucket sync.
243+
description: URL is the download link for the artifact output of the
244+
last Bucket sync.
194245
type: string
195246
type: object
196247
type: object

0 commit comments

Comments
 (0)