Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[OOF] Make OOF compatible with Kubernetes v1.17
[oom.git]
/
kubernetes
/
oof
/
templates
/
deployment.yaml
diff --git
a/kubernetes/oof/templates/deployment.yaml
b/kubernetes/oof/templates/deployment.yaml
index
a3205fa
..
2a11d27
100644
(file)
--- a/
kubernetes/oof/templates/deployment.yaml
+++ b/
kubernetes/oof/templates/deployment.yaml
@@
-13,7
+13,7
@@
# See the License for the specific language governing permissions and
# limitations under the License.
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion:
extensions/v1beta
1
+apiVersion:
apps/v
1
kind: Deployment
metadata:
name: {{ include "common.fullname" . }}
kind: Deployment
metadata:
name: {{ include "common.fullname" . }}
@@
-24,6
+24,9
@@
metadata:
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
spec:
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
spec:
+ selector:
+ matchLabels:
+ app: {{ include "common.name" . }}
replicas: {{ .Values.replicaCount }}
template:
metadata:
replicas: {{ .Values.replicaCount }}
template:
metadata:
@@
-36,7
+39,7
@@
spec:
- /root/ready.py
args:
- --container-name
- /root/ready.py
args:
- --container-name
- - pdp
+ - p
olicy-xacml-p
dp
env:
- name: NAMESPACE
valueFrom:
env:
- name: NAMESPACE
valueFrom:
@@
-61,9
+64,10
@@
spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
- image: "{{ .Values.global.
readinessRepository }}/{{ .Values.global.readiness
Image }}"
+ image: "{{ .Values.global.
dockerHubRepository }}/{{ .Values.global.curl
Image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-osdf-sms-readiness
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 }}"
containers:
- name: {{ include "common.name" . }}
image: "{{ include "common.repository" . }}/{{ .Values.image }}"
@@
-89,7
+93,7
@@
spec:
- mountPath: /etc/localtime
name: localtime
readOnly: true
- mountPath: /etc/localtime
name: localtime
readOnly: true
- - mountPath: /opt/
app
/config/osdf_config.yaml
+ - mountPath: /opt/
osdf
/config/osdf_config.yaml
name: {{ include "common.fullname" . }}-config
subPath: osdf_config.yaml
- mountPath: /opt/app/ssl_cert/aaf_root_ca.cer
name: {{ include "common.fullname" . }}-config
subPath: osdf_config.yaml
- mountPath: /opt/app/ssl_cert/aaf_root_ca.cer