6 files changed, 0 insertions, 402 deletions
diff --git a/kubernetes/msb/templates/all-services.yaml b/kubernetes/msb/templates/all-services.yaml
deleted file mode 100644
index 572a78dd2d..0000000000
--- a/kubernetes/msb/templates/all-services.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# 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.
-
-#{{ if not .Values.disableMsbMsbConsul }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: msb-consul
-  namespace: "{{ .Values.nsPrefix }}"
-  labels:
-    app: msb-consul
-spec:
-  ports:
-    - port: {{ .Values.consulPort }}
-      nodePort: {{ .Values.consulNodePort }}
-  selector:
-    app: msb-consul
-  type: NodePort
-#{{ end }}
-#{{ if not .Values.disableMsbMsbDiscovery }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: msb-discovery
-  namespace: "{{ .Values.nsPrefix }}"
-  labels:
-    app: msb-discovery
-spec:
-  clusterIP: "{{ .Values.discoveryClusterIP }}"
-  ports:
-    - port: {{ .Values.discoveryPort }}
-      nodePort: {{ .Values.discoveryNodePort }}
-  selector:
-    app: msb-discovery
-  type: NodePort
-#{{ end }}
-#{{ if not .Values.disableMsbMsbIag }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: msb-iag
-  namespace: "{{ .Values.nsPrefix }}"
-  labels:
-    app: msb-iag
-spec:
-  ports:
-    - name: http
-      port: {{ .Values.iagPort }}
-      nodePort: {{ .Values.iagNodePort }}
-    - name: https
-      port: {{ .Values.iagPort_https }}
-      nodePort: {{ .Values.iagNodePort_https }}
-  selector:
-    app: msb-iag
-  type: NodePort
-#{{ end }}
-#{{ if not .Values.disableMsbMsbEag }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: msb-eag
-  namespace: "{{ .Values.nsPrefix }}"
-  labels:
-    app: msb-eag
-spec:
-  ports:
-    - name: http
-      port: {{ .Values.eagPort }}
-      nodePort: {{ .Values.eagNodePort }}
-    - name: https
-      port: {{ .Values.eagPort_https }}
-      nodePort: {{ .Values.eagNodePort_https }}
-  selector:
-    app: msb-eag
-  type: NodePort
-#{{ end }}
diff --git a/kubernetes/msb/templates/kube2msb-registrator-deployment.yaml b/kubernetes/msb/templates/kube2msb-registrator-deployment.yaml
deleted file mode 100644
index 97e7d5f319..0000000000
--- a/kubernetes/msb/templates/kube2msb-registrator-deployment.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# 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.
-
-#{{ if not .Values.disableKube2MsbKube2MsbRegistrator }}
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: kube2msb-registrator
-  namespace: "{{ .Values.nsPrefix }}"
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: kube2msb-registrator
-  template:
-    metadata:
-      labels:
-        app: kube2msb-registrator
-      name: kube2msb-registrator
-    spec:
-      hostname: kube2msb-registrator
-      initContainers:
-      - command:
-        - /root/ready.py
-        args:
-        - --container-name
-        - msb-discovery
-        env:
-        - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: metadata.namespace
-        image: {{ .Values.image.readiness }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: kube2msb-registrator-readiness
-      containers:
-      - args:
-        image: {{ .Values.image.kube2msb }}
-        name: kube2msb-registrator
-        env:
-        - name: KUBE_MASTER_URL
-          value: {{ .Values.kubeMasterUrl }}
-        - name: MSB_URL
-          value: {{tpl $.Values.discoveryUrl .}}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-      imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
diff --git a/kubernetes/msb/templates/msb-consul-deployment.yaml b/kubernetes/msb/templates/msb-consul-deployment.yaml
deleted file mode 100644
index ee5120d42f..0000000000
--- a/kubernetes/msb/templates/msb-consul-deployment.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# 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.
-
-#{{ if not .Values.disableMsbMsbConsul }}
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: msb-consul
-  namespace: "{{ .Values.nsPrefix }}"
-spec:
-  replicas: {{ .Values.msbConsulReplicas }}
-  selector:
-    matchLabels:
-      app: msb-consul
-  template:
-    metadata:
-      labels:
-        app: msb-consul
-      name: msb-consul
-    spec:
-      hostname: msb-consul
-      containers:
-      - args:
-        image: {{ .Values.image.consul }}
-        name: msb-consul
-        ports:
-        - containerPort: {{ .Values.consulPort }}
-          name: msb-consul
-        readinessProbe:
-          tcpSocket:
-            port: {{ .Values.consulPort }}
-          initialDelaySeconds: 5
-          periodSeconds: 10
-        imagePullPolicy: {{ .Values.pullPolicy }}
-#{{ end }}
diff --git a/kubernetes/msb/templates/msb-discovery-deployment.yaml b/kubernetes/msb/templates/msb-discovery-deployment.yaml
deleted file mode 100644
index 583a00f22a..0000000000
--- a/kubernetes/msb/templates/msb-discovery-deployment.yaml
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# 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.
-
-#{{ if not .Values.disableMsbMsbDiscovery }}
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: msb-discovery
-  namespace: "{{ .Values.nsPrefix }}"
-spec:
-  replicas: {{ .Values.discoveryReplicas }}
-  selector:
-    matchLabels:
-      app: msb-discovery
-  template:
-    metadata:
-      labels:
-        app: msb-discovery
-      name: msb-discovery
-    spec:
-      hostname: msb-discovery
-      initContainers:
-      - command:
-        - /root/ready.py
-        args:
-        - --container-name
-        - msb-consul
-        env:
-        - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: metadata.namespace
-        image: {{ .Values.image.readiness }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: msb-discovery-readiness
-      containers:
-      - args:
-        image:  {{ .Values.image.discovery }}
-        name: "msb-discovery"
-        env:
-        - name: CONSUL_IP
-          value: msb-consul.{{ .Values.nsPrefix }}
-        ports:
-        - containerPort: {{ .Values.discoveryPort }}
-          name: msb-discovery
-        readinessProbe:
-          tcpSocket:
-            port: {{ .Values.discoveryPort }}
-          initialDelaySeconds: 5
-          periodSeconds: 10
-        imagePullPolicy: {{ .Values.pullPolicy }}
-      imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
diff --git a/kubernetes/msb/templates/msb-eag-deployment.yaml b/kubernetes/msb/templates/msb-eag-deployment.yaml
deleted file mode 100644
index dd253fce4d..0000000000
--- a/kubernetes/msb/templates/msb-eag-deployment.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# 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.
-
-#{{ if not .Values.disableMsbMsbEag }}
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: msb-eag
-  namespace: "{{ .Values.nsPrefix }}"
-spec:
-  replicas: {{ .Values.eagReplicas }}
-  selector:
-    matchLabels:
-      app: msb-eag
-  template:
-    metadata:
-      labels:
-        app: msb-eag
-      name: msb-eag
-    spec:
-      hostname: msb-eag
-      initContainers:
-      - command:
-        - /root/ready.py
-        args:
-        - --container-name
-        - msb-discovery
-        env:
-        - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: metadata.namespace
-        image: {{ .Values.image.readiness }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: msb-eag-readiness
-      containers:
-      - args:
-        image:  {{ .Values.image.apigateway }}
-        name: "msb-eag"
-        env:
-        - name: CONSUL_IP
-          value:  msb-consul.{{ .Values.nsPrefix }}
-        - name: SDCLIENT_IP
-          value:  msb-discovery.{{ .Values.nsPrefix }}
-        - name: ROUTE_LABELS
-          value: "visualRange:0"
-        ports:
-        - containerPort: {{ .Values.eagPort }}
-          name: msb-eag
-        readinessProbe:
-          tcpSocket:
-            port: {{ .Values.eagPort }}
-          initialDelaySeconds: 5
-          periodSeconds: 10
-        imagePullPolicy: {{ .Values.pullPolicy}}
-      imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
diff --git a/kubernetes/msb/templates/msb-iag-deployment.yaml b/kubernetes/msb/templates/msb-iag-deployment.yaml
deleted file mode 100644
index 9fc5c7b4dd..0000000000
--- a/kubernetes/msb/templates/msb-iag-deployment.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# 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.
-
-#{{ if not .Values.disableMsbMsbIag }}
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: msb-iag
-  namespace: "{{ .Values.nsPrefix }}"
-spec:
-  replicas: {{ .Values.iagReplicas }}
-  selector:
-    matchLabels:
-      app: msb-iag
-  template:
-    metadata:
-      labels:
-        app: msb-iag
-      name: msb-iag
-    spec:
-      hostname: msb-iag
-      initContainers:
-      - command:
-        - /root/ready.py
-        args:
-        - --container-name
-        - msb-discovery
-        env:
-        - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: metadata.namespace
-        image: {{ .Values.image.readiness }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: msb-iag-readiness
-      containers:
-      - args:
-        image:  {{ .Values.image.apigateway }}
-        name: "msb-iag"
-        env:
-        - name: CONSUL_IP
-          value: msb-consul.{{ .Values.nsPrefix }}
-        - name: SDCLIENT_IP
-          value: msb-discovery.{{ .Values.nsPrefix }}
-        - name: ROUTE_LABELS
-          value: "visualRange:1"
-        ports:
-        - containerPort: {{ .Values.iagPort }}
-          name: msb-iag
-        readinessProbe:
-          tcpSocket:
-            port: {{ .Values.iagPort }}
-          initialDelaySeconds: 5
-          periodSeconds: 10
-        imagePullPolicy: "{{ .Values.pullPolicy}}"
-      imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}