From: Yury Novitsky Date: Tue, 5 Sep 2017 12:31:12 +0000 (+0000) Subject: Merge "NodePort Helm Parametrization" X-Git-Tag: 2.0.0-ONAP~693 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=7234ff7880279771bbfb1e4db85bfced4faec7b5;hp=-c;p=oom.git Merge "NodePort Helm Parametrization" --- 7234ff7880279771bbfb1e4db85bfced4faec7b5 diff --combined kubernetes/aai/templates/all-services.yaml index 6e4084483e,22d94eb707..63b9b005b9 --- a/kubernetes/aai/templates/all-services.yaml +++ b/kubernetes/aai/templates/all-services.yaml @@@ -7,20 -7,8 +7,20 @@@ metadata app: hbase spec: ports: - - name: "hbase-port" - port: 8020 + - name: "hbase-port-1" + port: 2181 + - name: "hbase-port-2" + port: 8080 + - name: "hbase-port-3" + port: 8085 + - name: "hbase-port-4" + port: 9090 + - name: "hbase-port-5" + port: 16000 + - name: "hbase-port-6" + port: 16010 + - name: "hbase-port-7" + port: 16201 selector: app: hbase clusterIP: None @@@ -32,133 -20,16 +32,133 @@@ metadata namespace: "{{ .Values.nsPrefix }}-aai" labels: app: aai-service + annotations: + msb.onap.org/service-info: '[ + { + "serviceName": "aai-cloudInfrastructure", + "version": "v1", + "url": "/cloud-infrastructure", + "protocol": "REST", + "port": "8443", + "enable_ssl":"True", + "visualRange":"1" + }, + { + "serviceName": "aai-cloudInfrastructure-deprecated", + "version": "v1", + "url": "/cloud-infrastructure", + "protocol": "REST", + "port": "8443", + "enable_ssl":"True", + "visualRange":"1", + "path":"/cloud-infrastructure" + }, + { + "serviceName": "aai-business", + "version": "v1", + "url": "/business", + "protocol": "REST", + "port": "8443", + "enable_ssl":"True", + "visualRange":"1" + }, + { + "serviceName": "aai-business-deprecated", + "version": "v1", + "url": "/business", + "protocol": "REST", + "port": "8443", + "enable_ssl":"True", + "visualRange":"1", + "path":"/business" + }, + { + "serviceName": "aai-search", + "version": "v1", + "url": "/search", + "protocol": "REST", + "port": "8443", + "enable_ssl":"True", + "visualRange":"1" + }, + { + "serviceName": "aai-search-deprecated", + "version": "v1", + "url": "/search", + "protocol": "REST", + "port": "8443", + "enable_ssl":"True", + "visualRange":"1", + "path":"/search" + }, + { + "serviceName": "aai-actions", + "version": "v1", + "url": "/actions", + "protocol": "REST", + "port": "8443", + "enable_ssl":"True", + "visualRange":"1" + }, + { + "serviceName": "aai-actions-deprecated", + "version": "v1", + "url": "/actions", + "protocol": "REST", + "port": "8443", + "enable_ssl":"True", + "visualRange":"1", + "path":"/actions" + }, + { + "serviceName": "aai-service-design-and-creation", + "version": "v1", + "url": "/service-design-and-creation", + "protocol": "REST", + "port": "8443", + "enable_ssl":"True", + "visualRange":"1" + }, + { + "serviceName": "aai-service-design-and-creation-deprecated", + "version": "v1", + "url": "/service-design-and-creation", + "protocol": "REST", + "port": "8443", + "enable_ssl":"True", + "visualRange":"1", + "path":"/service-design-and-creation" + }, + { + "serviceName": "aai-network", + "version": "v1", + "url": "/network", + "protocol": "REST", + "port": "8443", + "enable_ssl":"True", + "visualRange":"1" + }, + { + "serviceName": "aai-network-deprecated", + "version": "v1", + "url": "/network", + "protocol": "REST", + "port": "8443", + "enable_ssl":"True", + "visualRange":"1", + "path":"/network" + } + ]' spec: ports: - name: "aai-service-port-8443" port: 8443 targetPort: 8443 - nodePort: 30233 + nodePort: {{ .Values.nodePortPrefix }}33 - name: "aai-service-port-8080" port: 8080 targetPort: 8080 - nodePort: 30232 + nodePort: {{ .Values.nodePortPrefix }}32 type: NodePort selector: app: aai-service @@@ -174,121 -45,10 +174,121 @@@ spec ports: - name: "model-loader-service-port-8443" port: 8443 - nodePort: 30229 + nodePort: {{ .Values.nodePortPrefix }}29 - name: "model-loader-service-port-8080" port: 8080 - nodePort: 30210 + nodePort: {{ .Values.nodePortPrefix }}10 type: NodePort selector: app: model-loader-service +--- +apiVersion: v1 +kind: Service +metadata: + name: gremlin + namespace: "{{ .Values.nsPrefix }}-aai" + labels: + app: gremlin +spec: + ports: + - name: "gremlin-port" + port: 8182 + selector: + app: gremlin + clusterIP: None +--- +apiVersion: v1 +kind: Service +metadata: + name: elasticsearch + namespace: "{{ .Values.nsPrefix }}-aai" + labels: + app: elasticsearch +spec: + ports: + - name: "elasticsearch-port" + port: 9200 + selector: + app: elasticsearch + clusterIP: None +--- +apiVersion: v1 +kind: Service +metadata: + name: search-data-service + namespace: "{{ .Values.nsPrefix }}-aai" + labels: + app: search-data-service +spec: + ports: + - name: "search-data-service-port-9509" + port: 9509 + selector: + app: search-data-service + clusterIP: None +--- +apiVersion: v1 +kind: Service +metadata: + name: aai-dmaap + namespace: "{{ .Values.nsPrefix }}-aai" + labels: + app: aai-dmaap +spec: + ports: + - name: "aai-dmaap-port-3904" + port: 3904 + - name: "aai-dmaap-port-3905" + port: 3905 + selector: + app: aai-dmaap + clusterIP: None +--- +apiVersion: v1 +kind: Service +metadata: + name: aai-zookeeper + namespace: "{{ .Values.nsPrefix }}-aai" + labels: + app: aai-zookeeper +spec: + ports: + - name: "aai-zookeeper-port-2181" + port: 2181 + selector: + app: aai-zookeeper + clusterIP: None +--- +apiVersion: v1 +kind: Service +metadata: + name: aai-traversal + namespace: "{{ .Values.nsPrefix }}-aai" + labels: + app: aai-traversal +spec: + ports: + - name: "aai-traversal-port-8446" + port: 8446 + - name: aai-traversal-port-debug + port: 5005 + selector: + app: aai-traversal + clusterIP: None +--- +apiVersion: v1 +kind: Service +metadata: + name: aai-resources + namespace: "{{ .Values.nsPrefix }}-aai" + labels: + app: aai-resources +spec: + ports: + - name: "aai-resources-port-8447" + port: 8447 + - name: aai-resources-port-debug + port: 5005 + selector: + app: aai-resources + clusterIP: None diff --combined kubernetes/aai/values.yaml index c0715382e6,d501d11607..290ffc5c21 --- a/kubernetes/aai/values.yaml +++ b/kubernetes/aai/values.yaml @@@ -1,29 -1,8 +1,30 @@@ nsPrefix: onap pullPolicy: Always + nodePortPrefix: 302 image: readiness: oomk8s/readiness-check:1.0.0 - ajscAai: nexus3.onap.org:10001/openecomp/ajsc-aai:1.0-STAGING-latest - aaiHbase: aaidocker/aai-hbase-1.2.3:latest - modelLoader: nexus3.onap.org:10001/openecomp/model-loader:1.0-STAGING-latest + aaiProxy: aaionap/haproxy + aaiProxyVersion: latest + aaiHbaseImage: harisekhon/hbase + aaiHbaseVersion: latest + modelLoaderImage: nexus3.onap.org:10001/openecomp/model-loader + modelLoaderVersion: 1.1-STAGING-latest + dmaapImage: attos/dmaap + dmaapVersion: latest + aaiResourcesImage: nexus3.onap.org:10001/openecomp/aai-resources + aaiResourcesVersion: 1.1-STAGING-latest + aaiTraversalImage: nexus3.onap.org:10001/openecomp/aai-traversal + aaiTraversalVersion: 1.1-STAGING-latest + aaiZookeeperImage: wurstmeister/zookeeper + aaiZookeeperVersion: latest + dataRouterImage: nexus3.onap.org:10001/openecomp/data-router + dataRouterVersion: 1.1-STAGING-latest + elasticsearchImage: elasticsearch + elasticsearchVersion: 2.4.1 + searchDataImage: nexus3.onap.org:10001/openecomp/search-data-service + searchDataVersion: 1.1-STAGING-latest + sparkyBeImage: nexus3.onap.org:10001/openecomp/sparky-be + sparkyBeVersion: 1.1-STAGING-latest + gremlinServerImage: aaionap/gremlin-server + kafkaImage: wurstmeister/kafka + kafkaVersion: latest diff --combined kubernetes/mso/templates/all-services.yaml index a674adb35e,2cacf11d32..96c7fd79e8 --- a/kubernetes/mso/templates/all-services.yaml +++ b/kubernetes/mso/templates/all-services.yaml @@@ -8,7 -8,7 +8,7 @@@ metadata spec: ports: - port: 3306 - nodePort: 30252 + nodePort: {{ .Values.nodePortPrefix }}52 selector: app: mariadb type: NodePort @@@ -20,43 -20,23 +20,43 @@@ metadata namespace: "{{ .Values.nsPrefix }}-mso" labels: app: mso + annotations: + msb.onap.org/service-info: '[ + { + "serviceName": "so", + "version": "v1", + "url": "/ecomp/mso/infra", + "protocol": "REST" + "port": "8080", + "visualRange":"1" + }, + { + "serviceName": "so-deprecated", + "version": "v1", + "url": "/ecomp/mso/infra", + "protocol": "REST" + "port": "8080", + "visualRange":"1", + "path":"/ecomp/mso/infra" + } + ]' spec: selector: app: mso ports: - name: mso1 port: 8080 - nodePort: 30223 + nodePort: {{ .Values.nodePortPrefix }}23 - name: mso2 port: 3904 - nodePort: 30225 + nodePort: {{ .Values.nodePortPrefix }}25 - name: mso3 port: 3905 - nodePort: 30224 + nodePort: {{ .Values.nodePortPrefix }}24 - name: mso4 port: 9990 - nodePort: 30222 + nodePort: {{ .Values.nodePortPrefix }}22 - name: mso5 port: 8787 - nodePort: 30250 + nodePort: {{ .Values.nodePortPrefix }}50 type: NodePort diff --combined kubernetes/policy/templates/all-services.yaml index eb524edfc4,5ad5aa5d30..cd01b54ee8 --- a/kubernetes/policy/templates/all-services.yaml +++ b/kubernetes/policy/templates/all-services.yaml @@@ -39,7 -39,7 +39,7 @@@ spec ports: - name: "drools-port" port: 6969 - nodePort: 30217 + nodePort: {{ .Values.nodePortPrefix }}17 selector: app: drools type: NodePort @@@ -55,10 -55,10 +55,10 @@@ spec ports: - name: 8443-port port: 8443 - nodePort: 30219 + nodePort: {{ .Values.nodePortPrefix }}19 - name: 9091-port port: 9091 - nodePort: 30218 + nodePort: {{ .Values.nodePortPrefix }}18 selector: app: pap type: NodePort @@@ -77,7 -77,6 +77,7 @@@ metadata "version": "v1", "url": "/pdp", "protocol": "REST" + "port": "8081", "visualRange":"1" }, { @@@ -85,7 -84,6 +85,7 @@@ "version": "v1", "url": "/pdp", "protocol": "REST" + "port": "8081", "visualRange":"1", "path":"/pdp" } @@@ -94,7 -92,7 +94,7 @@@ spec ports: - name: 8081-port port: 8081 - nodePort: 30220 + nodePort: {{ .Values.nodePortPrefix }}20 selector: app: pdp type: NodePort @@@ -110,7 -108,7 +110,7 @@@ spec ports: - name: tcp-31032-8480-bm91k port: 8480 - nodePort: 30221 + nodePort: {{ .Values.nodePortPrefix }}21 selector: app: pypdp type: NodePort @@@ -126,7 -124,7 +126,7 @@@ spec ports: - name: 9989-port port: 9989 - nodePort: 30216 + nodePort: {{ .Values.nodePortPrefix }}16 selector: app: brmsgw type: NodePort