diff options
Diffstat (limited to 'kubernetes')
| -rw-r--r-- | kubernetes/aai/templates/aai-deployment.yaml | 89 | ||||
| -rw-r--r-- | kubernetes/aai/templates/aai-dmaap-deployment.yaml | 75 | ||||
| -rw-r--r-- | kubernetes/aai/templates/aai-kafka-deployment.yaml | 83 | ||||
| -rw-r--r-- | kubernetes/aai/templates/aai-resources-deployment.yaml | 57 | ||||
| -rw-r--r-- | kubernetes/aai/templates/aai-traversal-deployment.yaml | 57 | ||||
| -rw-r--r-- | kubernetes/aai/templates/aai-zookeeper-deployment.yaml | 36 | ||||
| -rw-r--r-- | kubernetes/aai/templates/all-services.yaml | 127 | ||||
| -rw-r--r-- | kubernetes/aai/templates/data-router-deployment.yaml | 61 | ||||
| -rw-r--r-- | kubernetes/aai/templates/elasticsearch-deployment.yaml | 41 | ||||
| -rw-r--r-- | kubernetes/aai/templates/gremlin-deployment.yaml | 62 | ||||
| -rw-r--r-- | kubernetes/aai/templates/hbase-deployment.yaml | 12 | ||||
| -rw-r--r-- | kubernetes/aai/templates/modelloader-deployment.yaml | 89 | ||||
| -rw-r--r-- | kubernetes/aai/templates/search-data-service-deployment.yaml | 48 | ||||
| -rw-r--r-- | kubernetes/aai/templates/sparky-be-deployment.yaml | 48 | ||||
| -rw-r--r-- | kubernetes/aai/values.yaml | 28 |
15 files changed, 773 insertions, 140 deletions
diff --git a/kubernetes/aai/templates/aai-deployment.yaml b/kubernetes/aai/templates/aai-deployment.yaml index 162fb99bf9..9b55d4e736 100644 --- a/kubernetes/aai/templates/aai-deployment.yaml +++ b/kubernetes/aai/templates/aai-deployment.yaml @@ -13,58 +13,37 @@ spec: app: aai-service name: aai-service annotations: - pod.beta.kubernetes.io/init-containers: '[ - { - "args": [ - "--container-name", - "hbase" - ], - "command": [ - "/root/ready.py" - ], - "env": [ - { - "name": "NAMESPACE", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "metadata.namespace" - } - } - } - ], - "image": "{{ .Values.image.readiness }}", - "imagePullPolicy": "{{ .Values.pullPolicy }}", - "name": "aai-service-readiness" - } - ]' + pod.beta.kubernetes.io/init-containers: '[{ + "args": [ + "--container-name", "aai-resources", + "--container-name", "aai-traversal" + ], + "command": [ + "/root/ready.py" + ], + "env": [{ + "name": "NAMESPACE", + "valueFrom": { + "fieldRef": { + "apiVersion": "v1", + "fieldPath": "metadata.namespace" + } + } + }], + "image": "{{ .Values.image.readiness }}", + "imagePullPolicy": "{{ .Values.pullPolicy }}", + "name": "aai-service-readiness" + }]' spec: containers: - - env: - - name: AAI_REPO_PATH - value: r/aai - - name: AAI_CHEF_ENV - value: simpledemo - - name: AAI_CHEF_LOC - value: /var/chef/aai-data/environments - - name: docker_gitbranch - value: release-1.0.0 - - name: DEBIAN_FRONTEND - value: noninteractive - - name: JAVA_HOME - value: /usr/lib/jvm/java-8-openjdk-amd64 - image: {{ .Values.image.ajscAai }} + - name: aai-service + image: "{{ .Values.image.aaiProxy }}:{{ .Values.image.aaiProxyVersion}}" imagePullPolicy: {{ .Values.pullPolicy }} - name: aai-service volumeMounts: - - mountPath: /etc/ssl/certs/ - name: aai-service-certs - - mountPath: /opt/aai/logroot/ - name: aai-service-logroot - - mountPath: /var/chef/aai-config/ - name: aai-config - - mountPath: /var/chef/aai-data/ - name: aai-data + - mountPath: /dev/log + name: aai-service-log + - mountPath: /usr/local/etc/haproxy/haproxy.cfg + name: haproxy-cfg ports: - containerPort: 8080 - containerPort: 8443 @@ -74,18 +53,12 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 volumes: - - name: aai-service-certs + - name: aai-service-log hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/etc/ssl/certs/ - - name: aai-service-logroot + path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/haproxy/log/" + - name: haproxy-cfg hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/opt/aai/logroot/ - - name: aai-config - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-config/ - - name: aai-data - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-data/ + path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/haproxy/haproxy.cfg" restartPolicy: Always imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/aai/templates/aai-dmaap-deployment.yaml b/kubernetes/aai/templates/aai-dmaap-deployment.yaml new file mode 100644 index 0000000000..37c27d0854 --- /dev/null +++ b/kubernetes/aai/templates/aai-dmaap-deployment.yaml @@ -0,0 +1,75 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: aai-dmaap + namespace: "{{ .Values.nsPrefix }}-aai" +spec: + selector: + matchLabels: + app: aai-dmaap + template: + metadata: + labels: + app: aai-dmaap + name: aai-dmaap + annotations: + pod.beta.kubernetes.io/init-containers: '[ + { + "args": [ + "--container-name", + "aai-kafka", + "--container-name", + "aai-zookeeper" + ], + "command": [ + "/root/ready.py" + ], + "env": [ + { + "name": "NAMESPACE", + "valueFrom": { + "fieldRef": { + "apiVersion": "v1", + "fieldPath": "metadata.namespace" + } + } + } + ], + "image": "{{ .Values.image.readiness }}", + "imagePullPolicy": "{{ .Values.pullPolicy }}", + "name": "aai-dmaap-readiness" + } + ]' + spec: + containers: + - image: "{{ .Values.image.dmaapImage }}:{{ .Values.image.dmaapVersion}}" + imagePullPolicy: {{ .Values.pullPolicy }} + name: aai-dmaap + ports: + - containerPort: 3904 + - containerPort: 3905 + readinessProbe: + tcpSocket: + port: 3904 + initialDelaySeconds: 5 + periodSeconds: 10 + volumeMounts: + - mountPath: /appl/dmaapMR1/bundleconfig/etc/appprops/MsgRtrApi.properties + name: appprops + - mountPath: /appl/dmaapMR1/etc/cadi.properties + name: cadi + - mountPath: /appl/dmaapMR1/etc/keyfile + name: mykey + restartPolicy: Always + volumes: + - name: appprops + hostPath: + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/message-router/dmaap/MsgRtrApi.properties + - name: cadi + hostPath: + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/message-router/dmaap/cadi.properties + - name: mykey + hostPath: + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/message-router/dmaap/mykey + imagePullSecrets: + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/aai/templates/aai-kafka-deployment.yaml b/kubernetes/aai/templates/aai-kafka-deployment.yaml new file mode 100644 index 0000000000..0e7ef1f1b2 --- /dev/null +++ b/kubernetes/aai/templates/aai-kafka-deployment.yaml @@ -0,0 +1,83 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: aai-kafka + namespace: "{{ .Values.nsPrefix }}-aai" +spec: + selector: + matchLabels: + app: aai-kafka + template: + metadata: + labels: + app: aai-kafka + name: aai-kafka + annotations: + pod.beta.kubernetes.io/init-containers: '[ + { + "args": [ + "--container-name", + "aai-zookeeper" + ], + "command": [ + "/root/ready.py" + ], + "env": [ + { + "name": "NAMESPACE", + "valueFrom": { + "fieldRef": { + "apiVersion": "v1", + "fieldPath": "metadata.namespace" + } + } + } + ], + "image": "{{ .Values.image.readiness }}", + "imagePullPolicy": "{{ .Values.pullPolicy }}", + "name": "aai-kafka-readiness" + } + ]' + spec: + containers: + - image: "{{ .Values.image.kafkaImage }}:{{ .Values.image.kafkaVersion }}" + imagePullPolicy: {{ .Values.pullPolicy }} + name: aai-kafka + ports: + - containerPort: 9092 + readinessProbe: + tcpSocket: + port: 9092 + initialDelaySeconds: 5 + periodSeconds: 10 + env: + - name: KAFKA_ZOOKEEPER_CONNECT + value: "aai-zookeeper.{{ .Values.nsPrefix }}-aai:2181" + - name: KAFKA_ADVERTISED_HOST_NAME + value: "aai-kafka" + - name: KAFKA_BROKER_ID + value: "1" + - name: KAFKA_ADVERTISED_PORT + value: "9092" + - name: KAFKA_PORT + value: "9092" + volumeMounts: + - mountPath: /var/run/docker.sock + name: docker-socket + - mountPath: /kafka + name: kafka-data + - mountPath: /start-kafka.sh + name: start-kafka + restartPolicy: Always + volumes: + - name: docker-socket + hostPath: + path: /var/run/docker.sock + - name: kafka-data + hostPath: + path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/" + - name: start-kafka + hostPath: + path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/message-router/dcae-startup-vm-message-router/docker_files/start-kafka.sh" + imagePullSecrets: + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/aai/templates/aai-resources-deployment.yaml b/kubernetes/aai/templates/aai-resources-deployment.yaml new file mode 100644 index 0000000000..b6242ee292 --- /dev/null +++ b/kubernetes/aai/templates/aai-resources-deployment.yaml @@ -0,0 +1,57 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: aai-resources + namespace: "{{ .Values.nsPrefix }}-aai" +spec: + selector: + matchLabels: + app: aai-resources + template: + metadata: + labels: + app: aai-resources + name: aai-resources + spec: + containers: + - name: aai-resources + image: "{{ .Values.image.aaiResourcesImage }}:{{ .Values.image.aaiResourcesVersion}}" + imagePullPolicy: {{ .Values.pullPolicy }} + env: + - name: CHEF_BRANCH + value: master + - name: AAI_CHEF_ENV + value: simpledemo + - name: AAI_CORE_VERSION + value: 1.1.0-SNAPSHOT + - name: AAI_CHEF_LOC + value: /var/chef/aai-data/environments + - name: CHEF_GIT_URL + value: http://gerrit.onap.org/r/aai + volumeMounts: + - mountPath: /opt/aai/logroot/AAI-RES/ + name: aai-resources-logs + - mountPath: /var/chef/aai-config/ + name: aai-config + - mountPath: /var/chef/aai-data/ + name: aai-data + ports: + - containerPort: 8447 + readinessProbe: + tcpSocket: + port: 8447 + initialDelaySeconds: 5 + periodSeconds: 10 + volumes: + - name: aai-resources-logs + hostPath: + path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-resources/logs/" + - name: aai-config + hostPath: + path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-config/" + - name: aai-data + hostPath: + path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-data/" + restartPolicy: Always + imagePullSecrets: + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/aai/templates/aai-traversal-deployment.yaml b/kubernetes/aai/templates/aai-traversal-deployment.yaml new file mode 100644 index 0000000000..cb56be8fd9 --- /dev/null +++ b/kubernetes/aai/templates/aai-traversal-deployment.yaml @@ -0,0 +1,57 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: aai-traversal + namespace: "{{ .Values.nsPrefix }}-aai" +spec: + selector: + matchLabels: + app: aai-traversal + template: + metadata: + labels: + app: aai-traversal + name: aai-traversal + spec: + containers: + - name: aai-traversal + image: "{{ .Values.image.aaiTraversalImage }}:{{ .Values.image.aaiTraversalVersion }}" + imagePullPolicy: {{ .Values.pullPolicy }} + env: + - name: CHEF_BRANCH + value: master + - name: AAI_CHEF_ENV + value: simpledemo + - name: AAI_CORE_VERSION + value: 1.1.0-SNAPSHOT + - name: AAI_CHEF_LOC + value: /var/chef/aai-data/environments + - name: CHEF_GIT_URL + value: http://gerrit.onap.org/r/aai + volumeMounts: + - mountPath: /opt/aai/logroot/AAI-GQ/ + name: aai-traversal-logs + - mountPath: /var/chef/aai-config/ + name: aai-config + - mountPath: /var/chef/aai-data/ + name: aai-data + ports: + - containerPort: 8446 + readinessProbe: + tcpSocket: + port: 8446 + initialDelaySeconds: 5 + periodSeconds: 10 + volumes: + - name: aai-traversal-logs + hostPath: + path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-traversal/logs/" + - name: aai-config + hostPath: + path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-config/" + - name: aai-data + hostPath: + path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-data/" + restartPolicy: Always + imagePullSecrets: + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/aai/templates/aai-zookeeper-deployment.yaml b/kubernetes/aai/templates/aai-zookeeper-deployment.yaml new file mode 100644 index 0000000000..7b6b4e138b --- /dev/null +++ b/kubernetes/aai/templates/aai-zookeeper-deployment.yaml @@ -0,0 +1,36 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: aai-zookeeper + namespace: "{{ .Values.nsPrefix }}-aai" +spec: + selector: + matchLabels: + app: aai-zookeeper + template: + metadata: + labels: + app: aai-zookeeper + name: aai-zookeeper + spec: + containers: + - image: "{{ .Values.image.aaiZookeeperImage }}:{{ .Values.image.aaiZookeeperVersion }}" + imagePullPolicy: {{ .Values.pullPolicy }} + name: aai-zookeeper + volumeMounts: + - mountPath: /opt/zookeeper-3.4.9/data/ + name: aai-zookeeper-data + ports: + - containerPort: 2181 + readinessProbe: + tcpSocket: + port: 2181 + initialDelaySeconds: 5 + periodSeconds: 10 + volumes: + - name: aai-zookeeper-data + hostPath: + path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper" + restartPolicy: Always + imagePullSecrets: + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/aai/templates/all-services.yaml b/kubernetes/aai/templates/all-services.yaml index 2c0fbc4a5b..93fbf1999c 100644 --- a/kubernetes/aai/templates/all-services.yaml +++ b/kubernetes/aai/templates/all-services.yaml @@ -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 @@ -52,3 +64,114 @@ spec: 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
\ No newline at end of file diff --git a/kubernetes/aai/templates/data-router-deployment.yaml b/kubernetes/aai/templates/data-router-deployment.yaml new file mode 100644 index 0000000000..f823061c33 --- /dev/null +++ b/kubernetes/aai/templates/data-router-deployment.yaml @@ -0,0 +1,61 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: data-router + namespace: "{{ .Values.nsPrefix }}-aai" +spec: + selector: + matchLabels: + app: data-router + template: + metadata: + labels: + app: data-router + name: data-router + spec: + containers: + - name: data-router + image: "{{ .Values.image.dataRouterImage }}:{{ .Values.image.dataRouterVersion }}" + imagePullPolicy: {{ .Values.pullPolicy }} + env: + - name: SERVICE_BEANS + value: /opt/app/data-router/dynamic/conf + - name: CONFIG_HOME + value: /opt/app/data-router/config/ + - name: KEY_STORE_PASSWORD + value: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10 + - name: DYNAMIC_ROUTES + value: /opt/app/data-router/dynamic/routes + - name: KEY_MANAGER_PASSWORD + value: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10 + - name: PATH + value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin + - name: JAVA_HOME + value: usr/lib/jvm/java-8-openjdk-amd64 + volumeMounts: + - mountPath: /opt/app/data-router/config/ + name: data-router-config + - mountPath: /opt/app/data-router/dynamic/ + name: data-router-dynamic + - mountPath: /logs/ + name: data-router-logs + ports: + - containerPort: 9502 + readinessProbe: + tcpSocket: + port: 9502 + initialDelaySeconds: 5 + periodSeconds: 10 + volumes: + - name: data-router-config + hostPath: + path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/data-router/appconfig/" + - name: data-router-dynamic + hostPath: + path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/data-router/dynamic/" + - name: data-router-logs + hostPath: + path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/data-router/logs/" + restartPolicy: Always + imagePullSecrets: + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/aai/templates/elasticsearch-deployment.yaml b/kubernetes/aai/templates/elasticsearch-deployment.yaml new file mode 100644 index 0000000000..1c2a2ad57b --- /dev/null +++ b/kubernetes/aai/templates/elasticsearch-deployment.yaml @@ -0,0 +1,41 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: elasticsearch + namespace: "{{ .Values.nsPrefix }}-aai" +spec: + selector: + matchLabels: + app: elasticsearch + template: + metadata: + labels: + app: elasticsearch + name: elasticsearch + spec: + hostname: elasticsearch + containers: + - name: elasticsearch + image: "{{ .Values.image.elasticsearchImage }}:{{ .Values.image.elasticsearchVersion }}" + imagePullPolicy: {{ .Values.pullPolicy }} + ports: + - containerPort: 9200 + readinessProbe: + tcpSocket: + port: 9200 + initialDelaySeconds: 5 + periodSeconds: 10 + volumeMounts: + - name: elasticsearch-config + mountPath: /usr/share/elasticsearch/config/elasticsearch.yml + - name: elasticsearch-data + mountPath: /usr/share/elasticsearch/data + volumes: + - name: elasticsearch-config + hostPath: + path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/elasticsearch/config/elasticsearch.yml" + - name: elasticsearch-data + hostPath: + path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/elasticsearch/es-data" + imagePullSecrets: + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/aai/templates/gremlin-deployment.yaml b/kubernetes/aai/templates/gremlin-deployment.yaml new file mode 100644 index 0000000000..aea89ad51f --- /dev/null +++ b/kubernetes/aai/templates/gremlin-deployment.yaml @@ -0,0 +1,62 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: gremlin + namespace: "{{ .Values.nsPrefix }}-aai" +spec: + selector: + matchLabels: + app: gremlin + template: + metadata: + labels: + app: gremlin + name: gremlin + annotations: + pod.beta.kubernetes.io/init-containers: '[ + { + "args": [ + "--container-name", + "hbase" + ], + "command": [ + "/root/ready.py" + ], + "env": [ + { + "name": "NAMESPACE", + "valueFrom": { + "fieldRef": { + "apiVersion": "v1", + "fieldPath": "metadata.namespace" + } + } + } + ], + "image": "oomk8s/readiness-check:1.0.0", + "imagePullPolicy": "Always", + "name": "gremlin-readiness" + } + ]' + spec: + hostname: gremlin + containers: + - name: gremlin + image: {{ .Values.image.gremlinServerImage }} + imagePullPolicy: {{ .Values.pullPolicy }} + env: + - name: SERVER_HOST + value: "hbase.{{ .Values.nsPrefix }}-aai" + - name: SERVER_TABLE + value: aaigraph.dev + - name: GREMLIN_HOST + value: "gremlin.{{ .Values.nsPrefix }}-aai" + ports: + - containerPort: 8182 + readinessProbe: + tcpSocket: + port: 8182 + initialDelaySeconds: 5 + periodSeconds: 10 + imagePullSecrets: + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/aai/templates/hbase-deployment.yaml b/kubernetes/aai/templates/hbase-deployment.yaml index 79983eba08..98c38828ec 100644 --- a/kubernetes/aai/templates/hbase-deployment.yaml +++ b/kubernetes/aai/templates/hbase-deployment.yaml @@ -16,13 +16,19 @@ spec: hostname: hbase containers: - name: hbase - image: {{ .Values.image.aaiHbase }} + image: "{{ .Values.image.aaiHbaseImage }}:{{ .Values.image.aaiHbaseVersion }}" imagePullPolicy: {{ .Values.pullPolicy }} ports: - - containerPort: 8020 + - containerPort: 2181 + - containerPort: 8080 + - containerPort: 8085 + - containerPort: 9090 + - containerPort: 16000 + - containerPort: 16010 + - containerPort: 16201 readinessProbe: tcpSocket: - port: 8020 + port: 2181 initialDelaySeconds: 5 periodSeconds: 10 imagePullSecrets: diff --git a/kubernetes/aai/templates/modelloader-deployment.yaml b/kubernetes/aai/templates/modelloader-deployment.yaml index f7d855bbf9..5391273d9d 100644 --- a/kubernetes/aai/templates/modelloader-deployment.yaml +++ b/kubernetes/aai/templates/modelloader-deployment.yaml @@ -12,88 +12,29 @@ spec: labels: app: model-loader-service name: model-loader-service - annotations: - pod.beta.kubernetes.io/init-containers: '[ - { - "args": [ - "--container-name", - "aai-service" - ], - "command": [ - "/root/ready.py" - ], - "env": [ - { - "name": "NAMESPACE", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "metadata.namespace" - } - } - } - ], - "image": "{{ .Values.image.readiness }}", - "imagePullPolicy": "{{ .Values.pullPolicy }}", - "name": "model-loader-readiness" - }, - { - "args": [ - "--container-name", - "sdc-es", - "--container-name", - "sdc-cs", - "--container-name", - "sdc-kb", - "--container-name", - "sdc-be", - "--container-name", - "sdc-fe" - ], - "command": [ - "/root/ready.py" - ], - "env": [ - { - "name": "NAMESPACE", - "value": "{{ .Values.nsPrefix }}-sdc" - } - ], - "image": "{{ .Values.image.readiness }}", - "imagePullPolicy": "{{ .Values.pullPolicy }}", - "name": "model-loader-sdc-readiness" - } - ]' spec: containers: - env: - - name: DISTR_CLIENT_ASDC_ADDRESS - value: sdc-be.{{ .Values.nsPrefix }}-sdc:8443 - - name: DISTR_CLIENT_ENVIRONMENT_NAME - value: AUTO - - name: DISTR_CLIENT_USER - value: aai - - name: DISTR_CLIENT_PASSWORD - value: OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp - - name: APP_SERVER_BASE_URL - value: https://aai-service.{{ .Values.nsPrefix }}-aai:8443 - - name: APP_SERVER_KEYSTORE_PASSWORD - value: OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o - - name: APP_SERVER_AUTH_USER - value: ModelLoader - - name: APP_SERVER_AUTH_PASSWORD - value: OBF:1qvu1v2h1sov1sar1wfw1j7j1wg21saj1sov1v1x1qxw - image: {{ .Values.image.modelLoader }} + - name: CONFIG_HOME + value: /opt/app/model-loader/config/ + volumeMounts: + - mountPath: /opt/app/model-loader/config/ + name: aai-model-loader-config + - mountPath: /logs/ + name: aai-model-loader-logs + image: "{{ .Values.image.modelLoaderImage }}:{{ .Values.image.modelLoaderVersion }}" imagePullPolicy: {{ .Values.pullPolicy }} name: model-loader-service ports: - containerPort: 8080 - containerPort: 8443 - readinessProbe: - tcpSocket: - port: 8080 - initialDelaySeconds: 5 - periodSeconds: 10 + volumes: + - name: aai-model-loader-config + hostPath: + path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/model-loader/appconfig/" + - name: aai-model-loader-logs + hostPath: + path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/model-loader/logs/" restartPolicy: Always imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/aai/templates/search-data-service-deployment.yaml b/kubernetes/aai/templates/search-data-service-deployment.yaml new file mode 100644 index 0000000000..f2db9370fd --- /dev/null +++ b/kubernetes/aai/templates/search-data-service-deployment.yaml @@ -0,0 +1,48 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: search-data-service + namespace: "{{ .Values.nsPrefix }}-aai" +spec: + selector: + matchLabels: + app: search-data-service + template: + metadata: + labels: + app: search-data-service + name: search-data-service + spec: + containers: + - name: search-data-service + image: "{{ .Values.image.searchDataImage }}:{{ .Values.image.searchDataVersion }}" + imagePullPolicy: {{ .Values.pullPolicy }} + env: + - name: CONFIG_HOME + value: /opt/app/search-data-service/config/ + - name: KEY_STORE_PASSWORD + value: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10 + - name: KEY_MANAGER_PASSWORD + value: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10 + volumeMounts: + - mountPath: /opt/app/search-data-service/config/ + name: aai-search-data-service-config + - mountPath: /logs/ + name: aai-search-data-service-logs + ports: + - containerPort: 9509 + readinessProbe: + tcpSocket: + port: 9509 + initialDelaySeconds: 5 + periodSeconds: 10 + volumes: + - name: aai-search-data-service-config + hostPath: + path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/search-data-service/appconfig/" + - name: aai-search-data-service-logs + hostPath: + path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/search-data-service/logs/" + restartPolicy: Always + imagePullSecrets: + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/aai/templates/sparky-be-deployment.yaml b/kubernetes/aai/templates/sparky-be-deployment.yaml new file mode 100644 index 0000000000..6a8ff9308d --- /dev/null +++ b/kubernetes/aai/templates/sparky-be-deployment.yaml @@ -0,0 +1,48 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: sparky-be + namespace: "{{ .Values.nsPrefix }}-aai" +spec: + selector: + matchLabels: + app: sparky-be + template: + metadata: + labels: + app: sparky-be + name: sparky-be + spec: + containers: + - name: sparky-be + image: "{{ .Values.image.sparkyBeImage }}:{{ .Values.image.sparkyBeVersion }}" + imagePullPolicy: {{ .Values.pullPolicy }} + env: + - name: CONFIG_HOME + value: /opt/app/sparky/config/ + - name: KEY_MANAGER_PASSWORD + value: OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o + - name: KEY_STORE_PASSWORD + value: OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o + volumeMounts: + - mountPath: /opt/app/sparky/config/ + name: aai-sparky-be-config + - mountPath: /logs/ + name: aai-sparky-be-logs + ports: + - containerPort: 9517 + readinessProbe: + tcpSocket: + port: 9517 + initialDelaySeconds: 5 + periodSeconds: 10 + volumes: + - name: aai-sparky-be-config + hostPath: + path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/sparky-be/appconfig/" + - name: aai-sparky-be-logs + hostPath: + path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/sparky-be/logs/" + restartPolicy: Always + imagePullSecrets: + - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml index 3c6894c638..c0715382e6 100644 --- a/kubernetes/aai/values.yaml +++ b/kubernetes/aai/values.yaml @@ -2,6 +2,28 @@ nsPrefix: onap pullPolicy: Always 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
\ No newline at end of file |