Skip to content

Commit 1e7e807

Browse files
michaeljguarinomichaeljguarino
authored
Add python file schema support (#4025)
1 parent 07b046a commit 1e7e807

25 files changed

Lines changed: 1442 additions & 43 deletions

‎assets/src/generated/graphql.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4999,6 +4999,9 @@ export type HelmConfigAttributes = {
49994999
luaFile?: InputMaybe<Scalars['String']['input']>;
50005000
luaFolder?: InputMaybe<Scalars['String']['input']>;
50015001
luaScript?: InputMaybe<Scalars['String']['input']>;
5002+
pythonFile?: InputMaybe<Scalars['String']['input']>;
5003+
pythonFolder?: InputMaybe<Scalars['String']['input']>;
5004+
pythonScript?: InputMaybe<Scalars['String']['input']>;
50025005
release?: InputMaybe<Scalars['String']['input']>;
50035006
repository?: InputMaybe<NamespacedName>;
50045007
/** pointer to a Plural GitRepository */
@@ -5098,6 +5101,12 @@ export type HelmSpec = {
50985101
luaFolder?: Maybe<Scalars['String']['output']>;
50995102
/** a lua script to use for helm applies */
51005103
luaScript?: Maybe<Scalars['String']['output']>;
5104+
/** a python file to use for helm applies */
5105+
pythonFile?: Maybe<Scalars['String']['output']>;
5106+
/** a folder of python files to include in the final script used */
5107+
pythonFolder?: Maybe<Scalars['String']['output']>;
5108+
/** a python script to use for helm applies */
5109+
pythonScript?: Maybe<Scalars['String']['output']>;
51015110
release?: Maybe<Scalars['String']['output']>;
51025111
/** pointer to the flux helm repository resource used for this chart */
51035112
repository?: Maybe<ObjectReference>;

‎charts/console/templates/cloud.yaml‎

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,7 @@ spec:
4040
name: elasticsearch
4141
definition:
4242
policy:
43-
phases:
44-
warm:
45-
min_age: 10d
46-
actions:
47-
forcemerge:
48-
max_num_segments: 1
49-
delete:
50-
min_age: 30d
51-
actions:
52-
delete: {}
43+
{{- toYaml .Values.cloud.o11y.ilm.logs | nindent 6 }}
5344
---
5445
{{/* Rollover ILM for plrl-{inst}-logs-00000N via write alias */}}
5546
apiVersion: dbs.plural.sh/v1alpha1
@@ -63,23 +54,7 @@ spec:
6354
name: elasticsearch
6455
definition:
6556
policy:
66-
phases:
67-
hot:
68-
actions:
69-
rollover:
70-
max_primary_shard_size: 30gb
71-
min_primary_shard_size: 5gb
72-
max_primary_shard_docs: 5000000
73-
max_size: 100gb
74-
warm:
75-
min_age: 1d
76-
actions:
77-
shrink:
78-
max_primary_shard_size: 30gb
79-
delete:
80-
min_age: 7d
81-
actions:
82-
delete: {}
57+
{{- toYaml .Values.cloud.o11y.ilm.logsRollover | nindent 6 }}
8358
---
8459
{{/* Lower priority: dated / catch-all indices, legacy ILM */}}
8560
apiVersion: dbs.plural.sh/v1alpha1

‎charts/console/values.yaml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,38 @@ cloud:
1111
enabled: false
1212
o11y:
1313
enabled: false
14+
# ilm is the Elasticsearch index lifecycle policy bodies applied to cloud log indices.
15+
# Override phases per policy; both default to warm after 1d and delete after 7d.
16+
ilm:
17+
logs:
18+
phases:
19+
warm:
20+
min_age: 1d
21+
actions:
22+
forcemerge:
23+
max_num_segments: 1
24+
delete:
25+
min_age: 7d
26+
actions:
27+
delete: {}
28+
logsRollover:
29+
phases:
30+
hot:
31+
actions:
32+
rollover:
33+
max_primary_shard_size: 30gb
34+
min_primary_shard_size: 5gb
35+
max_primary_shard_docs: 5000000
36+
max_size: 100gb
37+
warm:
38+
min_age: 1d
39+
actions:
40+
shrink:
41+
max_primary_shard_size: 30gb
42+
delete:
43+
min_age: 7d
44+
actions:
45+
delete: {}
1446
database:
1547
enabled: false
1648
shard: ~

‎charts/controller/crds/deployments.plural.sh_globalservices.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,22 @@ spec:
439439
This can ultimately return a lua table with keys "values" and "valuesFiles"
440440
to supply overlays for either dynamically based on git state or other metadata.
441441
type: string
442+
pythonFile:
443+
description: |-
444+
PythonFile to use to generate Helm configuration.
445+
This can ultimately return a dict with keys "values" and "valuesFiles"
446+
to supply overlays for either dynamically based on Git state or other metadata.
447+
type: string
448+
pythonFolder:
449+
description: a folder of python files to include in the final
450+
script used
451+
type: string
452+
pythonScript:
453+
description: |-
454+
PythonScript to use to generate Helm configuration.
455+
This can ultimately return a dict with keys "values" and "valuesFiles"
456+
to supply overlays for either dynamically based on git state or other metadata.
457+
type: string
442458
release:
443459
description: Release contains the name of the Helm release
444460
to use when applying this service.

‎charts/controller/crds/deployments.plural.sh_managednamespaces.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,22 @@ spec:
315315
This can ultimately return a lua table with keys "values" and "valuesFiles"
316316
to supply overlays for either dynamically based on git state or other metadata.
317317
type: string
318+
pythonFile:
319+
description: |-
320+
PythonFile to use to generate Helm configuration.
321+
This can ultimately return a dict with keys "values" and "valuesFiles"
322+
to supply overlays for either dynamically based on Git state or other metadata.
323+
type: string
324+
pythonFolder:
325+
description: a folder of python files to include in the final
326+
script used
327+
type: string
328+
pythonScript:
329+
description: |-
330+
PythonScript to use to generate Helm configuration.
331+
This can ultimately return a dict with keys "values" and "valuesFiles"
332+
to supply overlays for either dynamically based on git state or other metadata.
333+
type: string
318334
release:
319335
description: Release contains the name of the Helm release
320336
to use when applying this service.

‎charts/controller/crds/deployments.plural.sh_previewenvironmenttemplates.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,22 @@ spec:
369369
This can ultimately return a lua table with keys "values" and "valuesFiles"
370370
to supply overlays for either dynamically based on git state or other metadata.
371371
type: string
372+
pythonFile:
373+
description: |-
374+
PythonFile to use to generate Helm configuration.
375+
This can ultimately return a dict with keys "values" and "valuesFiles"
376+
to supply overlays for either dynamically based on Git state or other metadata.
377+
type: string
378+
pythonFolder:
379+
description: a folder of python files to include in the final
380+
script used
381+
type: string
382+
pythonScript:
383+
description: |-
384+
PythonScript to use to generate Helm configuration.
385+
This can ultimately return a dict with keys "values" and "valuesFiles"
386+
to supply overlays for either dynamically based on git state or other metadata.
387+
type: string
372388
release:
373389
description: Release contains the name of the Helm release
374390
to use when applying this service.

‎charts/controller/crds/deployments.plural.sh_servicedeployments.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,22 @@ spec:
328328
This can ultimately return a lua table with keys "values" and "valuesFiles"
329329
to supply overlays for either dynamically based on git state or other metadata.
330330
type: string
331+
pythonFile:
332+
description: |-
333+
PythonFile to use to generate Helm configuration.
334+
This can ultimately return a dict with keys "values" and "valuesFiles"
335+
to supply overlays for either dynamically based on Git state or other metadata.
336+
type: string
337+
pythonFolder:
338+
description: a folder of python files to include in the final
339+
script used
340+
type: string
341+
pythonScript:
342+
description: |-
343+
PythonScript to use to generate Helm configuration.
344+
This can ultimately return a dict with keys "values" and "valuesFiles"
345+
to supply overlays for either dynamically based on git state or other metadata.
346+
type: string
331347
release:
332348
description: Release contains the name of the Helm release to
333349
use when applying this service.

0 commit comments

Comments
 (0)