Merge "Remove VVP from OOM"

3 files changed, 0 insertions, 121 deletions

diff --git a/kubernetes/vvp/charts/vvp-ext-haproxy/templates/configmap.yaml b/kubernetes/vvp/charts/vvp-ext-haproxy/templates/configmap.yaml
deleted file mode 100644
index 0bb0e264cb..0000000000
--- a/kubernetes/vvp/charts/vvp-ext-haproxy/templates/configmap.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright © 2018 Amdocs, AT&T, 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.
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.fullname" . }}-cfg
-  namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/config/ext-haproxy-cfg/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/vvp/charts/vvp-ext-haproxy/templates/deployment.yaml b/kubernetes/vvp/charts/vvp-ext-haproxy/templates/deployment.yaml
deleted file mode 100644
index 74a0ad2702..0000000000
--- a/kubernetes/vvp/charts/vvp-ext-haproxy/templates/deployment.yaml
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright © 2018 Amdocs, AT&T, 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.
-
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: {{ include "common.fullname" . }}
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}
-spec:
-  replicas: {{ .Values.replicaCount }}
-  template:
-    metadata:
-      labels:
-        app: {{ include "common.name" . }}
-      name: {{ .Release.Name }}
-    spec:
-      imagePullSecrets:
-      - name: onapkey
-      containers:
-      - name: {{ include "common.name" . }}
-        image: "{{ include "common.repository" . }}/{{ .Values.image }}"
-        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        ports:
-        - containerPort: 80
-        - containerPort: 22
-        - containerPort: 443
-        - containerPort: 9001
-        env:
-        - name: HAPROXY_USER
-          valueFrom:
-            secretKeyRef:
-              name: haproxy-auth
-              key: user
-        - name: HAPROXY_PASS
-          valueFrom:
-            secretKeyRef:
-              name: haproxy-auth
-              key: pass
-        volumeMounts:
-        - mountPath: /usr/local/etc/haproxy/
-          name: ext-haproxy-cfg
-        - mountPath: /etc/haproxy/
-          name: site-pem
-      volumes:
-      - name: ext-haproxy-cfg
-        configMap:
-          name: {{ include "common.fullname" . }}-cfg
-          items:
-          - key: file
-            path: haproxy.cfg
-      - name: site-pem
-        secret:
-          secretName: site-pem
diff --git a/kubernetes/vvp/charts/vvp-ext-haproxy/templates/service.yaml b/kubernetes/vvp/charts/vvp-ext-haproxy/templates/service.yaml
deleted file mode 100644
index bcc41c1671..0000000000
--- a/kubernetes/vvp/charts/vvp-ext-haproxy/templates/service.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright © 2018 Amdocs, AT&T, 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.
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "common.servicename" . }}
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-    - port: {{ .Values.service.internalPort1 }}
-      name: {{ .Values.service.portName1 }}
-    - port: {{ .Values.service.internalPort2 }}
-      name: {{ .Values.service.portName2 }}
-    - port: {{ .Values.service.internalPort3 }}
-      name: {{ .Values.service.portName3 }}
-    - port: {{ .Values.service.internalPort4 }}
-      name: {{ .Values.service.portName4 }}
-  selector:
-    app: {{ include "common.name" . }}