Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[GENERIC] move from registry.hub.docker.com to docker.io
[oom.git]
/
kubernetes
/
aaf
/
values.yaml
diff --git
a/kubernetes/aaf/values.yaml
b/kubernetes/aaf/values.yaml
index
cc97e98
..
df6aff5
100644
(file)
--- a/
kubernetes/aaf/values.yaml
+++ b/
kubernetes/aaf/values.yaml
@@
-1,5
+1,6
@@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications © 2020 AT&T
# Copyright © 2017 Amdocs, Bell Canada
# Modifications © 2020 AT&T
+# Modifications Copyright © 2020 Nokia
#
# 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.
@@
-16,19
+17,19
@@
#################################################################
# Global configuration defaults.
#################################################################
#################################################################
# Global configuration defaults.
#################################################################
+
global:
nodePortPrefix: 302
# Readiness image
global:
nodePortPrefix: 302
# Readiness image
- readinessRepository: oomk8s
- readinessImage: readiness-check:2.0.2
+ readinessImage: onap/oom/readiness:3.0.1
# Ubuntu Init image
# Ubuntu Init image
- ubuntuInitRepository:
registry.hub.docker.com
+ ubuntuInitRepository:
docker.io
ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
# Logging image
loggingRepository: docker.elastic.co
loggingImage: beats/filebeat:5.5.0
# BusyBox image
ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
# Logging image
loggingRepository: docker.elastic.co
loggingImage: beats/filebeat:5.5.0
# BusyBox image
- busyboxRepository:
registry.hub.docker.com
+ busyboxRepository:
docker.io
busyboxImage: library/busybox:1.31
persistence:
enabled: true
busyboxImage: library/busybox:1.31
persistence:
enabled: true
@@
-40,9
+41,11
@@
global:
#pullPolicy: IfNotPresent
#repository: "nexus3.onap.org:10003"
#pullPolicy: IfNotPresent
#repository: "nexus3.onap.org:10003"
+ cmpv2Enabled: true
+ addTestingComponents: false
aaf:
readiness: false
aaf:
readiness: false
- image: onap/aaf/aaf_core:2.1.2
2
+ image: onap/aaf/aaf_core:2.1.2
3
aaf_env: "DEV"
public_fqdn: "aaf.osaaf.org"
aaf_release: "Frankfurt"
aaf_env: "DEV"
public_fqdn: "aaf.osaaf.org"
aaf_release: "Frankfurt"
@@
-57,7
+60,7
@@
global:
cadi_x509_issuers: "CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US"
config:
cadi_x509_issuers: "CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US"
config:
- image: onap/aaf/aaf_config:2.1.2
2
+ image: onap/aaf/aaf_config:2.1.2
3
service:
fqdn: "aaf-service"
service:
fqdn: "aaf-service"
@@
-73,7
+76,6
@@
global:
public_port: 31112
# Note: as hello is a sample app, find values in charts/aaf-hello/values.yaml
public_port: 31112
# Note: as hello is a sample app, find values in charts/aaf-hello/values.yaml
-
#################################################################
# Application configuration defaults.
#################################################################
#################################################################
# Application configuration defaults.
#################################################################