Merge "Add ESR containers to ONAP K8S."

6 files changed, 140 insertions, 1 deletions

diff --git a/kubernetes/esr/Chart.yaml b/kubernetes/esr/Chart.yaml
new file mode 100644
index 0000000000..8f55bd69a8
--- /dev/null
+++ b/kubernetes/esr/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+description: A Helm chart for Kubernetes
+name: esr
+version: 1.1.0
diff --git a/kubernetes/esr/templates/all-services.yaml b/kubernetes/esr/templates/all-services.yaml
new file mode 100644
index 0000000000..68f0db7516
--- /dev/null
+++ b/kubernetes/esr/templates/all-services.yaml
@@ -0,0 +1,53 @@
+#{{ if not .Values.disableEsrServer }}
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: esr-esrserver
+  name: esr-esrserver
+  namespace: "{{ .Values.nsPrefix }}-esr"
+  annotations:
+    msb.onap.org/service-info: '[
+      {
+          "serviceName": "aai-esr-server",
+          "version": "v1",
+          "url": "/api/aai-esr-server/v1",
+          "protocol": "REST",
+          "port": "{{.Values.esrserver.port}}",
+          "visualRange":"1"
+      }
+      ]'
+spec:
+  ports:
+  - name: esr-esrserver
+    port: {{.Values.esrserver.port}}
+  selector:
+    app: esr-esrserver
+#{{ end }}
+#{{ if not .Values.disableEsrGui }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: esr-esrgui
+  name: esr-esrgui
+  namespace: "{{ .Values.nsPrefix }}-esr"
+  annotations:
+    msb.onap.org/service-info: '[
+      {
+          "serviceName": "aai-esr-gui",
+          "version": "v1",
+          "url": "/esr-gui",
+          "protocol": "UI",
+          "port": "{{.Values.esrgui.port}}",
+          "visualRange":"1"
+      }
+      ]'
+spec:
+  ports:
+  - name: esr-esrgui
+    port: {{.Values.esrgui.port}}
+  selector:
+    app: esr-esrgui
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/esr/templates/esr-esrgui-deployment.yaml b/kubernetes/esr/templates/esr-esrgui-deployment.yaml
new file mode 100644
index 0000000000..6c3ddf404d
--- /dev/null
+++ b/kubernetes/esr/templates/esr-esrgui-deployment.yaml
@@ -0,0 +1,35 @@
+#{{ if not .Values.disableesrgui }}
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    app: esr-esrgui
+  name: esr-esrgui
+  namespace: "{{ .Values.nsPrefix }}-esr"
+spec:
+  selector:
+    matchLabels:
+      app: esr-esrgui
+  template:
+    metadata:
+      labels:
+        app: esr-esrgui
+      name: esr-esrgui
+    spec:
+      containers:
+      - image: {{ .Values.esrgui.image }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: esr-esrgui
+        env:
+        - name: MSB_ADDR
+          value: {{ .Values.msbaddr }}
+        ports:
+        - containerPort: {{ .Values.esrgui.port }}
+        readinessProbe:
+          tcpSocket:
+            port: 8080
+          initialDelaySeconds: 5
+          periodSeconds: 10
+      imagePullSecrets:
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/esr/templates/esr-esrserver-deployment.yaml b/kubernetes/esr/templates/esr-esrserver-deployment.yaml
new file mode 100644
index 0000000000..7724fa0d24
--- /dev/null
+++ b/kubernetes/esr/templates/esr-esrserver-deployment.yaml
@@ -0,0 +1,35 @@
+#{{ if not .Values.disableUuiUui }}
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    app: esr-esrserver
+  name: esr-esrserver
+  namespace: "{{ .Values.nsPrefix }}-esr"
+spec:
+  selector:
+    matchLabels:
+      app: esr-esrserver
+  template:
+    metadata:
+      labels:
+        app: esr-esrserver
+      name: esr-esrserver
+    spec:
+      containers:
+      - image: {{ .Values.esrserver.image }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: esr-esrserver
+        env:
+        - name: MSB_ADDR
+          value: {{ .Values.msbaddr }}
+        ports:
+        - containerPort: {{ .Values.esrserver.port }}
+        readinessProbe:
+          tcpSocket:
+            port: {{ .Values.esrserver.port }}
+          initialDelaySeconds: 5
+          periodSeconds: 10
+      imagePullSecrets:
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/esr/values.yaml b/kubernetes/esr/values.yaml
new file mode 100644
index 0000000000..8cdc484ef2
--- /dev/null
+++ b/kubernetes/esr/values.yaml
@@ -0,0 +1,12 @@
+nsPrefix: onap
+pullPolicy: Always
+nodePortPrefix: 302
+msbaddr: msb-iag.onap-msb:80
+esrserver:
+  image: nexus3.onap.org:10001/onap/aai/esr-server:v1.0.0
+  port: 9518
+  replicas: 1
+esrgui:
+  image: nexus3.onap.org:10001/onap/aai/esr-gui:v1.0.0
+  port: 8080
+  replicas: 1
diff --git a/kubernetes/oneclick/setenv.bash b/kubernetes/oneclick/setenv.bash
index add69f39a1..312d2c45fb 100644
--- a/kubernetes/oneclick/setenv.bash
+++ b/kubernetes/oneclick/setenv.bash
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Deploying MSB first and kube2msb last will ensure all the ONAP services can be registered to MSB
-HELM_APPS=('consul' 'msb' 'mso' 'message-router' 'sdnc' 'vid' 'robot' 'portal' 'policy' 'appc' 'aai' 'sdc' 'dcaegen2' 'log' 'cli' 'multicloud' 'clamp' 'vnfsdk' 'uui' 'aaf' 'vfc' 'kube2msb')
+HELM_APPS=('consul' 'msb' 'mso' 'message-router' 'sdnc' 'vid' 'robot' 'portal' 'policy' 'appc' 'aai' 'sdc' 'dcaegen2' 'log' 'cli' 'multicloud' 'clamp' 'vnfsdk' 'uui' 'aaf' 'vfc' 'kube2msb' 'esr')
 ONAP_DOCKER_REGISTRY=${ONAP_DOCKER_REGISTRY:-nexus3.onap.org:10001}
 ONAP_DOCKER_USER=${ONAP_DOCKER_USER:-docker}
 ONAP_DOCKER_PASS=${ONAP_DOCKER_PASS:-docker}