Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[COMMON] Harmonize resource settings, Part 2
[oom.git]
/
kubernetes
/
oof
/
components
/
oof-has
/
values.yaml
diff --git
a/kubernetes/oof/components/oof-has/values.yaml
b/kubernetes/oof/components/oof-has/values.yaml
index
0c5397c
..
33558c4
100755
(executable)
--- a/
kubernetes/oof/components/oof-has/values.yaml
+++ b/
kubernetes/oof/components/oof-has/values.yaml
@@
-27,11
+27,6
@@
global:
# Secrets metaconfig
#################################################################
secrets:
# Secrets metaconfig
#################################################################
secrets:
- - uid: oof-onap-certs
- name: &oof-certs '{{ include "common.release" . }}-oof-onap-certs'
- externalSecret: '{{ tpl (default "" .Values.certSecret) . }}'
- type: generic
- filePaths: '{{ .Values.secretsFilePaths }}'
- uid: oof-has-etcd-root-password
name: &root-password '{{ include "common.release" . }}-has-etcd-root-password'
type: password
- uid: oof-has-etcd-root-password
name: &root-password '{{ include "common.release" . }}-has-etcd-root-password'
type: password
@@
-50,31
+45,20
@@
nodePortPrefix: 302
dataRootDir: /dockerdata-nfs
config:
dbBackend: etcd
dataRootDir: /dockerdata-nfs
config:
dbBackend: etcd
- aaf:
- serviceName: aaf-service
- port: 8100
aai:
serviceName: aai
aai:
serviceName: aai
- port: 8443
- plainPort: 80
+ port: 80
msb:
serviceName: msb-iag
port: 80
msb:
serviceName: msb-iag
port: 80
- music:
- serviceName: music
- port: 8443
- sms:
- serviceName: aaf-sms
- port: 10443
sdc:
serviceName: sdc-be
sdc:
serviceName: sdc-be
- port: 8443
- plainPort: 8080
+ port: 8080
cps:
cps:
- service: cps-tbdmt
+ service
Name
: cps-tbdmt
port: 8080
dcae:
port: 8080
dcae:
- service: dcae-slice-analysis-ms
+ service
Name
: dcae-slice-analysis-ms
port: 8080
etcd:
serviceName: &etcd-service oof-has-etcd
port: 8080
etcd:
serviceName: &etcd-service oof-has-etcd
@@
-89,24
+73,23
@@
flavor: small
resources:
small:
limits:
resources:
small:
limits:
- memory: 2Gi
- cpu: 1000m
+ cpu: "1"
+ memory: "2Gi"
requests:
requests:
- memory: 1Gi
- cpu: 500m
+ cpu: "0.5"
+ memory: "1Gi"
large:
limits:
large:
limits:
- memory: 4Gi
- cpu: 2000m
+ cpu: "2"
+ memory: "4Gi"
requests:
requests:
- memory: 2Gi
- cpu: 1000m
+ cpu: "1"
+ memory: "2Gi"
unlimited: {}
#component overrides
oof-has-api: &has-config
enabled: true
unlimited: {}
#component overrides
oof-has-api: &has-config
enabled: true
- certSecret: *oof-certs
config:
etcd:
userCredentialsExternalSecret: *user-creds
config:
etcd:
userCredentialsExternalSecret: *user-creds
@@
-115,8
+98,6
@@
oof-has-controller: *has-config
oof-has-data: *has-config
oof-has-reservation: *has-config
oof-has-solver: *has-config
oof-has-data: *has-config
oof-has-reservation: *has-config
oof-has-solver: *has-config
-music:
- enabled: false
#etcd subchart configurations
etcd:
#etcd subchart configurations
etcd:
@@
-132,18
+113,18
@@
etcd:
resources: &etcd-resources
small:
limits:
resources: &etcd-resources
small:
limits:
- cpu:
100m
- memory:
300Mi
+ cpu:
"100m"
+ memory:
"300Mi"
requests:
requests:
- cpu:
10m
- memory:
75Mi
+ cpu:
"10m"
+ memory:
"70Mi"
large:
limits:
large:
limits:
- cpu:
200m
- memory:
1Gi
+ cpu:
"200m"
+ memory:
"1Gi"
requests:
requests:
- cpu:
50m
- memory:
300Mi
+ cpu:
"50m"
+ memory:
"300Mi"
unlimited: {}
etcd-init:
unlimited: {}
etcd-init:
@@
-160,6
+141,8
@@
etcd-init:
keyPrefix: conductor
flavor: *etcd-flavor
resources: *etcd-resources
keyPrefix: conductor
flavor: *etcd-flavor
resources: *etcd-resources
+ serviceAccount:
+ nameOverride: *job-name
# Python doesn't support well dollar sign in password
passwordStrengthOverride: basic
# Python doesn't support well dollar sign in password
passwordStrengthOverride: basic