Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[AAI] Update certs to be valid until Jan 2022"
[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
a2ee160
..
312eaa4
100644
(file)
--- a/
kubernetes/dcaegen2/components/dcae-cloudify-manager/values.yaml
+++ b/
kubernetes/dcaegen2/components/dcae-cloudify-manager/values.yaml
@@
-2,6
+2,7
@@
# ================================================================================
# Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2018 Amdocs, Bell Canada
# ================================================================================
# Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2018 Amdocs, Bell Canada
+# Copyright (c) 2020-2021 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,14
+23,16
@@
global:
nodePortPrefix: 302
persistence: {}
global:
nodePortPrefix: 302
persistence: {}
- readinessImage: onap/oom/readiness:3.0.1
- loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
- tlsRepository: nexus3.onap.org:10001
tlsImage: onap/org.onap.dcaegen2.deployments.tls-init-container:2.1.0
tlsImage: onap/org.onap.dcaegen2.deployments.tls-init-container:2.1.0
+ consulLoaderImage: onap/org.onap.dcaegen2.deployments.consul-loader-container:1.1.0
repositoryCred:
user: docker
password: docker
repositoryCred:
user: docker
password: docker
+ # Enabling CMPv2 with CertManager
+ CMPv2CertManagerIntegration: false
+
+cmpv2issuer:
+ name: cmpv2-issuer-onap
secrets:
- uid: 'cm-pass'
secrets:
- uid: 'cm-pass'
@@
-52,8
+55,7
@@
config:
# Application configuration defaults.
#################################################################
# application image
# Application configuration defaults.
#################################################################
# application image
-repository: nexus3.onap.org:10001
-image: onap/org.onap.dcaegen2.deployments.cm-container:3.3.1
+image: onap/org.onap.dcaegen2.deployments.cm-container:4.4.0
pullPolicy: Always
# name of shared ConfigMap with kubeconfig for multiple clusters
pullPolicy: Always
# name of shared ConfigMap with kubeconfig for multiple clusters
@@
-65,10
+67,14
@@
multisiteInitImage: onap/org.onap.dcaegen2.deployments.multisite-init-container:
# image for cleanup job container
cleanupImage: onap/org.onap.dcaegen2.deployments.dcae-k8s-cleanup-container:1.0.0
# image for cleanup job container
cleanupImage: onap/org.onap.dcaegen2.deployments.dcae-k8s-cleanup-container:1.0.0
+# default location for k8s deployments via Cloudify
+default_k8s_location: central
+
# probe configuration parameters
liveness:
initialDelaySeconds: 10
periodSeconds: 10
# probe configuration parameters
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
@@
-76,7
+82,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
@@
-87,21
+99,23
@@
service:
# Resource Limit flavor -By Default using small
flavor: small
# Segregation for Different environment (Small and Large)
# Resource Limit flavor -By Default using small
flavor: small
# Segregation for Different environment (Small and Large)
+# Due to memory issues in ONAP integration environment,
+# we've increased the memory amounts for both flavors.
resources:
small:
limits:
cpu: 2
resources:
small:
limits:
cpu: 2
- memory:
2
Gi
+ memory:
4
Gi
requests:
cpu: 1
requests:
cpu: 1
- memory:
1
Gi
+ memory:
2
Gi
large:
limits:
cpu: 4
large:
limits:
cpu: 4
- memory:
4
Gi
+ memory:
8
Gi
requests:
cpu: 2
requests:
cpu: 2
- memory:
2
Gi
+ memory:
4
Gi
unlimited: {}
# Kubernetes namespace for components deployed via Cloudify manager
# If empty, use the common namespace
unlimited: {}
# Kubernetes namespace for components deployed via Cloudify manager
# If empty, use the common namespace