summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Elliott <mike.elliott@amdocs.com>2017-11-30 15:40:46 +0000
committerGerrit Code Review <gerrit@onap.org>2017-11-30 15:40:46 +0000
commit1a46de8b97bbea602f14657b88c5067e79d48d27 (patch)
treeea24f203ed4ea3a8062bd61b5f5b34d48a337711
parent2e1bf7ae7e14f597ad468e5e43443c129be0ac11 (diff)
parentf033f949c49cc195be1f3a6bdf79759f7e0983ca (diff)
Merge "Migrate to R1 released docker images" into release-1.1.0
-rw-r--r--kubernetes/aai/values.yaml14
-rw-r--r--kubernetes/cli/values.yaml2
-rw-r--r--kubernetes/dcaegen2/values.yaml2
-rw-r--r--kubernetes/msb/values.yaml4
-rw-r--r--kubernetes/mso/values.yaml2
-rw-r--r--kubernetes/multicloud/values.yaml8
-rw-r--r--kubernetes/policy/values.yaml8
-rw-r--r--kubernetes/portal/values.yaml6
-rw-r--r--kubernetes/sdc/values.yaml10
-rw-r--r--kubernetes/sdnc/values.yaml13
-rw-r--r--kubernetes/vid/values.yaml2
11 files changed, 38 insertions, 33 deletions
diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml
index 44ed7ca7ea..524d534b61 100644
--- a/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/values.yaml
@@ -4,22 +4,22 @@ nodePortPrefix: 302
image:
readiness: oomk8s/readiness-check:1.0.0
aaiProxy: aaionap/haproxy
- aaiProxyVersion: latest
+ aaiProxyVersion: 1.1.0
aaiHbaseImage: aaionap/hbase
aaiHbaseVersion: 1.2.0
modelLoaderImage: nexus3.onap.org:10001/openecomp/model-loader
- modelLoaderVersion: 1.1-STAGING-latest
+ modelLoaderVersion: v1.1.0
aaiResourcesImage: nexus3.onap.org:10001/openecomp/aai-resources
- aaiResourcesVersion: 1.1-STAGING-latest
+ aaiResourcesVersion: v1.1.0
aaiTraversalImage: nexus3.onap.org:10001/openecomp/aai-traversal
- aaiTraversalVersion: 1.1-STAGING-latest
+ aaiTraversalVersion: v1.1.0
dataRouterImage: nexus3.onap.org:10001/openecomp/data-router
- dataRouterVersion: 1.1-STAGING-latest
+ dataRouterVersion: v1.1.0
elasticsearchImage: elasticsearch
elasticsearchVersion: 2.4.1
searchDataImage: nexus3.onap.org:10001/openecomp/search-data-service
- searchDataVersion: 1.1-STAGING-latest
+ searchDataVersion: v1.1.0
sparkyBeImage: nexus3.onap.org:10001/openecomp/sparky-be
- sparkyBeVersion: 1.1-STAGING-latest
+ sparkyBeVersion: v1.1.0
gremlinServerImage: aaionap/gremlin-server
filebeat: docker.elastic.co/beats/filebeat:5.5.0
diff --git a/kubernetes/cli/values.yaml b/kubernetes/cli/values.yaml
index b8fe44e03a..3030237554 100644
--- a/kubernetes/cli/values.yaml
+++ b/kubernetes/cli/values.yaml
@@ -2,4 +2,4 @@ nsPrefix: onap
pullPolicy: Always
nodePortPrefix: 302
image:
- cliImage: nexus3.onap.org:10001/onap/cli:1.1-STAGING-latest
+ cliImage: nexus3.onap.org:10001/onap/cli:v1.1.0
diff --git a/kubernetes/dcaegen2/values.yaml b/kubernetes/dcaegen2/values.yaml
index 5d446c8c41..c892f69e68 100644
--- a/kubernetes/dcaegen2/values.yaml
+++ b/kubernetes/dcaegen2/values.yaml
@@ -2,5 +2,5 @@ nsPrefix: onap
location: dg2
image:
repository: nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.bootstrap
- tag: 1.1-latest
+ tag: v1.1.0
pullPolicy: Always \ No newline at end of file
diff --git a/kubernetes/msb/values.yaml b/kubernetes/msb/values.yaml
index d78a3369f6..7c1b16b8dc 100644
--- a/kubernetes/msb/values.yaml
+++ b/kubernetes/msb/values.yaml
@@ -2,8 +2,8 @@ nsPrefix: onap
pullPolicy: IfNotPresent
image:
consul: consul:0.9.3
- discovery: nexus3.onap.org:10001/onap/msb/msb_discovery:1.0.0-STAGING-latest
- apigateway: nexus3.onap.org:10001/onap/msb/msb_apigateway:1.0.0-STAGING-latest
+ discovery: nexus3.onap.org:10001/onap/msb/msb_discovery:1.0.0
+ apigateway: nexus3.onap.org:10001/onap/msb/msb_apigateway:1.0.0
consulPort: 8500
consulNodePort: 30500
diff --git a/kubernetes/mso/values.yaml b/kubernetes/mso/values.yaml
index 4584e73c9b..fd8b6690e8 100644
--- a/kubernetes/mso/values.yaml
+++ b/kubernetes/mso/values.yaml
@@ -3,6 +3,6 @@ pullPolicy: Always
nodePortPrefix: 302
image:
readiness: oomk8s/readiness-check:1.0.0
- mso: nexus3.onap.org:10001/openecomp/mso:1.1-STAGING-latest
+ mso: nexus3.onap.org:10001/openecomp/mso:v1.1.1
mariadb: nexus3.onap.org:10001/mariadb:10.1.11
filebeat: docker.elastic.co/beats/filebeat:5.5.0
diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml
index 1b512a348e..2431d0a69d 100644
--- a/kubernetes/multicloud/values.yaml
+++ b/kubernetes/multicloud/values.yaml
@@ -3,10 +3,10 @@ pullPolicy: Always
nodePortPrefix: 302
image:
readiness: oomk8s/readiness-check:1.0.0
- framework: nexus3.onap.org:10001/onap/multicloud/framework:latest
- vio: nexus3.onap.org:10001/onap/multicloud/vio:latest
- ocata: nexus3.onap.org:10001/onap/multicloud/openstack-ocata:latest
- windriver: nexus3.onap.org:10001/onap/multicloud/openstack-windriver:latest
+ framework: nexus3.onap.org:10001/onap/multicloud/framework:v1.0.0
+ vio: nexus3.onap.org:10001/onap/multicloud/vio:v1.0.0
+ ocata: nexus3.onap.org:10001/onap/multicloud/openstack-ocata:v1.0.0
+ windriver: nexus3.onap.org:10001/onap/multicloud/openstack-windriver:v1.0.0
# domain name of msb gateway
msbgateway: msb-iag.onap-msb
diff --git a/kubernetes/policy/values.yaml b/kubernetes/policy/values.yaml
index 8119331afb..ce037d896d 100644
--- a/kubernetes/policy/values.yaml
+++ b/kubernetes/policy/values.yaml
@@ -5,12 +5,12 @@ image:
readiness: oomk8s/readiness-check
readinessVersion: 1.0.0
policyPe: nexus3.onap.org:10001/onap/policy/policy-pe
- policyPeVersion: 1.1-STAGING-latest
+ policyPeVersion: v1.1.1
policyDrools: nexus3.onap.org:10001/onap/policy/policy-drools
- policyDroolsVersion: 1.1-STAGING-latest
+ policyDroolsVersion: v1.1.1
policyDb: nexus3.onap.org:10001/onap/policy/policy-db
- policyDbVersion: 1.1-STAGING-latest
+ policyDbVersion: v1.1.1
policyNexus: nexus3.onap.org:10001/onap/policy/policy-nexus
- policyNexusVersion: 1.1-STAGING-latest
+ policyNexusVersion: v1.1.1
ubuntu: ubuntu:16.04
filebeat: docker.elastic.co/beats/filebeat:5.5.0 \ No newline at end of file
diff --git a/kubernetes/portal/values.yaml b/kubernetes/portal/values.yaml
index a5edb98329..aaa781995a 100644
--- a/kubernetes/portal/values.yaml
+++ b/kubernetes/portal/values.yaml
@@ -3,10 +3,10 @@ pullPolicy: Always
nodePortPrefix: 302
image:
readiness: oomk8s/readiness-check:1.0.0
- portalapps: nexus3.onap.org:10001/onap/portal-apps:1.3-STAGING-latest
- portaldb: nexus3.onap.org:10001/onap/portal-db:1.3-STAGING-latest
+ portalapps: nexus3.onap.org:10001/onap/portal-apps:v1.3.0
+ portaldb: nexus3.onap.org:10001/onap/portal-db:v1.3.0
mariadbClient: oomk8s/mariadb-client-init:1.0.0
- portalwms: nexus3.onap.org:10001/onap/portal-wms:1.3-STAGING-latest
+ portalwms: nexus3.onap.org:10001/onap/portal-wms:v1.3.0
ubuntuInit: oomk8s/ubuntu-init:1.0.0
ubuntuDesktop: dorowu/ubuntu-desktop-lxde-vnc
filebeat: docker.elastic.co/beats/filebeat:5.5.0
diff --git a/kubernetes/sdc/values.yaml b/kubernetes/sdc/values.yaml
index a9b7ca30a3..67f2810deb 100644
--- a/kubernetes/sdc/values.yaml
+++ b/kubernetes/sdc/values.yaml
@@ -3,9 +3,9 @@ pullPolicy: Always
nodePortPrefix: 302
image:
readiness: oomk8s/readiness-check:1.0.0
- sdcKibana: nexus3.onap.org:10001/openecomp/sdc-kibana:1.1-STAGING-latest
- sdcFrontend: nexus3.onap.org:10001/openecomp/sdc-frontend:1.1-STAGING-latest
- sdcElasticsearch: nexus3.onap.org:10001/openecomp/sdc-elasticsearch:1.1-STAGING-latest
- sdcCassandra: nexus3.onap.org:10001/openecomp/sdc-cassandra:1.1-STAGING-latest
- sdcBackend: nexus3.onap.org:10001/openecomp/sdc-backend:1.1-STAGING-latest
+ sdcKibana: nexus3.onap.org:10001/openecomp/sdc-kibana:v1.1.0
+ sdcFrontend: nexus3.onap.org:10001/openecomp/sdc-frontend:v1.1.0
+ sdcElasticsearch: nexus3.onap.org:10001/openecomp/sdc-elasticsearch:v1.1.0
+ sdcCassandra: nexus3.onap.org:10001/openecomp/sdc-cassandra:v1.1.0
+ sdcBackend: nexus3.onap.org:10001/openecomp/sdc-backend:v1.1.0
filebeat: docker.elastic.co/beats/filebeat:5.5.0 \ No newline at end of file
diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index f7cbecab9f..407d047850 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -4,7 +4,12 @@ nodePortPrefix: 302
image:
readiness: oomk8s/readiness-check:1.0.0
mysqlServer: mysql/mysql-server:5.6
- dgbuilderSdnc: nexus3.onap.org:10001/onap/ccsdk-dgbuilder-image:0.1-STAGING-latest
- sdnc: nexus3.onap.org:10001/onap/sdnc-image:1.2-STAGING-latest
- admportalSdnc: nexus3.onap.org:10001/onap/admportal-sdnc-image:1.2-STAGING-latest
- filebeat: docker.elastic.co/beats/filebeat:5.5.0 \ No newline at end of file
+ dgbuilderSdnc: nexus3.onap.org:10001/onap/ccsdk-dgbuilder-image:v0.1.0
+ sdnc: nexus3.onap.org:10001/onap/sdnc-image:v1.2.1
+ admportalSdnc: nexus3.onap.org:10001/onap/admportal-sdnc-image:v1.2.1
+ filebeat: docker.elastic.co/beats/filebeat:5.5.0
+
+# FIXME
+# Missing the following deps
+# nexus3.onap.org:10001/onap/sdnc-dmaap-listener-image:v1.2.1
+# nexus3.onap.org:10001/onap/sdnc-ueb-listener-image:v1.2.1 \ No newline at end of file
diff --git a/kubernetes/vid/values.yaml b/kubernetes/vid/values.yaml
index 5d24d347d8..9b1748f507 100644
--- a/kubernetes/vid/values.yaml
+++ b/kubernetes/vid/values.yaml
@@ -4,5 +4,5 @@ nodePortPrefix: 302
image:
readiness: oomk8s/readiness-check:1.0.0
mariadb: nexus3.onap.org:10001/library/mariadb:10
- vid: nexus3.onap.org:10001/openecomp/vid:1.1-STAGING-latest
+ vid: nexus3.onap.org:10001/openecomp/vid:v1.1.1
filebeat: docker.elastic.co/beats/filebeat:5.5.0 \ No newline at end of file