SDFAB-993 Optimize helm values across component and umbrella chart
Also fix an NPE in secret-registry.yaml
Change-Id: I8178cfa050226482c0027b5a093bf4ef61a2b790
diff --git a/sdfabric/values.yaml b/sdfabric/values.yaml
index 7253cb7..24c4e36 100644
--- a/sdfabric/values.yaml
+++ b/sdfabric/values.yaml
@@ -2,20 +2,13 @@
#
# SPDX-License-Identifier: Apache-2.0
-image:
- credential:
- secretName: &image-secret-name registry-credential
- registry: registry.aetherproject.org
- username: changeit
- password: changeit
-
import:
onos-classic:
enabled: true
stratum:
enabled: true
pfcp-agent:
- enabled: false
+ enabled: true
dbuf:
enabled: false
int-host-reporter:
@@ -29,8 +22,6 @@
image:
repository: registry.aetherproject.org/tost/tost
tag: 1.0.2
- pullSecrets:
- - *image-secret-name
replicas: 3
@@ -97,31 +88,29 @@
# Please check the README to learn more
config:
- netcfg: >
- {}
- componentConfig: {}
- # netcfg: >
- # {
- # "devices": {
- # "device:leaf1": {
- # "segmentrouting": {
- # "ipv4NodeSid": 101,
- # "ipv4Loopback": "10.11.22.33",
- # "routerMac": "aa:bb:cc:dd:ee:ff",
- # "pairDeviceId" : "device:leaf2",
- # "pairLocalPort" : 260,
- # "isEdgeRouter": true,
- # "adjacencySids": []
- # }
- # }
- # }
- # }
- # componentConfig:
- # "org.onosproject.net.host.impl.HostManager": >
- # {
- # "monitorHosts": "true",
- # "probeRate": "10000"
- # }
+ componentConfig:
+ "org.onosproject.net.host.impl.HostManager": >
+ {
+ "monitorHosts": "true",
+ "probeRate": "10000"
+ }
+ # Please check the README to learn more
+ # netcfg: >
+ # {
+ # "devices": {
+ # "device:leaf1": {
+ # "segmentrouting": {
+ # "ipv4NodeSid": 101,
+ # "ipv4Loopback": "10.11.22.33",
+ # "routerMac": "aa:bb:cc:dd:ee:ff",
+ # "pairDeviceId" : "device:leaf2",
+ # "pairLocalPort" : 260,
+ # "isEdgeRouter": true,
+ # "adjacencySids": []
+ # }
+ # }
+ # }
+ # }
stratum:
image:
@@ -144,16 +133,14 @@
fluentbit.io/parser: stratum
# Specify nodeSelector to pin Stratum to switches only
- #
- # nodeSelector:
- # node-role.aetherproject.org: switch
+ nodeSelector:
+ node-role.aetherproject.org: switch
# Override NoSchedule for Stratum to be scheduled on switches
- #
- # tolerations:
- # - key: node-role.aetherproject.org
- # value: switch
- # effect: NoSchedule
+ tolerations:
+ - key: node-role.aetherproject.org
+ value: switch
+ effect: NoSchedule
# Please check the README to learn more
# chassis_config:
@@ -180,131 +167,3 @@
# }
# node: 1
# }
-
-
-pfcp-agent:
- images:
- tags:
- init: registry.aetherproject.org/tools/busybox:stable
- pfcpiface: "registry.aetherproject.org/proxy/omecproject/upf-epc-pfcpiface:master-fcdbc95"
- pullPolicy: Always
- pullSecrets:
- - *image-secret-name
- nodeSelectors:
- enabled: false
- pfcp:
- label: omec-upf
- value: enabled
- resources:
- enabled: true
- pfcpiface:
- requests:
- cpu: 256m
- memory: 128Mi
- limits:
- cpu: 256m
- memory: 128Mi
- config:
- coreDump:
- enabled: false
- path: /tmp/coredump
- pfcp:
- cfgFiles:
- upf.json:
- measure: true
- enable_p4rt: true
- p4rtciface:
- # Should be the same as s1uAddr in ONOS netcfg for the UP4 app.
- access_ip: "172.17.0.1/32"
- # Do not change unless you are deploying ONOS in a custom way.
- p4rtc_server: "sdfabric-onos-classic-hs.sdfabric"
- p4rtc_port: "51001"
- service:
- type: ClusterIP
- #externalIp:
- #annotations:
-
-dbuf:
- image:
- repository: registry.aetherproject.org/tost/dbuf
- pullPolicy: Always
- tag: "1.0.0"
- pullSecrets:
- - *image-secret-name
- extraParams:
- - '"-max_queues=1024"'
- replicaCount: 1
- sriovNICSize: 1
- sriovResourceName: intel_sriov_netdevice
- # Change both in the same time
- multusNetworkName: dbuf-sriov
- podAnnotations:
- k8s.v1.cni.cncf.io/networks: dbuf-sriov@net0
- podSecurityContext: {}
- resources:
- requests:
- intel.com/intel_sriov_netdevice: "1"
- limits:
- intel.com/intel_sriov_netdevice: "1"
- nodeSelector: {}
- tolerations: []
- affinity: {}
- # onos inforamtion
- onos:
- server: sdfabric-onos-classic-hs.sdfabric
- port: 8181
- username: onos
- password: rocks
- dataplane:
- port: 2152
- interface: "net0"
- prometheus_enable: true
- service:
- stats:
- port: 8080
- protocol: TCP
- grpc:
- port: 10000
- protocol: TCP
- # two options for ipam, dhcp or host-local
- # static is for host-local ipam
- network:
- # ipam: dhcp
- ipam: host-local
- static:
- subnets: "10.56.217.0/24"
- gateway: "10.56.217.1"
- # route the following subnets via sr-iov interface
- # route: 10.56.215.0/24,10.56.214.0/24
- route: ""
- #vlan:
-
-int-host-reporter:
- image:
- repository: registry.hub.docker.com/opennetworking/int-host-reporter
- pullPolicy: Always
- # Overrides the image tag whose default is the chart appVersion.
- tag: "latest"
-
- cni: cilium
- dataInterface: enp0s8
- intCollector: 192.168.33.50:30001
-
- intWatchlistRules:
- # - protocol: "UDP"
- # src-addr: "192.168.99.50/32"
- # dst-addr: "192.168.99.20/32"
- # - protocol: "TCP"
- # src-addr: "192.168.99.50/32"
- # dst-addr: "192.168.99.20/32"
-
-di-topology-watchdog:
- image:
- pullSecrets:
- - *image-secret-name
- onosAddr: sdfabric-onos-classic-hs.tost:8181
-
-di-metrics-exporter:
- image:
- pullSecrets:
- - *image-secret-name