Revert "XOS/NEM charts, use a global registry var, split docker image name/tag/pullPolicy"
This reverts commit 1f58c2afbd680c8c618bff6f66e9982515dd1caf.
Change-Id: I0d7ef37a420168276472675b005482d6d11daabd
diff --git a/examples/image-tag-candidate.yaml b/examples/image-tag-candidate.yaml
index 6c023f0..e1b9c27 100644
--- a/examples/image-tag-candidate.yaml
+++ b/examples/image-tag-candidate.yaml
@@ -14,111 +14,74 @@
# limitations under the License.
# Set all image tags to "candidate" to use locally built images
-image:
- tag: 'candidate'
-# in xos-core chart and other charts with multiple images
-images:
- xos_core:
- tag: 'candidate'
- xos_chameleon:
- tag: 'candidate'
- xos_tosca:
- tag: 'candidate'
- xos_api_tester:
- tag: 'candidate'
- tosca_loader:
- tag: 'candidate'
+# in xos-core chart
+xos_coreImage: 'xosproject/xos-core:candidate'
+xos_chameleonImage: 'xosproject/chameleon:candidate'
+xos_toscaImage: 'xosproject/xos-tosca:candidate'
+xos_api_testerImage: 'xosproject/xos-api-tester:candidate'
+tosca_loaderImage: 'xosproject/tosca-loader:candidate'
# in xos-gui sub-chart required by xos-core chart
xos-gui:
- images:
- xos_gui:
- tag: 'candidate'
- xos_ws:
- tag: 'candidate'
+ xos_guiImage: 'xosproject/xos-gui:candidate'
+ xos_wsImage: 'xosproject/xos-ws:candidate'
# in RCORD service chart
addressmanager:
- image:
- tag: 'candidate'
+ addressmanager_synchronizerImage: 'xosproject/addressmanager-synchronizer:candidate'
att-workflow-driver:
- image:
- tag: 'candidate'
+ attWorkflowDriver_synchronizerImage: 'xosproject/att-workflow-driver-synchronizer:candidate'
fabric:
- image:
- tag: 'candidate'
+ fabric_synchronizerImage: 'xosproject/fabric-synchronizer:candidate'
fabric-crossconnect:
- image:
- tag: 'candidate'
+ fabric_crossconnect_synchronizerImage: 'xosproject/fabric-crossconnect-synchronizer:candidate'
onos-service:
- image:
- tag: 'candidate'
+ onos_synchronizerImage: 'xosproject/onos-synchronizer:candidate'
volt:
- image:
- tag: 'candidate'
+ volt_synchronizerImage: 'xosproject/volt-synchronizer:candidate'
vsg-hw:
- image:
- tag: 'candidate'
+ vsg_hw_synchronizerImage: 'xosproject/vsg-hw-synchronizer:candidate'
vrouter:
- image:
- tag: 'candidate'
+ vrouter_synchronizerImage: 'xosproject/vrouter-synchronizer:candidate'
rcord:
- image:
- tag: 'candidate'
+ rcord_synchronizerImage: 'xosproject/rcord-synchronizer:candidate'
# in BASE-OPENSTACK chart
openstack:
- image:
- tag: 'candidate'
-
+ openstack_synchronizerImage: 'xosproject/openstack-synchronizer:candidate'
vtn-service:
- image:
- tag: 'candidate'
+ vtn_synchronizerImage: 'xosproject/vtn-synchronizer:candidate'
# in MCORD
vmme:
- image:
- tag: 'candidate'
+ synchronizerImage: "xosproject/vmme-synchronizer:candidate"
vspgwc:
- image:
- tag: 'candidate'
+ synchronizerImage: "xosproject/vspgwc-synchronizer:candidate"
vspgwu:
- image:
- tag: 'candidate'
+ synchronizerImage: "xosproject/vspgwu-synchronizer:candidate"
vhss:
- image:
- tag: 'candidate'
+ synchronizerImage: "xosproject/vhss-synchronizer:candidate"
hssdb:
- image:
- tag: 'candidate'
+ synchronizerImage: "xosproject/hssdb-synchronizer:candidate"
internetemulator:
- image:
- tag: 'candidate'
+ synchronizerImage: "xosproject/internetemulator-synchronizer:candidate"
sdncontroller:
- image:
- tag: 'candidate'
+ synchronizerImage: "xosproject/sdncontroller-synchronizer:candidate"
epc-service:
- image:
- tag: 'candidate'
-k8spcservice:
- image:
- tag: 'candidate'
+ synchronizerImage: "xosproject/vepc-synchronizer:candidate"
mcord-subscriber:
- image:
- tag: 'candidate'
+ synchronizerImage: "xosproject/mcord-synchronizer:candidate"
progran:
- image:
- tag: 'candidate'
+ synchronizerImage: "xosproject/progran-synchronizer:candidate"
-# others
+# others
kubernetes:
- image:
- tag: 'candidate'
+ kubernetes_synchronizerImage: 'xosproject/kubernetes-synchronizer:candidate'
exampleservice:
- image:
- tag: 'candidate'
+ exampleservice_synchronizerImage: 'xosproject/exampleservice-synchronizer:candidate'
simpleexampleservice:
- image:
- tag: 'candidate'
+ simpleexampleservice_synchronizerImage: 'xosproject/simpleexampleservice-synchronizer:candidate'
+
+hippieOSS_synchronizerImage: 'xosproject/hippie-oss-synchronizer:candidate'
diff --git a/examples/imagePullPolicy-IfNotPresent.yaml b/examples/imagePullPolicy-IfNotPresent.yaml
index 31e6f32..2cadc2d 100644
--- a/examples/imagePullPolicy-IfNotPresent.yaml
+++ b/examples/imagePullPolicy-IfNotPresent.yaml
@@ -16,94 +16,62 @@
# Only pull docker images if not already present
# in xos-core, rcord-lite, onos and voltha charts
-image:
- pullPolicy: 'IfNotPresent'
-
+imagePullPolicy: 'IfNotPresent'
xos-gui:
- image:
- pullPolicy: 'IfNotPresent'
+ imagePullPolicy: 'IfNotPresent'
# in RCORD service chart
addressmanager:
- image:
- pullPolicy: 'IfNotPresent'
+ imagePullPolicy: 'IfNotPresent'
att-workflow-driver:
- image:
- pullPolicy: 'IfNotPresent'
+ imagePullPolicy: 'IfNotPresent'
fabric:
- image:
- pullPolicy: 'IfNotPresent'
+ imagePullPolicy: 'IfNotPresent'
fabric-crossconnect:
- image:
- pullPolicy: 'IfNotPresent'
+ imagePullPolicy: 'IfNotPresent'
onos-service:
- image:
- pullPolicy: 'IfNotPresent'
+ imagePullPolicy: 'IfNotPresent'
volt:
- image:
- pullPolicy: 'IfNotPresent'
+ imagePullPolicy: 'IfNotPresent'
vsg-hw:
- image:
- pullPolicy: 'IfNotPresent'
+ imagePullPolicy: 'IfNotPresent'
rcord:
- image:
- pullPolicy: 'IfNotPresent'
+ imagePullPolicy: 'IfNotPresent'
vrouter:
- image:
- pullPolicy: 'IfNotPresent'
+ imagePullPolicy: 'IfNotPresent'
# in BASE-OPENSTACK chart
openstack:
- image:
- pullPolicy: 'IfNotPresent'
-
+ imagePullPolicy: 'IfNotPresent'
vtn-service:
- image:
- pullPolicy: 'IfNotPresent'
+ imagePullPolicy: 'IfNotPresent'
# in MCORD
vmme:
- image:
- pullPolicy: 'IfNotPresent'
+ imagePullPolicy: 'IfNotPresent'
vspgwc:
- image:
- pullPolicy: 'IfNotPresent'
+ imagePullPolicy: 'IfNotPresent'
vspgwu:
- image:
- pullPolicy: 'IfNotPresent'
+ imagePullPolicy: 'IfNotPresent'
vhss:
- image:
- pullPolicy: 'IfNotPresent'
+ imagePullPolicy: 'IfNotPresent'
hssdb:
- image:
- pullPolicy: 'IfNotPresent'
+ imagePullPolicy: 'IfNotPresent'
internetemulator:
- image:
- pullPolicy: 'IfNotPresent'
+ imagePullPolicy: 'IfNotPresent'
sdncontroller:
- image:
- pullPolicy: 'IfNotPresent'
+ imagePullPolicy: 'IfNotPresent'
epc-service:
- image:
- pullPolicy: 'IfNotPresent'
-k8sepcservice:
- image:
- pullPolicy: 'IfNotPresent'
+ imagePullPolicy: 'IfNotPresent'
mcord-subscriber:
- image:
- pullPolicy: 'IfNotPresent'
+ imagePullPolicy: 'IfNotPresent'
progran:
- image:
- pullPolicy: 'IfNotPresent'
+ imagePullPolicy: 'IfNotPresent'
# others
kubernetes:
- image:
- pullPolicy: 'IfNotPresent'
+ imagePullPolicy: 'IfNotPresent'
exampleservice:
- image:
- pullPolicy: 'IfNotPresent'
+ imagePullPolicy: 'IfNotPresent'
simpleexampleservice:
- image:
- pullPolicy: 'IfNotPresent'
-
+ imagePullPolicy: 'IfNotPresent'
\ No newline at end of file