diff options
Diffstat (limited to 'kubernetes/aai/templates')
| -rw-r--r-- | kubernetes/aai/templates/aai-deployment.yaml | 41 | ||||
| -rw-r--r-- | kubernetes/aai/templates/aai-resources-deployment.yaml | 43 | ||||
| -rw-r--r-- | kubernetes/aai/templates/aai-traversal-deployment.yaml | 47 |
3 files changed, 52 insertions, 79 deletions
diff --git a/kubernetes/aai/templates/aai-deployment.yaml b/kubernetes/aai/templates/aai-deployment.yaml index 3f714f3e64..ddd52c32bf 100644 --- a/kubernetes/aai/templates/aai-deployment.yaml +++ b/kubernetes/aai/templates/aai-deployment.yaml @@ -13,29 +13,24 @@ spec: labels: app: aai-service name: aai-service - annotations: - 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: + initContainers: + - command: + - /root/ready.py + args: + - --container-name + - aai-resources + - --container-name + - aai-traversal + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + image: {{ .Values.image.readiness }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: aai-service-readiness containers: - name: aai-service image: "{{ .Values.image.aaiProxy }}:{{ .Values.image.aaiProxyVersion}}" @@ -69,4 +64,4 @@ spec: restartPolicy: Always imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/aai/templates/aai-resources-deployment.yaml b/kubernetes/aai/templates/aai-resources-deployment.yaml index ebf447f3ca..2e46284076 100644 --- a/kubernetes/aai/templates/aai-resources-deployment.yaml +++ b/kubernetes/aai/templates/aai-resources-deployment.yaml @@ -13,33 +13,22 @@ 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: + initContainers: + - command: + - /root/ready.py + args: + - --container-name + - hbase + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + image: {{ .Values.image.readiness }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: aai-resources-readiness containers: - name: aai-resources image: "{{ .Values.image.aaiResourcesImage }}:{{ .Values.image.aaiResourcesVersion}}" @@ -113,4 +102,4 @@ metadata: namespace: {{ .Values.nsPrefix }}-aai data: {{ (.Files.Glob "resources/resources/conf/logback.xml").AsConfig | indent 2 }} -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/aai/templates/aai-traversal-deployment.yaml b/kubernetes/aai/templates/aai-traversal-deployment.yaml index a54c49a59d..03bd0dcd87 100644 --- a/kubernetes/aai/templates/aai-traversal-deployment.yaml +++ b/kubernetes/aai/templates/aai-traversal-deployment.yaml @@ -13,35 +13,24 @@ 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: + initContainers: + - command: + - /root/ready.py + args: + - --container-name + - hbase + - --container-name + - aai-resources + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + image: {{ .Values.image.readiness }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: aai-traversal-readiness containers: - name: aai-traversal image: "{{ .Values.image.aaiTraversalImage }}:{{ .Values.image.aaiTraversalVersion }}" @@ -115,4 +104,4 @@ metadata: namespace: {{ .Values.nsPrefix }}-aai data: {{ (.Files.Glob "resources/traversal/conf/logback.xml").AsConfig | indent 2 }} -#{{ end }}
\ No newline at end of file +#{{ end }} |