Skip to content

Commit d43ac21

Browse files
j-zimnowodaj-zimnowoda
authored
feat: empty rawValues in defaults (#1671)
1 parent 174bf3f commit d43ac21

File tree

3 files changed

+67
-23
lines changed

3 files changed

+67
-23
lines changed

‎helmfile.d/snippets/defaults.yaml

+59-21
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ environments:
77
apps:
88
alertmanager:
99
enabled: false
10+
_rawValues: {}
1011
argocd:
1112
applicationSet:
1213
replicas: 1
@@ -32,7 +33,7 @@ environments:
3233
memory: 1Gi
3334
limits:
3435
cpu: "2"
35-
memory: 2Gi
36+
memory: 2Gi
3637
server:
3738
requests:
3839
cpu: 50m
@@ -75,6 +76,7 @@ environments:
7576
limits:
7677
memory: 1Gi
7778
cpu: "1"
79+
_rawValues: {}
7880
cert-manager:
7981
issuer: custom-ca
8082
resources:
@@ -84,6 +86,7 @@ environments:
8486
limits:
8587
cpu: 200m
8688
memory: 384Mi
89+
_rawValues: {}
8790
cnpg:
8891
resources:
8992
requests:
@@ -92,6 +95,7 @@ environments:
9295
limits:
9396
cpu: 1000m
9497
memory: 512Mi
98+
_rawValues: {}
9599
drone:
96100
enabled: false
97101
debug: false
@@ -234,12 +238,14 @@ environments:
234238
memory: 32Mi
235239
gitea:
236240
adminUsername: otomi-admin
241+
_rawValues: {}
237242
grafana:
238243
enabled: false
244+
_rawValues: {}
239245
harbor:
240246
enabled: false
241247
oidcAutoOnboard: true
242-
oidcUserClaim: 'email'
248+
oidcUserClaim: email
243249
registry:
244250
credentials:
245251
username: otomi-admin
@@ -251,8 +257,10 @@ environments:
251257
limits:
252258
cpu: 400m
253259
memory: 512Mi
260+
_rawValues: {}
254261
httpbin:
255262
enabled: false
263+
_rawValues: {}
256264
ingress-nginx:
257265
autoscaling:
258266
enabled: true
@@ -270,11 +278,12 @@ environments:
270278
maxReplicas: 10
271279
tracing:
272280
enabled: false
273-
samplingRatio: '0.01'
281+
samplingRatio: "0.01"
282+
_rawValues: {}
274283
istio:
275284
tracing:
276285
enabled: false
277-
samplingRatio: '0.01'
286+
samplingRatio: "0.01"
278287
autoscaling:
279288
egressgateway:
280289
minReplicas: 2
@@ -287,8 +296,10 @@ environments:
287296
maxReplicas: 10
288297
egressGateway:
289298
enabled: false
299+
_rawValues: {}
290300
jaeger:
291301
enabled: false
302+
_rawValues: {}
292303
keycloak:
293304
adminUsername: otomi-admin
294305
theme: otomi
@@ -310,6 +321,7 @@ environments:
310321
idp:
311322
alias: otomi-idp
312323
clientID: otomi
324+
_rawValues: {}
313325
kiali:
314326
enabled: false
315327
resources:
@@ -327,10 +339,12 @@ environments:
327339
limits:
328340
cpu: 2000m
329341
memory: 1Gi
342+
_rawValues: {}
330343
knative:
331344
enabled: false
332345
serving:
333346
replicas: 1
347+
_rawValues: {}
334348
kured:
335349
enabled: false
336350
resources:
@@ -341,6 +355,7 @@ environments:
341355
limits:
342356
cpu: 50m
343357
memory: 32Mi
358+
_rawValues: {}
344359
kyverno:
345360
enabled: false
346361
mode: DevTest
@@ -350,29 +365,30 @@ environments:
350365
cpu: 200m
351366
memory: 128Mi
352367
limits:
353-
cpu: '1'
368+
cpu: "1"
354369
memory: 512Mi
355370
cleanupController:
356371
requests:
357372
cpu: 100m
358373
memory: 128Mi
359374
limits:
360-
cpu: '1'
375+
cpu: "1"
361376
memory: 512Mi
362377
backgroundController:
363378
requests:
364379
cpu: 50m
365380
memory: 128Mi
366381
limits:
367-
cpu: '1'
382+
cpu: "1"
368383
memory: 512Mi
369384
reportsController:
370385
requests:
371386
cpu: 50m
372387
memory: 128Mi
373388
limits:
374-
cpu: '1'
389+
cpu: "1"
375390
memory: 512Mi
391+
_rawValues: {}
376392
tekton:
377393
resources:
378394
dashboard:
@@ -382,6 +398,7 @@ environments:
382398
requests:
383399
cpu: 10m
384400
memory: 64Mi
401+
_rawValues: {}
385402
loki:
386403
enabled: false
387404
resources:
@@ -463,9 +480,11 @@ environments:
463480
maxReplicas: 3
464481
targetCPUUtilizationPercentage: 80
465482
targetMemoryUtilizationPercentage: 80
483+
_rawValues: {}
466484
metrics-server:
467485
apiServer:
468486
create: true
487+
_rawValues: {}
469488
minio:
470489
enabled: false
471490
provisioning:
@@ -478,13 +497,18 @@ environments:
478497
cpu: 500m
479498
memory: 128Mi
480499
limits:
481-
cpu: '1'
500+
cpu: "1"
482501
memory: 1Gi
483-
oauth2-proxy: {}
484-
oauth2-proxy-redis: {}
502+
_rawValues: {}
503+
oauth2-proxy:
504+
_rawValues: {}
505+
oauth2-proxy-redis:
506+
_rawValues: {}
485507
otomi-api:
486508
editorInactivityTimeout: 1
487-
otomi-console: {}
509+
_rawValues: {}
510+
otomi-console:
511+
_rawValues: {}
488512
otomi-operator:
489513
resources:
490514
operator:
@@ -494,6 +518,7 @@ environments:
494518
limits:
495519
cpu: 200m
496520
memory: 256Mi
521+
_rawValues: {}
497522
apl-harbor-operator:
498523
resources:
499524
operator:
@@ -503,6 +528,7 @@ environments:
503528
limits:
504529
cpu: 200m
505530
memory: 256Mi
531+
_rawValues: {}
506532
apl-gitea-operator:
507533
resources:
508534
operator:
@@ -512,6 +538,7 @@ environments:
512538
limits:
513539
cpu: 200m
514540
memory: 256Mi
541+
_rawValues: {}
515542
apl-keycloak-operator:
516543
resources:
517544
operator:
@@ -521,9 +548,12 @@ environments:
521548
limits:
522549
cpu: 200m
523550
memory: 256Mi
551+
_rawValues: {}
524552
promtail:
525553
enabled: false
526-
prometheus-blackbox-exporter: {}
554+
_rawValues: {}
555+
prometheus-blackbox-exporter:
556+
_rawValues: {}
527557
prometheus:
528558
enabled: false
529559
disabledRules:
@@ -536,8 +566,10 @@ environments:
536566
scrapeInterval: 60s
537567
retentionSize: 4GB
538568
storageSize: 5Gi
569+
_rawValues: {}
539570
redis-shared:
540571
enabled: false
572+
_rawValues: {}
541573
otel:
542574
enabled: false
543575
collector:
@@ -573,6 +605,7 @@ environments:
573605
limits:
574606
cpu: 500m
575607
memory: 128Mi
608+
_rawValues: {}
576609
sealed-secrets:
577610
resources:
578611
operator:
@@ -582,6 +615,7 @@ environments:
582615
limits:
583616
cpu: 2000m
584617
memory: 1024Mi
618+
_rawValues: {}
585619
tempo:
586620
enabled: false
587621
resources:
@@ -658,6 +692,7 @@ environments:
658692
maxReplicas: 3
659693
targetCPUUtilizationPercentage: 80
660694
targetMemoryUtilizationPercentage: 80
695+
_rawValues: {}
661696
rabbitmq:
662697
enabled: false
663698
resources:
@@ -675,6 +710,7 @@ environments:
675710
limits:
676711
cpu: 900m
677712
memory: 512Mi
713+
_rawValues: {}
678714
trivy:
679715
enabled: false
680716
operator:
@@ -694,6 +730,7 @@ environments:
694730
limits:
695731
cpu: 500m
696732
memory: 512Mi
733+
_rawValues: {}
697734
velero:
698735
enabled: false
699736
restic:
@@ -706,10 +743,11 @@ environments:
706743
limits:
707744
cpu: 1000m
708745
memory: 512Mi
746+
_rawValues: {}
709747
databases:
710748
keycloak:
711749
imported: false
712-
size: '5Gi'
750+
size: 5Gi
713751
replicas: 2
714752
resources:
715753
limits:
@@ -719,13 +757,13 @@ environments:
719757
cpu: 50m
720758
memory: 256Mi
721759
harbor:
722-
size: '5Gi'
760+
size: 5Gi
723761
replicas: 2
724762
coreDatabase: registry
725763
gitea:
726764
useOtomiDB: true
727765
imported: false
728-
size: '5Gi'
766+
size: 5Gi
729767
replicas: 2
730768
resources:
731769
limits:
@@ -738,11 +776,11 @@ environments:
738776
provider:
739777
type: disabled
740778
buckets:
741-
loki: loki
742-
cnpg: cnpg
743-
velero: velero
744-
harbor: harbor
745-
tempo: tempo
779+
loki: loki
780+
cnpg: cnpg
781+
velero: velero
782+
harbor: harbor
783+
tempo: tempo
746784
platformBackups:
747785
database:
748786
harbor:

‎values-schema.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -1858,6 +1858,8 @@ properties:
18581858
enabled:
18591859
type: boolean
18601860
default: false
1861+
_rawValues:
1862+
$ref: '#/definitions/rawValues'
18611863
ingress-nginx-platform:
18621864
$ref: '#/definitions/ingressNginx'
18631865
istio:
@@ -2010,6 +2012,8 @@ properties:
20102012
knative:
20112013
additionalProperties: false
20122014
properties:
2015+
_rawValues:
2016+
$ref: '#/definitions/rawValues'
20132017
enabled:
20142018
type: boolean
20152019
default: true
@@ -2432,6 +2436,8 @@ properties:
24322436
$ref: '#/definitions/resources'
24332437
otel:
24342438
properties:
2439+
_rawValues:
2440+
$ref: '#/definitions/rawValues'
24352441
enabled:
24362442
type: boolean
24372443
default: false

‎versions.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
api: dvk-simplify-app-values
2-
console: dvk-simplify-app-values
1+
api: main
2+
console: main
33
tasks: 3.0.0
44
tools: 1.6.4

0 commit comments

Comments
 (0)