Skip to content

Commit 2989e5d

Browse files
footfoot
authored
Update gitopssets-controller to v0.5.0 (#2492)
1 parent 2ca3aec commit 2989e5d

File tree

3 files changed

+267
-3
lines changed

3 files changed

+267
-3
lines changed

‎charts/gitopssets-controller/crds/gitopsset-crd.yaml‎

Lines changed: 258 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,136 @@ spec:
5353
description: GitOpsSetGenerator is the top-level set of generators
5454
for this GitOpsSet.
5555
properties:
56+
apiClient:
57+
description: APIClientGenerator defines a generator that queries
58+
an API endpoint and uses that to generate data.
59+
properties:
60+
body:
61+
description: "Body is set as the body in a POST request.
62+
\n If set, this will configure the Method to be POST automatically."
63+
x-kubernetes-preserve-unknown-fields: true
64+
endpoint:
65+
description: This is the API endpoint to use.
66+
pattern: ^(http|https)://
67+
type: string
68+
headersRef:
69+
description: "HeadersRef allows optional configuration of
70+
a Secret or ConfigMap to add additional headers to an
71+
outgoing request. \n For example, a Secret with a key
72+
Authorization: Bearer abc123 could be used to configure
73+
an authorization header."
74+
properties:
75+
kind:
76+
description: The resource kind to get headers from.
77+
enum:
78+
- Secret
79+
- ConfigMap
80+
type: string
81+
name:
82+
description: Name of the resource in the same namespace
83+
to apply headers from.
84+
type: string
85+
required:
86+
- kind
87+
- name
88+
type: object
89+
interval:
90+
description: The interval at which to poll the API endpoint.
91+
type: string
92+
jsonPath:
93+
description: "JSONPath is string that is used to modify
94+
the result of the API call. \n This can be used to extract
95+
a repeating element from a response. https://kubernetes.io/docs/reference/kubectl/jsonpath/"
96+
type: string
97+
method:
98+
default: GET
99+
description: Method defines the HTTP method to use to talk
100+
to the endpoint.
101+
enum:
102+
- GET
103+
- POST
104+
type: string
105+
required:
106+
- interval
107+
type: object
108+
cluster:
109+
description: ClusterGenerator defines a generator that queries
110+
the cluster API for relevant clusters.
111+
properties:
112+
selector:
113+
description: "Selector is used to filter the clusters that
114+
you want to target. \n If no selector is provided, no
115+
clusters will be matched."
116+
properties:
117+
matchExpressions:
118+
description: matchExpressions is a list of label selector
119+
requirements. The requirements are ANDed.
120+
items:
121+
description: A label selector requirement is a selector
122+
that contains values, a key, and an operator that
123+
relates the key and values.
124+
properties:
125+
key:
126+
description: key is the label key that the selector
127+
applies to.
128+
type: string
129+
operator:
130+
description: operator represents a key's relationship
131+
to a set of values. Valid operators are In,
132+
NotIn, Exists and DoesNotExist.
133+
type: string
134+
values:
135+
description: values is an array of string values.
136+
If the operator is In or NotIn, the values array
137+
must be non-empty. If the operator is Exists
138+
or DoesNotExist, the values array must be empty.
139+
This array is replaced during a strategic merge
140+
patch.
141+
items:
142+
type: string
143+
type: array
144+
required:
145+
- key
146+
- operator
147+
type: object
148+
type: array
149+
matchLabels:
150+
additionalProperties:
151+
type: string
152+
description: matchLabels is a map of {key,value} pairs.
153+
A single {key,value} in the matchLabels map is equivalent
154+
to an element of matchExpressions, whose key field
155+
is "key", the operator is "In", and the values array
156+
contains only "value". The requirements are ANDed.
157+
type: object
158+
type: object
159+
x-kubernetes-map-type: atomic
160+
type: object
56161
gitRepository:
57162
description: GitRepositoryGenerator generates from files in
58163
a Flux GitRepository resource.
59164
properties:
165+
directories:
166+
description: Directories is a set of rules for identifying
167+
directories to be generated.
168+
items:
169+
description: GitRepositoryGeneratorDirectoryItem stores
170+
the information about a specific directory to be generated
171+
from.
172+
properties:
173+
exclude:
174+
type: boolean
175+
path:
176+
type: string
177+
required:
178+
- path
179+
type: object
180+
type: array
60181
files:
61182
description: Files is a set of rules for identifying files
62183
to be parsed.
63184
items:
64-
description: GitRepositoryGeneratorFileItemm defines a
185+
description: GitRepositoryGeneratorFileItem defines a
65186
path to a file to be parsed when generating.
66187
properties:
67188
path:
@@ -76,6 +197,8 @@ spec:
76197
description: RepositoryRef is the name of a GitRepository
77198
resource to be generated from.
78199
type: string
200+
required:
201+
- directories
79202
type: object
80203
list:
81204
description: ListGenerator generates from a hard-coded list.
@@ -97,15 +220,146 @@ spec:
97220
generators allowed by the GitOpsSetGenerator because
98221
the CRD format doesn't support recursive declarations.
99222
properties:
223+
apiClient:
224+
description: APIClientGenerator defines a generator
225+
that queries an API endpoint and uses that to generate
226+
data.
227+
properties:
228+
body:
229+
description: "Body is set as the body in a POST
230+
request. \n If set, this will configure the
231+
Method to be POST automatically."
232+
x-kubernetes-preserve-unknown-fields: true
233+
endpoint:
234+
description: This is the API endpoint to use.
235+
pattern: ^(http|https)://
236+
type: string
237+
headersRef:
238+
description: "HeadersRef allows optional configuration
239+
of a Secret or ConfigMap to add additional headers
240+
to an outgoing request. \n For example, a Secret
241+
with a key Authorization: Bearer abc123 could
242+
be used to configure an authorization header."
243+
properties:
244+
kind:
245+
description: The resource kind to get headers
246+
from.
247+
enum:
248+
- Secret
249+
- ConfigMap
250+
type: string
251+
name:
252+
description: Name of the resource in the same
253+
namespace to apply headers from.
254+
type: string
255+
required:
256+
- kind
257+
- name
258+
type: object
259+
interval:
260+
description: The interval at which to poll the
261+
API endpoint.
262+
type: string
263+
jsonPath:
264+
description: "JSONPath is string that is used
265+
to modify the result of the API call. \n This
266+
can be used to extract a repeating element from
267+
a response. https://kubernetes.io/docs/reference/kubectl/jsonpath/"
268+
type: string
269+
method:
270+
default: GET
271+
description: Method defines the HTTP method to
272+
use to talk to the endpoint.
273+
enum:
274+
- GET
275+
- POST
276+
type: string
277+
required:
278+
- interval
279+
type: object
280+
cluster:
281+
description: ClusterGenerator defines a generator
282+
that queries the cluster API for relevant clusters.
283+
properties:
284+
selector:
285+
description: "Selector is used to filter the clusters
286+
that you want to target. \n If no selector is
287+
provided, no clusters will be matched."
288+
properties:
289+
matchExpressions:
290+
description: matchExpressions is a list of
291+
label selector requirements. The requirements
292+
are ANDed.
293+
items:
294+
description: A label selector requirement
295+
is a selector that contains values, a
296+
key, and an operator that relates the
297+
key and values.
298+
properties:
299+
key:
300+
description: key is the label key that
301+
the selector applies to.
302+
type: string
303+
operator:
304+
description: operator represents a key's
305+
relationship to a set of values. Valid
306+
operators are In, NotIn, Exists and
307+
DoesNotExist.
308+
type: string
309+
values:
310+
description: values is an array of string
311+
values. If the operator is In or NotIn,
312+
the values array must be non-empty.
313+
If the operator is Exists or DoesNotExist,
314+
the values array must be empty. This
315+
array is replaced during a strategic
316+
merge patch.
317+
items:
318+
type: string
319+
type: array
320+
required:
321+
- key
322+
- operator
323+
type: object
324+
type: array
325+
matchLabels:
326+
additionalProperties:
327+
type: string
328+
description: matchLabels is a map of {key,value}
329+
pairs. A single {key,value} in the matchLabels
330+
map is equivalent to an element of matchExpressions,
331+
whose key field is "key", the operator is
332+
"In", and the values array contains only
333+
"value". The requirements are ANDed.
334+
type: object
335+
type: object
336+
x-kubernetes-map-type: atomic
337+
type: object
100338
gitRepository:
101339
description: GitRepositoryGenerator generates from
102340
files in a Flux GitRepository resource.
103341
properties:
342+
directories:
343+
description: Directories is a set of rules for
344+
identifying directories to be generated.
345+
items:
346+
description: GitRepositoryGeneratorDirectoryItem
347+
stores the information about a specific directory
348+
to be generated from.
349+
properties:
350+
exclude:
351+
type: boolean
352+
path:
353+
type: string
354+
required:
355+
- path
356+
type: object
357+
type: array
104358
files:
105359
description: Files is a set of rules for identifying
106360
files to be parsed.
107361
items:
108-
description: GitRepositoryGeneratorFileItemm
362+
description: GitRepositoryGeneratorFileItem
109363
defines a path to a file to be parsed when
110364
generating.
111365
properties:
@@ -122,6 +376,8 @@ spec:
122376
description: RepositoryRef is the name of a GitRepository
123377
resource to be generated from.
124378
type: string
379+
required:
380+
- directories
125381
type: object
126382
list:
127383
description: ListGenerator generates from a hard-coded

‎charts/gitopssets-controller/templates/manager-rbac.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,14 @@ rules:
1919
- serviceaccounts
2020
verbs:
2121
- impersonate
22+
- apiGroups:
23+
- gitops.weave.works
24+
resources:
25+
- gitopsclusters
26+
verbs:
27+
- get
28+
- list
29+
- watch
2230
- apiGroups:
2331
- source.toolkit.fluxcd.io
2432
resources:

‎charts/mccp/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,4 +183,4 @@ gitopssets-controller:
183183
controllerManager:
184184
manager:
185185
image:
186-
tag: v0.3.1
186+
tag: v0.5.0

0 commit comments

Comments
 (0)