diff options
| -rw-r--r-- | kubernetes/kube2msb/Chart.yaml (renamed from kubernetes/oom/Chart.yaml) | 0 | ||||
| -rw-r--r-- | kubernetes/kube2msb/templates/kube2msb-registrator-deployment.yaml (renamed from kubernetes/oom/templates/oom-registrator-deployment.yaml) | 14 | ||||
| -rw-r--r-- | kubernetes/kube2msb/values.yaml (renamed from kubernetes/oom/values.yaml) | 0 | ||||
| -rw-r--r-- | kubernetes/msb/templates/all-services.yaml | 48 | ||||
| -rw-r--r-- | kubernetes/portal/templates/all-services.yaml | 11 |
5 files changed, 42 insertions, 31 deletions
diff --git a/kubernetes/oom/Chart.yaml b/kubernetes/kube2msb/Chart.yaml index 97a3454337..97a3454337 100644 --- a/kubernetes/oom/Chart.yaml +++ b/kubernetes/kube2msb/Chart.yaml diff --git a/kubernetes/oom/templates/oom-registrator-deployment.yaml b/kubernetes/kube2msb/templates/kube2msb-registrator-deployment.yaml index 14329499cc..502c1fa50f 100644 --- a/kubernetes/oom/templates/oom-registrator-deployment.yaml +++ b/kubernetes/kube2msb/templates/kube2msb-registrator-deployment.yaml @@ -1,24 +1,24 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: oom-registrator - namespace: "{{ .Values.nsPrefix }}-oom" + name: kube2msb-registrator + namespace: "{{ .Values.nsPrefix }}-kube2msb" spec: replicas: 1 selector: matchLabels: - app: oom-registrator + app: kube2msb-registrator template: metadata: labels: - app: oom-registrator - name: oom-registrator + app: kube2msb-registrator + name: kube2msb-registrator spec: - hostname: oom-registrator + hostname: kube2msb-registrator containers: - args: image: {{ .Values.image.kube2msb }} - name: oom-registrator + name: kube2msb-registrator env: - name: KUBE_MASTER_URL value: {{ .Values.kubeMasterUrl }} diff --git a/kubernetes/oom/values.yaml b/kubernetes/kube2msb/values.yaml index 3864f4d335..3864f4d335 100644 --- a/kubernetes/oom/values.yaml +++ b/kubernetes/kube2msb/values.yaml diff --git a/kubernetes/msb/templates/all-services.yaml b/kubernetes/msb/templates/all-services.yaml index aeb4f5e9b0..f752608984 100644 --- a/kubernetes/msb/templates/all-services.yaml +++ b/kubernetes/msb/templates/all-services.yaml @@ -34,27 +34,27 @@ kind: Service metadata: name: msb-iag namespace: "{{ .Values.nsPrefix }}-msb" - labels: - app: msb-iag - spec: - ports: - - port: {{ .Values.iagPort }} - nodePort: {{ .Values.iagNodePort }} - selector: - app: msb-iag - type: NodePort - --- - apiVersion: v1 - kind: Service - metadata: - name: msb-eag - namespace: "{{ .Values.nsPrefix }}-msb" - labels: - app: msb-eag - spec: - ports: - - port: {{ .Values.eagPort }} - nodePort: {{ .Values.eagNodePort }} - selector: - app: msb-eag - type: NodePort
\ No newline at end of file + labels: + app: msb-iag +spec: + ports: + - port: {{ .Values.iagPort }} + nodePort: {{ .Values.iagNodePort }} + selector: + app: msb-iag + type: NodePort +--- +apiVersion: v1 +kind: Service +metadata: + name: msb-eag + namespace: "{{ .Values.nsPrefix }}-msb" + labels: + app: msb-eag +spec: + ports: + - port: {{ .Values.eagPort }} + nodePort: {{ .Values.eagNodePort }} + selector: + app: msb-eag + type: NodePort diff --git a/kubernetes/portal/templates/all-services.yaml b/kubernetes/portal/templates/all-services.yaml index b3fabb2932..b819b1c5e3 100644 --- a/kubernetes/portal/templates/all-services.yaml +++ b/kubernetes/portal/templates/all-services.yaml @@ -20,6 +20,17 @@ metadata: app: portalapps name: portalapps namespace: "{{ .Values.nsPrefix }}-portal" + annotations: + msb.onap.org/service-info: '[ + { + "serviceName": "portal", + "version": "v2", + "url": "/", + "protocol": "REST" + "port": "8989", + "visualRange":"1" + } + ]' spec: ports: - name: portal-1 |