summaryrefslogtreecommitdiffstats
path: root/kubernetes/oof/templates
diff options
context:
space:
mode:
authorDileep Ranganathan <dileep.ranganathan@intel.com>2018-10-01 08:14:16 -0700
committerKiran Kamineni <kiran.k.kamineni@intel.com>2018-10-26 14:35:18 -0700
commit61225cb0e342c5a96807803bc011dc33186faf68 (patch)
tree7faf22c249e178eb5b10a18ed7fae5ddabc795be /kubernetes/oof/templates
parent4807fdfc7adf7945c31368e3b420dc853a29f4cd (diff)
OOF HAS Helm chart updates
Helm charts updated for HAS with MUSIC v3. Sync conductor.conf, added dependent containers for AAF. Read config from values.yaml. Disabled AAF authentication. Updated resources for OSDF and HAS charts. Removed hardcoded values for namespace Change-Id: I683cd0b8c86a6cc9a4b4c4793051878e0d0e5b2f Issue-ID: OPTFRA-363 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com> Signed-off-by: Kiran Kamineni <kiran.k.kamineni@intel.com>
Diffstat (limited to 'kubernetes/oof/templates')
-rw-r--r--kubernetes/oof/templates/deployment.yaml24
1 files changed, 18 insertions, 6 deletions
diff --git a/kubernetes/oof/templates/deployment.yaml b/kubernetes/oof/templates/deployment.yaml
index 07f1ff44a9..d4558b72dd 100644
--- a/kubernetes/oof/templates/deployment.yaml
+++ b/kubernetes/oof/templates/deployment.yaml
@@ -37,12 +37,6 @@ spec:
args:
- --container-name
- pdp
- - --container-name
- - aaf-service
- - --container-name
- - aaf-sms
- - --container-name
- - oof-has-api
env:
- name: NAMESPACE
valueFrom:
@@ -52,6 +46,24 @@ spec:
image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-readiness
+ - command:
+ - sh
+ - -c
+ - resp="FAILURE";
+ until [ $resp = "200" ]; do
+ resp=$(curl -s -o /dev/null -k --write-out %{http_code} https://aaf-sms.{{ include "common.namespace" . }}:10443/v1/sms/domain/osdf/secret);
+ echo $resp;
+ sleep 2;
+ done
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ name: {{ include "common.name" . }}-osdf-sms-readiness
containers:
- name: {{ include "common.name" . }}
image: "{{ include "common.repository" . }}/{{ .Values.image }}"