[COMAC-174] CDN-Local code refactoring - only possible to use SRIOV
- remove unnecessary values in values.yaml
- use camel case
- rename nginx-rtmp to nginx
- allow CDN-Local to use multiple CDN-Remotes
- pull all videos from all CDN-Remotes
- define Roles, RoleBinding, ServiceAccount
- split each POD yaml file into Service, ConfigMap, and StatefulSet
- Remove hard coded values in Service, ConfigMap, and StatefulSet and
then locate them to values.yaml
Change-Id: Ib7c0d674f5aa4118274f1aad6888e373ef5c97be
diff --git a/cdn-services/cdn-local/templates/networks.yaml b/cdn-services/cdn-local/templates/networks.yaml
index 3af289c..54b44a2 100644
--- a/cdn-services/cdn-local/templates/networks.yaml
+++ b/cdn-services/cdn-local/templates/networks.yaml
@@ -1,32 +1,32 @@
----
-# 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.
+{{/*
+Copyright 2019-present Open Networking Foundation
+
+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: "k8s.cni.cncf.io/v1"
kind: NetworkAttachmentDefinition
metadata:
- name: sgi-net-nd
-{{- if .Values.networks.sriov.enabled }}
+ name: sgi-net-cdn
+{{- if .Values.config.sriov.enabled }}
annotations:
k8s.v1.cni.cncf.io/resourceName: intel.com/sriov_netdevice
{{- end }}
spec:
config: '{
- "type": {{ .Values.networks.sgi_net_nd.type | quote }},
+ "type": {{ .Values.networks.cniPlugin | quote }},
"ipam": {
- "type": {{ .Values.networks.sgi_net_nd.ipam | quote }}
+ "type": {{ .Values.networks.ipam | quote }}
}
}'