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] Service monitor for scraping prometheus metrics"
[oom.git]
/
kubernetes
/
aai
/
values.yaml
diff --git
a/kubernetes/aai/values.yaml
b/kubernetes/aai/values.yaml
index
42b0fa6
..
0ba461c
100644
(file)
--- a/
kubernetes/aai/values.yaml
+++ b/
kubernetes/aai/values.yaml
@@
-231,11
+231,11
@@
global: # global defaults
version:
# Current version of the REST API
api:
version:
# Current version of the REST API
api:
- default: v2
4
+ default: v2
7
# Specifies which version the depth parameter is configurable
depth: v11
# List of all the supported versions of the API
# Specifies which version the depth parameter is configurable
depth: v11
# List of all the supported versions of the API
- list: v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24
+ list: v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24
,v25,v26,v27
# Specifies from which version related link should appear
related:
link: v11
# Specifies from which version related link should appear
related:
link: v11
@@
-328,7
+328,7
@@
certInitializer:
# application image
dockerhubRepository: registry.hub.docker.com
# application image
dockerhubRepository: registry.hub.docker.com
-image:
aaionap/haproxy:1.4.2
+image:
onap/aai-haproxy:1.9.5
pullPolicy: Always
flavor: small
pullPolicy: Always
flavor: small
@@
-345,10
+345,28
@@
config:
# default number of instances
replicaCount: 1
# default number of instances
replicaCount: 1
+updateStrategy:
+ type: RollingUpdate
+ maxUnavailable: 0
+ maxSurge: 1
+
nodeSelector: {}
affinity: {}
nodeSelector: {}
affinity: {}
+# HAProxy configuration to block HTTP requests to AAI based on configurable URL patterns
+haproxy:
+ initContainers:
+ resources:
+ memory: 100Mi
+ cpu: 50m
+ requestBlocking:
+ enabled: false
+ customConfigs: []
+ replicas:
+ aaiResources: 1
+ aaiTraversal: 1
+
# probe configuration parameters
liveness:
initialDelaySeconds: 10
# probe configuration parameters
liveness:
initialDelaySeconds: 10
@@
-383,19
+401,43
@@
service:
externalPort: 8443
internalPort: 8443
nodePort: 33
externalPort: 8443
internalPort: 8443
nodePort: 33
- # POLICY hotfix - Note this must be temporary
- # See https://jira.onap.org/browse/POLICY-510
- aaiServiceClusterIp:
externalPlainPort: 80
internalPlainPort: 8080
nodeport: 33
externalPlainPort: 80
internalPlainPort: 8080
nodeport: 33
+ aaiServiceClusterIp:
+ sessionAffinity: None
+
+metricsService:
+ type: ClusterIP
+ portName: prometheus
+ externalPort: 8448
+ internalPort: 8448
+
+metrics:
+ serviceMonitor:
+ enabled: false
+ targetPort: 8448
+ path: /metrics
+ basicAuth:
+ enabled: false
+
+ selector:
+ app: '{{ include "common.name" . }}-metrics'
+ chart: '{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}'
+ release: '{{ include "common.release" . }}'
+ heritage: '{{ .Release.Service }}'
+
+ relabelings: []
+
+ metricRelabelings: []
ingress:
enabled: false
service:
ingress:
enabled: false
service:
- - baseaddr: "aai
.
api"
+ - baseaddr: "aai
-
api"
name: "aai"
port: 8443
name: "aai"
port: 8443
+ plain_port: 80
config:
ssl: "redirect"
config:
ssl: "redirect"