Split out BBU from mcord-data-plane chart
Change-Id: I2f0f7cba4fcc5b9fe8147f3e53867773f8508650
diff --git a/mcord/mcord-data-plane/Chart.yaml b/mcord/mcord-data-plane/Chart.yaml
index de3d208..2c685ea 100644
--- a/mcord/mcord-data-plane/Chart.yaml
+++ b/mcord/mcord-data-plane/Chart.yaml
@@ -18,4 +18,4 @@
appVersion: "1.0"
description: A Helm chart for MCORD Data Plane Services
name: mcord-data-plane
-version: 0.1.4
+version: 0.2.0
diff --git a/mcord/mcord-data-plane/templates/accelleran.yaml b/mcord/mcord-data-plane/templates/accelleran.yaml
deleted file mode 100644
index 6acd07c..0000000
--- a/mcord/mcord-data-plane/templates/accelleran.yaml
+++ /dev/null
@@ -1,141 +0,0 @@
----
-# Copyright 2018-present Open Networking Foundation
-# Copyright 2018 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-apiVersion: v1
-kind: Service
-metadata:
- name: accelleran
-spec:
- selector:
- app: accelleran
- clusterIP: None
- ports:
- - name: s1ap
- port: {{ .Values.accelleran.ports.s1ap }}
- protocol: TCP
-
----
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
- name: accelleran
- labels:
- app: accelleran
-spec:
- replicas: {{ .Values.accelleran.replicas }}
- selector:
- matchLabels:
- app: accelleran
- serviceName: "accelleran"
- template:
- metadata:
- labels:
- app: accelleran
- annotations:
- k8s.v1.cni.cncf.io/networks: '[
- { "name": "bbu-net", "interface": "vbbu-net", "namespace": "default" }
- ]'
- spec:
- initContainers:
- - name: init-iptables
- image: {{ .Values.accelleran.images.init }}
- command: [ "sh", "-c"]
- args:
- - iptables -I OUTPUT -p icmp --icmp-type destination-unreachable -j DROP;
- securityContext:
- capabilities:
- add:
- - NET_ADMIN
- terminationGracePeriodSeconds: 1
- containers:
- - name: nats
- image: {{ .Values.accelleran.images.nats }}
- imagePullPolicy: IfNotPresent
- stdin: true
- tty: true
- env:
- - name: NATS_SERVICE_NAME
- value: {{ .Values.accelleran.nats_service_name }}
- command: [ "sh", "-c"]
- args:
- - gnatsd -DV -c /etc/gnatsd.conf;
- resources:
- limits:
- cpu: {{ .Values.accelleran.resources.cpu }}
- memory: {{ .Values.accelleran.resources.mem }}
- intel.com/sriov: '2'
- securityContext:
- capabilities:
- add:
- - NET_ADMIN
- - IPC_LOCK
- - name: redis
- image: {{ .Values.accelleran.images.redis }}
- imagePullPolicy: IfNotPresent
- stdin: true
- tty: true
- command: ["sh", "-c"]
- args:
- # FIXME: Redis can't support with dns resolution, can't set hostname at here.
- - (sleep 5; redis-cli -h localhost -p 6379 set NATS_SERVICE_URL "nat://$(ip route get 116 | awk '{print $NF;exit}'):4222";) &
- /usr/local/bin/redis-server
- resources:
- limits:
- cpu: {{ .Values.accelleran.resources.cpu }}
- memory: {{ .Values.accelleran.resources.mem }}
- intel.com/sriov: '2'
- securityContext:
- capabilities:
- add:
- - NET_ADMIN
- - IPC_LOCK
- - name: bbu
- image: {{ .Values.accelleran.images.bbu }}
- imagePullPolicy: IfNotPresent
- env:
- - name: HOST_IP
- value: {{ .Values.accelleran_hostname }}
- stdin: true
- tty: true
- command: ["sh", "-c"]
- args:
- - sqlite3 /mnt/app/datastoreRemRw.db "update FapServiceFapControlLteGateway_S1SigLinkServerListList set S1SigLinkServerList='{{ .Values.accelleran_hostname }}';";
- sleep 10;
- /l3/l3start;
- volumeMounts:
- - name: bbu-config
- mountPath: /mnt/app/bootstrap.txt
- subPath: bootstrap.txt
- resources:
- limits:
- cpu: {{ .Values.accelleran.resources.cpu }}
- memory: {{ .Values.accelleran.resources.mem }}
- intel.com/sriov: '2'
- securityContext:
- capabilities:
- add:
- - NET_ADMIN
- - IPC_LOCK
- - SYS_NICE
- volumes:
- - name: bbu-config
- configMap:
- name: l3-config
- items:
- - key: bootstrap.txt
- path: bootstrap.txt
-
diff --git a/mcord/mcord-data-plane/templates/cm.yaml b/mcord/mcord-data-plane/templates/cm.yaml
index 5686236..f2b7f7c 100644
--- a/mcord/mcord-data-plane/templates/cm.yaml
+++ b/mcord/mcord-data-plane/templates/cm.yaml
@@ -436,13 +436,3 @@
PROTOCOL = 17
LOCAL_LOW_LIMIT_PORT = 17000
LOCAL_HIGH_LIMIT_PORT = 17010
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: l3-config
-data:
- bootstrap.txt: |
- redis.hostname:{{ .Values.accelleran_hostname }}
- redis.port:6379
- instance.filter:{{ .Values.accelleran.inst_id }}
diff --git a/mcord/mcord-data-plane/values.yaml b/mcord/mcord-data-plane/values.yaml
index f0d527f..62adfb3 100644
--- a/mcord/mcord-data-plane/values.yaml
+++ b/mcord/mcord-data-plane/values.yaml
@@ -21,7 +21,6 @@
redis_hostname: "redis"
controlplane_hostname: "ngic-cp"
controlplane_port: 21
-accelleran_hostname: "accelleran"
ngic_dp:
images:
@@ -40,19 +39,4 @@
dpdk_enabled: false
hugepage_enabled: true
-accelleran:
- images:
- init: "ngick8stesting/c3po-mmeinit"
- nats: "10.90.0.131:30500/ngick8stesting/vbbu-nats:20190121"
- redis: "10.90.0.131:30500/ngick8stesting/vbbu-redis:20190121"
- bbu: "10.90.0.131:30500/accelleran/vran-l3-fdd:onf-dns"
- ports:
- s1ap: 36412
- replicas: 1
- nats_service_name: "nats-cluster"
- inst_id: "enb_key"
- resources:
- cpu: 3
- mem: "1Gi"
-
namespace: epc