diff options
Diffstat (limited to 'kubernetes/aai')
| -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 | 38 | ||||
| -rw-r--r-- | kubernetes/aai/templates/aai-traversal-deployment.yaml | 40 | ||||
| -rw-r--r-- | kubernetes/aai/templates/aai-zookeeper-deployment.yaml | 36 | ||||
| -rw-r--r-- | kubernetes/aai/templates/all-services.yaml | 40 | ||||
| -rw-r--r-- | kubernetes/aai/templates/gremlin-deployment.yaml | 6 | ||||
| -rw-r--r-- | kubernetes/aai/values.yaml | 7 |
8 files changed, 74 insertions, 251 deletions
diff --git a/kubernetes/aai/templates/aai-dmaap-deployment.yaml b/kubernetes/aai/templates/aai-dmaap-deployment.yaml deleted file mode 100644 index 37c27d0854..0000000000 --- a/kubernetes/aai/templates/aai-dmaap-deployment.yaml +++ /dev/null @@ -1,75 +0,0 @@ -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 deleted file mode 100644 index 0e7ef1f1b2..0000000000 --- a/kubernetes/aai/templates/aai-kafka-deployment.yaml +++ /dev/null @@ -1,83 +0,0 @@ -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 index b6242ee292..1aff10bb94 100644 --- a/kubernetes/aai/templates/aai-resources-deployment.yaml +++ b/kubernetes/aai/templates/aai-resources-deployment.yaml @@ -12,6 +12,32 @@ spec: labels: app: aai-resources name: aai-resources + 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-resources-readiness" + } + ]' spec: containers: - name: aai-resources @@ -29,12 +55,12 @@ spec: - name: CHEF_GIT_URL value: http://gerrit.onap.org/r/aai volumeMounts: - - mountPath: /opt/aai/logroot/AAI-RES/ + - mountPath: /opt/aai/logroot/ name: aai-resources-logs - - mountPath: /var/chef/aai-config/ - name: aai-config - mountPath: /var/chef/aai-data/ name: aai-data + - mountPath: /docker-entrypoint.sh + name: entrypoint-override ports: - containerPort: 8447 readinessProbe: @@ -46,12 +72,12 @@ spec: - 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/" + - name: entrypoint-override + hostPath: + path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-resources/docker-entrypoint.sh" 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 index cb56be8fd9..debd1f6926 100644 --- a/kubernetes/aai/templates/aai-traversal-deployment.yaml +++ b/kubernetes/aai/templates/aai-traversal-deployment.yaml @@ -12,6 +12,34 @@ spec: labels: app: aai-traversal name: aai-traversal + annotations: + pod.beta.kubernetes.io/init-containers: '[ + { + "args": [ + "--container-name", + "hbase", + "--container-name", + "aai-resources" + ], + "command": [ + "/root/ready.py" + ], + "env": [ + { + "name": "NAMESPACE", + "valueFrom": { + "fieldRef": { + "apiVersion": "v1", + "fieldPath": "metadata.namespace" + } + } + } + ], + "image": "{{ .Values.image.readiness }}", + "imagePullPolicy": "{{ .Values.pullPolicy }}", + "name": "aai-traversal-readiness" + } + ]' spec: containers: - name: aai-traversal @@ -29,12 +57,12 @@ spec: - name: CHEF_GIT_URL value: http://gerrit.onap.org/r/aai volumeMounts: - - mountPath: /opt/aai/logroot/AAI-GQ/ + - mountPath: /opt/aai/logroot/ name: aai-traversal-logs - - mountPath: /var/chef/aai-config/ - name: aai-config - mountPath: /var/chef/aai-data/ name: aai-data + - mountPath: /docker-entrypoint.sh + name: entrypoint-override ports: - containerPort: 8446 readinessProbe: @@ -46,12 +74,12 @@ spec: - 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/" + - name: entrypoint-override + hostPath: + path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-traversal/docker-entrypoint.sh" 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 deleted file mode 100644 index 7b6b4e138b..0000000000 --- a/kubernetes/aai/templates/aai-zookeeper-deployment.yaml +++ /dev/null @@ -1,36 +0,0 @@ -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 62e5943557..4fcafd3307 100644 --- a/kubernetes/aai/templates/all-services.yaml +++ b/kubernetes/aai/templates/all-services.yaml @@ -154,11 +154,11 @@ spec: - 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,10 +174,10 @@ 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 @@ -230,38 +230,6 @@ spec: 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: diff --git a/kubernetes/aai/templates/gremlin-deployment.yaml b/kubernetes/aai/templates/gremlin-deployment.yaml index aea89ad51f..d28b286b68 100644 --- a/kubernetes/aai/templates/gremlin-deployment.yaml +++ b/kubernetes/aai/templates/gremlin-deployment.yaml @@ -33,8 +33,8 @@ spec: } } ], - "image": "oomk8s/readiness-check:1.0.0", - "imagePullPolicy": "Always", + "image": "{{ .Values.image.readiness }}", + "imagePullPolicy": "{{ .Values.pullPolicy }}", "name": "gremlin-readiness" } ]' @@ -50,7 +50,7 @@ spec: - name: SERVER_TABLE value: aaigraph.dev - name: GREMLIN_HOST - value: "gremlin.{{ .Values.nsPrefix }}-aai" + value: "gremlin" ports: - containerPort: 8182 readinessProbe: diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml index c0715382e6..1504b4021e 100644 --- a/kubernetes/aai/values.yaml +++ b/kubernetes/aai/values.yaml @@ -1,5 +1,6 @@ nsPrefix: onap pullPolicy: Always +nodePortPrefix: 302 image: readiness: oomk8s/readiness-check:1.0.0 aaiProxy: aaionap/haproxy @@ -8,14 +9,10 @@ image: 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 @@ -25,5 +22,3 @@ image: 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 |