summaryrefslogtreecommitdiffstats
path: root/kubernetes/aai
diff options
context:
space:
mode:
authorMike Elliott <mike.elliott@amdocs.com>2017-09-22 11:31:54 -0400
committerMike Elliott <mike.elliott@amdocs.com>2017-09-22 13:22:41 -0400
commit95b8c4a7e326ed7774ea0509b8c5c7306f5424a9 (patch)
treef64b3b59754a9a0e162aae9018a62bbbdce05da1 /kubernetes/aai
parentde8d47e2497260fbe0530faf43eb51a074beef78 (diff)
Add AAI config changes
A new RESOURCES_HOSTNAME environment variable was added to the traversal service to allow configuration for communicating with resource service. The gremlin service has been removed from AAI 1.1 deliverables. Change-Id: Id38581d49822cb3aa8ccb912508fabfb5c775a5a Issue-Id: OOM-312 Signed-off-by: Mike Elliott <mike.elliott@amdocs.com>
Diffstat (limited to 'kubernetes/aai')
-rw-r--r--kubernetes/aai/templates/aai-resources-deployment.yaml7
-rw-r--r--kubernetes/aai/templates/aai-traversal-deployment.yaml9
-rw-r--r--kubernetes/aai/templates/gremlin-deployment.yaml70
3 files changed, 4 insertions, 82 deletions
diff --git a/kubernetes/aai/templates/aai-resources-deployment.yaml b/kubernetes/aai/templates/aai-resources-deployment.yaml
index c61bc6f0a6..c874e39995 100644
--- a/kubernetes/aai/templates/aai-resources-deployment.yaml
+++ b/kubernetes/aai/templates/aai-resources-deployment.yaml
@@ -37,7 +37,7 @@ spec:
"imagePullPolicy": "{{ .Values.pullPolicy }}",
"name": "aai-resources-readiness"
}
- ]'
+ ]'
spec:
containers:
- name: aai-resources
@@ -62,8 +62,6 @@ spec:
name: aai-resources-logs
- mountPath: /var/chef/aai-data/
name: aai-data
- - mountPath: /docker-entrypoint.sh
- name: entrypoint-override
ports:
- containerPort: 8447
readinessProbe:
@@ -81,9 +79,6 @@ spec:
- 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 ec387b04e8..d430479664 100644
--- a/kubernetes/aai/templates/aai-traversal-deployment.yaml
+++ b/kubernetes/aai/templates/aai-traversal-deployment.yaml
@@ -39,7 +39,7 @@ spec:
"imagePullPolicy": "{{ .Values.pullPolicy }}",
"name": "aai-traversal-readiness"
}
- ]'
+ ]'
spec:
containers:
- name: aai-traversal
@@ -56,6 +56,8 @@ spec:
value: /var/chef/aai-data/environments
- name: CHEF_GIT_URL
value: http://gerrit.onap.org/r/aai
+ - name: RESOURCES_HOSTNAME
+ value: aai-resources.{{ .Values.nsPrefix }}-aai
volumeMounts:
- mountPath: /etc/localtime
name: localtime
@@ -64,8 +66,6 @@ spec:
name: aai-traversal-logs
- mountPath: /var/chef/aai-data/
name: aai-data
- - mountPath: /docker-entrypoint.sh
- name: entrypoint-override
ports:
- containerPort: 8446
readinessProbe:
@@ -83,9 +83,6 @@ spec:
- 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/gremlin-deployment.yaml b/kubernetes/aai/templates/gremlin-deployment.yaml
deleted file mode 100644
index 75b3e92437..0000000000
--- a/kubernetes/aai/templates/gremlin-deployment.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-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": "{{ .Values.image.readiness }}",
- "imagePullPolicy": "{{ .Values.pullPolicy }}",
- "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"
- ports:
- - containerPort: 8182
- readinessProbe:
- tcpSocket:
- port: 8182
- initialDelaySeconds: 5
- periodSeconds: 10
- volumeMounts:
- - name: localtime
- mountPath: /etc/localtime
- readOnly: true
- volumes:
- - name: localtime
- hostPath:
- path: /etc/localtime
- imagePullSecrets:
- - name: "{{ .Values.nsPrefix }}-docker-registry-key"