Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[DCAEGEN2] Update CM version and readiness probe
[oom.git]
/
kubernetes
/
dcaegen2
/
components
/
dcae-cloudify-manager
/
values.yaml
diff --git
a/kubernetes/dcaegen2/components/dcae-cloudify-manager/values.yaml
b/kubernetes/dcaegen2/components/dcae-cloudify-manager/values.yaml
index
d2bda88
..
0de6f03
100644
(file)
--- a/
kubernetes/dcaegen2/components/dcae-cloudify-manager/values.yaml
+++ b/
kubernetes/dcaegen2/components/dcae-cloudify-manager/values.yaml
@@
-1,7
+1,8
@@
#============LICENSE_START========================================================
# ================================================================================
#============LICENSE_START========================================================
# ================================================================================
-# Copyright (c) 2018-20
19
AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018-20
20
AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2018 Amdocs, Bell Canada
# Modifications Copyright © 2018 Amdocs, Bell Canada
+# Copyright (c) 2020 J. F. Lucas. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-22,8
+23,7
@@
global:
nodePortPrefix: 302
persistence: {}
global:
nodePortPrefix: 302
persistence: {}
- readinessRepository: oomk8s
- readinessImage: readiness-check:2.0.0
+ readinessImage: onap/oom/readiness:3.0.1
loggingRepository: docker.elastic.co
loggingImage: beats/filebeat:5.5.0
tlsRepository: nexus3.onap.org:10001
loggingRepository: docker.elastic.co
loggingImage: beats/filebeat:5.5.0
tlsRepository: nexus3.onap.org:10001
@@
-32,7
+32,15
@@
global:
user: docker
password: docker
user: docker
password: docker
+secrets:
+ - uid: 'cm-pass'
+ type: password
+ externalSecret: '{{ tpl (default "" .Values.config.cloudifyManagerPasswordExternalSecret) . }}'
+ password: '{{ .Values.config.cloudifyManagerPassword }}'
+ policy: required
+
config:
config:
+ cloudifyManagerPassword: "override me"
logstashServiceName: log-ls
logstashPort: 5044
# Addresses of other ONAP entities
logstashServiceName: log-ls
logstashPort: 5044
# Addresses of other ONAP entities
@@
-46,7
+54,7
@@
config:
#################################################################
# application image
repository: nexus3.onap.org:10001
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/org.onap.dcaegen2.deployments.cm-container:
2.1.0
+image: onap/org.onap.dcaegen2.deployments.cm-container:
3.3.3
pullPolicy: Always
# name of shared ConfigMap with kubeconfig for multiple clusters
pullPolicy: Always
# name of shared ConfigMap with kubeconfig for multiple clusters
@@
-62,6
+70,7
@@
cleanupImage: onap/org.onap.dcaegen2.deployments.dcae-k8s-cleanup-container:1.0.
liveness:
initialDelaySeconds: 10
periodSeconds: 10
liveness:
initialDelaySeconds: 10
periodSeconds: 10
+ timeoutSeconds: 5
# necessary to disable liveness probe when setting breakpoints
# in debugger so K8s doesn't restart unresponsive container
# liveness not desirable for Cloudify Manager container
# necessary to disable liveness probe when setting breakpoints
# in debugger so K8s doesn't restart unresponsive container
# liveness not desirable for Cloudify Manager container
@@
-69,7
+78,13
@@
liveness:
readiness:
initialDelaySeconds: 60
readiness:
initialDelaySeconds: 60
- periodSeconds: 10
+ # In some environments we see CM coming up
+ # properly but readiness probe timing out.
+ # Increasing the timeout and adjusting the
+ # period so it's longer than the timeout.
+ # (DCAEGEN2-2465)
+ periodSeconds: 30
+ timeoutSeconds: 10
service:
type: ClusterIP
service:
type: ClusterIP