Change nodeselector for CDN-remote and modify docker repository for CDN-local and CDN-remote in M-CORD
Change-Id: I2c1749a946b4d51ac96475cfa0daeb941c53af7d
diff --git a/mcord/mcord-cdn-remote/Chart.yaml b/mcord/mcord-cdn-remote/Chart.yaml
index c6685a2..72e0ba1 100644
--- a/mcord/mcord-cdn-remote/Chart.yaml
+++ b/mcord/mcord-cdn-remote/Chart.yaml
@@ -18,4 +18,4 @@
appVersion: "1.0"
description: A Helm chart for MCORD CDN Services in Remote cloud
name: mcord-cdn-remote
-version: 0.1.1
+version: 0.1.2
diff --git a/mcord/mcord-cdn-remote/templates/namespace.yaml b/mcord/mcord-cdn-remote/templates/namespace.yaml
new file mode 100644
index 0000000..1fe2177
--- /dev/null
+++ b/mcord/mcord-cdn-remote/templates/namespace.yaml
@@ -0,0 +1,23 @@
+# Copyright 2017-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.
+
+#
+# Observation:
+# It appears that when a namespace is created, Kubernetes creates
+# a ServiceAccount called "default" for that new namespace.
+#
+apiVersion: v1
+kind: Namespace
+metadata:
+ name: {{ .Values.namespace }}
\ No newline at end of file
diff --git a/mcord/mcord-cdn-remote/templates/remote-vlc.yaml b/mcord/mcord-cdn-remote/templates/remote-vlc.yaml
index b352bc1..62b9a5e 100644
--- a/mcord/mcord-cdn-remote/templates/remote-vlc.yaml
+++ b/mcord/mcord-cdn-remote/templates/remote-vlc.yaml
@@ -54,7 +54,7 @@
hostNetwork: true
terminationGracePeriodSeconds: 1
nodeSelector:
- remote-vlc: remote-vlc
+ kubernetes.io/hostname: {{ .Values.node_selector }}
containers:
- name: streaming
image: {{ .Values.remote_vlc.images.remote_vlc_image }}
diff --git a/mcord/mcord-cdn-remote/templates/wowza.yaml b/mcord/mcord-cdn-remote/templates/wowza.yaml
index 4db08ed..f405551 100644
--- a/mcord/mcord-cdn-remote/templates/wowza.yaml
+++ b/mcord/mcord-cdn-remote/templates/wowza.yaml
@@ -56,7 +56,7 @@
imagePullSecrets:
- name: nexus-docker-secret
nodeSelector:
- wowza: wowza
+ kubernetes.io/hostname: {{ .Values.node_selector }}
initContainers:
- name: "wowza-init"
image: {{ .Values.wowza.images.wowza_image }}
diff --git a/mcord/mcord-cdn-remote/values.yaml b/mcord/mcord-cdn-remote/values.yaml
index aff0755..94fdf4c 100644
--- a/mcord/mcord-cdn-remote/values.yaml
+++ b/mcord/mcord-cdn-remote/values.yaml
@@ -14,12 +14,13 @@
# limitations under the License.
namespace: wowz
+node_selector: node1
wowza_hostname: "wowza"
remote_vlc_hostname: "remote-vlc"
wowza:
images:
- wowza_image: "10.90.0.131:30500/wowza:latest"
+ wowza_image: "wowzamedia/wowza-streaming-engine-linux"
ports:
rtmp: 1935
streammanager: 8086