Skip to content

Commit 1c08b17

Browse files
authored
Merge pull request #374 from fluxcd/dep-update
Update K8s, controller-runtime and fluxcd/pkg deps
2 parents bfd7247 + a76b10c commit 1c08b17

9 files changed

+420
-587
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ ifeq (, $(shell which controller-gen))
8989
CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
9090
cd $$CONTROLLER_GEN_TMP_DIR ;\
9191
go mod init tmp ;\
92-
go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.4.1 ;\
92+
go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.5.0 ;\
9393
rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
9494
}
9595
CONTROLLER_GEN=$(GOBIN)/controller-gen

api/go.mod

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

55
require (
6-
github.com/fluxcd/pkg/apis/meta v0.9.0
7-
k8s.io/apimachinery v0.20.4
8-
sigs.k8s.io/controller-runtime v0.8.3
6+
github.com/fluxcd/pkg/apis/meta v0.10.0
7+
k8s.io/apimachinery v0.21.1
8+
sigs.k8s.io/controller-runtime v0.9.0
99
)

api/go.sum

Lines changed: 116 additions & 72 deletions
Large diffs are not rendered by default.

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

Lines changed: 18 additions & 60 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.4.1
7+
controller-gen.kubebuilder.io/version: v0.5.0
88
creationTimestamp: null
99
name: buckets.source.toolkit.fluxcd.io
1010
spec:
@@ -35,20 +35,15 @@ 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
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'
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'
4139
type: string
4240
kind:
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'
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'
4642
type: string
4743
metadata:
4844
type: object
4945
spec:
50-
description: BucketSpec defines the desired state of an S3 compatible
51-
bucket
46+
description: BucketSpec defines the desired state of an S3 compatible bucket
5247
properties:
5348
bucketName:
5449
description: The bucket name.
@@ -57,10 +52,7 @@ spec:
5752
description: The bucket endpoint address.
5853
type: string
5954
ignore:
60-
description: Ignore overrides the set of excluded patterns in the
61-
.sourceignore format (which is the same as .gitignore). If not provided,
62-
a default will be used, consult the documentation for your version
63-
to find out what those are.
55+
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.
6456
type: string
6557
insecure:
6658
description: Insecure allows connecting to a non-TLS S3 HTTP endpoint.
@@ -79,8 +71,7 @@ spec:
7971
description: The bucket region.
8072
type: string
8173
secretRef:
82-
description: The name of the secret containing authentication credentials
83-
for the Bucket.
74+
description: The name of the secret containing authentication credentials for the Bucket.
8475
properties:
8576
name:
8677
description: Name of the referent
@@ -89,8 +80,7 @@ spec:
8980
- name
9081
type: object
9182
suspend:
92-
description: This flag tells the controller to suspend the reconciliation
93-
of this source.
83+
description: This flag tells the controller to suspend the reconciliation of this source.
9484
type: boolean
9585
timeout:
9686
default: 20s
@@ -105,24 +95,20 @@ spec:
10595
description: BucketStatus defines the observed state of a bucket
10696
properties:
10797
artifact:
108-
description: Artifact represents the output of the last successful
109-
Bucket sync.
98+
description: Artifact represents the output of the last successful Bucket sync.
11099
properties:
111100
checksum:
112101
description: Checksum is the SHA1 checksum of the artifact.
113102
type: string
114103
lastUpdateTime:
115-
description: LastUpdateTime is the timestamp corresponding to
116-
the last update of this artifact.
104+
description: LastUpdateTime is the timestamp corresponding to the last update of this artifact.
117105
format: date-time
118106
type: string
119107
path:
120108
description: Path is the relative file path of this artifact.
121109
type: string
122110
revision:
123-
description: Revision is a human readable identifier traceable
124-
in the origin source system. It can be a Git commit SHA, Git
125-
tag, a Helm index timestamp, a Helm chart version, etc.
111+
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.
126112
type: string
127113
url:
128114
description: URL is the HTTP address of this artifact.
@@ -134,45 +120,23 @@ spec:
134120
conditions:
135121
description: Conditions holds the conditions for the Bucket.
136122
items:
137-
description: "Condition contains details for one aspect of the current
138-
state of this API Resource. --- This struct is intended for direct
139-
use as an array at the field path .status.conditions. For example,
140-
type FooStatus struct{ // Represents the observations of a
141-
foo's current state. // Known .status.conditions.type are:
142-
\"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type
143-
\ // +patchStrategy=merge // +listType=map // +listMapKey=type
144-
\ Conditions []metav1.Condition `json:\"conditions,omitempty\"
145-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`
146-
\n // other fields }"
123+
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 }"
147124
properties:
148125
lastTransitionTime:
149-
description: lastTransitionTime is the last time the condition
150-
transitioned from one status to another. This should be when
151-
the underlying condition changed. If that is not known, then
152-
using the time when the API field changed is acceptable.
126+
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.
153127
format: date-time
154128
type: string
155129
message:
156-
description: message is a human readable message indicating
157-
details about the transition. This may be an empty string.
130+
description: message is a human readable message indicating details about the transition. This may be an empty string.
158131
maxLength: 32768
159132
type: string
160133
observedGeneration:
161-
description: observedGeneration represents the .metadata.generation
162-
that the condition was set based upon. For instance, if .metadata.generation
163-
is currently 12, but the .status.conditions[x].observedGeneration
164-
is 9, the condition is out of date with respect to the current
165-
state of the instance.
134+
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.
166135
format: int64
167136
minimum: 0
168137
type: integer
169138
reason:
170-
description: reason contains a programmatic identifier indicating
171-
the reason for the condition's last transition. Producers
172-
of specific condition types may define expected values and
173-
meanings for this field, and whether the values are considered
174-
a guaranteed API. The value should be a CamelCase string.
175-
This field may not be empty.
139+
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.
176140
maxLength: 1024
177141
minLength: 1
178142
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
@@ -185,11 +149,7 @@ spec:
185149
- Unknown
186150
type: string
187151
type:
188-
description: type of condition in CamelCase or in foo.example.com/CamelCase.
189-
--- Many .condition.type values are consistent across resources
190-
like Available, but because arbitrary conditions can be useful
191-
(see .node.status.conditions), the ability to deconflict is
192-
important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
152+
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)
193153
maxLength: 316
194154
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])$
195155
type: string
@@ -202,16 +162,14 @@ spec:
202162
type: object
203163
type: array
204164
lastHandledReconcileAt:
205-
description: LastHandledReconcileAt holds the value of the most recent
206-
reconcile request value, so a change can be detected.
165+
description: LastHandledReconcileAt holds the value of the most recent reconcile request value, so a change can be detected.
207166
type: string
208167
observedGeneration:
209168
description: ObservedGeneration is the last observed generation.
210169
format: int64
211170
type: integer
212171
url:
213-
description: URL is the download link for the artifact output of the
214-
last Bucket sync.
172+
description: URL is the download link for the artifact output of the last Bucket sync.
215173
type: string
216174
type: object
217175
type: object

0 commit comments

Comments
 (0)