blob: 1426e915d4728bc921a9125e1a6fff00b6f3dd53 [file] [log] [blame]
Michal Ptacek5a269d22019-01-28 13:03:16 +00001--- kubernetes/common/dgbuilder/templates/deployment.yaml 2019-01-28 13:01:35.017243076 +0100
2+++ kubernetes/common/dgbuilder/templates/deployment.yaml 2019-01-28 13:19:04.238712534 +0100
3@@ -49,8 +49,14 @@
4 - name: {{ include "common.name" . }}
5 image: "{{ include "common.repository" . }}/{{ .Values.image }}"
6 imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
7- command: ["/bin/bash"]
8- args: ["-c", "cd /opt/onap/ccsdk/dgbuilder/ && ./start.sh sdnc1.0 && wait"]
9+ command:
10+ - /bin/bash
11+ - -c
12+ - >
13+ HOSTS_FILE_RECORD >> /etc/hosts;
14+ NPM_REGISTRY_RECORD;
15+ cd /opt/onap/ccsdk/dgbuilder/;
16+ ./start.sh sdnc1.0 && wait
17 ports:
18 - containerPort: {{ .Values.service.internalPort }}
19 readinessProbe:
20--- kubernetes/sdnc/charts/sdnc-portal/templates/deployment.yaml 2019-01-28 13:01:35.087243698 +0100
21+++ kubernetes/sdnc/charts/sdnc-portal/templates/deployment.yaml 2019-01-28 13:29:24.881069646 +0100
22@@ -49,8 +49,13 @@
23 name: {{ include "common.name" . }}-readiness
24 containers:
25 - name: {{ include "common.name" . }}
26- command: ["/bin/bash"]
27- args: ["-c", "cd /opt/onap/sdnc/admportal/shell && ./start_portal.sh"]
28+ command:
29+ - /bin/bash
30+ - -c
31+ - >
32+ HOSTS_FILE_RECORD >> /etc/hosts;
33+ NPM_REGISTRY_RECORD;
34+ cd /opt/onap/sdnc/admportal/shell && ./start_portal.sh
35 image: "{{ include "common.repository" . }}/{{ .Values.image }}"
36 imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
37 ports:
Michal Ptacek80567252019-01-29 17:17:12 +000038--- kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml 2019-01-24 09:55:30.000000000 +0100
39+++ kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml 2019-01-29 18:07:59.057804519 +0100
40@@ -70,6 +70,8 @@
41 - mountPath: /etc/localtime
42 name: localtime
43 readOnly: true
44+ - mountPath: /etc/pki/ca-trust/source/anchors
45+ name: root-ca
46 securityContext:
47 privileged: True
48 lifecycle:
49@@ -82,6 +84,8 @@
50 set -ex
51 mkdir -p /var/run/secrets/kubernetes.io/
52 ln -s /secret /var/run/secrets/kubernetes.io/serviceaccount
53+ echo -e '\nREQUESTS_CA_BUNDLE="/etc/ssl/certs/ca-bundle.crt"' >> /etc/sysconfig/cloudify-restservice
54+ update-ca-trust extract
55 volumes:
56 - name: {{ include "common.fullname" . }}-config
57 configMap:
58@@ -95,5 +99,8 @@
59 - name: localtime
60 hostPath:
61 path: /etc/localtime
62+ - name: root-ca
63+ hostPath:
64+ path: /etc/pki/ca-trust/source/anchors
65 imagePullSecrets:
66 - name: "{{ include "common.namespace" . }}-docker-registry-key"