Update to fix inconsistent naming

Dockerfile and Kunernetes resource files
use inconsistent names. This patch is to
fix inconsistent names.

Issue-ID: MULTICLOUD-1065
Signed-off-by: Ritu Sood <ritu.sood@intel.com>
Change-Id: If7ea6d9ecf55196be5400ea5d2b4d3ce42f99b0f

diff --git a/build/Dockerfile b/build/Dockerfile
index ff9e857..0203192 100644 (file)
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -20,18 +20,18 @@ RUN cd src/clm && make all
 
 FROM ubuntu:16.04
 
-WORKDIR /opt/mco
-RUN groupadd -r mco && useradd -r -g mco mco
-RUN chown mco:mco /opt/mco -R
-COPY --chown=mco --from=0 /go/src/github.com/onap/multicloud-k8s/src/orchestrator/orchestrator ./
-COPY --chown=mco --from=0 /go/src/github.com/onap/multicloud-k8s/src/ncm/ncm ./
-COPY --chown=mco --from=0 /go/src/github.com/onap/multicloud-k8s/src/dcm/dcm ./
-COPY --chown=mco --from=0 /go/src/github.com/onap/multicloud-k8s/src/rsync/rsync ./
-COPY --chown=mco --from=0 /go/src/github.com/onap/multicloud-k8s/src/ovnaction/ovnaction ./
-COPY --chown=mco --from=0 /go/src/github.com/onap/multicloud-k8s/src/clm/clm ./
-COPY --chown=mco --from=0 /go/src/github.com/onap/multicloud-k8s/build/entrypoint ./
+WORKDIR /opt/emco
+RUN groupadd -r emco && useradd -r -g emco emco
+RUN chown emco:emco /opt/emco -R
+COPY --chown=emco --from=0 /go/src/github.com/onap/multicloud-k8s/src/orchestrator/orchestrator ./
+COPY --chown=emco --from=0 /go/src/github.com/onap/multicloud-k8s/src/ncm/ncm ./
+COPY --chown=emco --from=0 /go/src/github.com/onap/multicloud-k8s/src/dcm/dcm ./
+COPY --chown=emco --from=0 /go/src/github.com/onap/multicloud-k8s/src/rsync/rsync ./
+COPY --chown=emco --from=0 /go/src/github.com/onap/multicloud-k8s/src/ovnaction/ovnaction ./
+COPY --chown=emco --from=0 /go/src/github.com/onap/multicloud-k8s/src/clm/clm ./
+COPY --chown=emco --from=0 /go/src/github.com/onap/multicloud-k8s/build/entrypoint ./
 
-USER mco
+USER emco
 
 ENTRYPOINT ["./entrypoint"]
 

diff --git a/build/Readme.md b/build/Readme.md
index 193c0ea..afc7cd0 100644 (file)
--- a/build/Readme.md
+++ b/build/Readme.md
@@ -1,4 +1,7 @@
+##########################################
 # Steps for building v2 API Docker Image
-$cd k8s
-$docker build -f build/Dockerfile . -t mco
+##########################################
 
+    `$cd k8s`
+
+    `$docker build -f build/Dockerfile . -t emco`

diff --git a/build/entrypoint b/build/entrypoint
index bafb76e..d711f0f 100755 (executable)
--- a/build/entrypoint
+++ b/build/entrypoint
@@ -3,7 +3,7 @@
 cmd=${1:-""}
 
 case ${cmd} in
-   "mco")
+   "orchestrator")
       ./orchestrator
       ;;
 

diff --git a/deployments/kubernetes/onap4k8s.yaml b/deployments/kubernetes/onap4k8s.yaml
index 302fd53..1bd4ce9 100644 (file)
--- a/deployments/kubernetes/onap4k8s.yaml
+++ b/deployments/kubernetes/onap4k8s.yaml
@@ -52,15 +52,15 @@ spec:
     spec:
       containers:
         - name: orchestrator
-          image: rtsood/mco:0.0.1
+          image: rtsood/emco:0.0.1
           imagePullPolicy: IfNotPresent
-          command: ["/opt/mco/entrypoint", "mco"]
-          workingDir: /opt/mco
+          command: ["/opt/emco/entrypoint", "orchestrator"]
+          workingDir: /opt/emco
           ports:
           - containerPort: 9015
           volumeMounts:
           - name: config
-            mountPath: /opt/mco/config.json
+            mountPath: /opt/emco/config.json
             subPath: config.json
       volumes:
         - name: config
@@ -123,15 +123,15 @@ spec:
     spec:
       containers:
         - name: ncm
-          image: rtsood/mco:0.0.1
+          image: rtsood/emco:0.0.1
           imagePullPolicy: IfNotPresent
-          command: ["/opt/mco/entrypoint", "ncm"]
-          workingDir: /opt/mco
+          command: ["/opt/emco/entrypoint", "ncm"]
+          workingDir: /opt/emco
           ports:
           - containerPort: 9031
           volumeMounts:
           - name: config
-            mountPath: /opt/mco/config.json
+            mountPath: /opt/emco/config.json
             subPath: config.json
       volumes:
         - name: config
@@ -193,15 +193,15 @@ spec:
     spec:
       containers:
         - name: rsync
-          image: rtsood/mco:0.0.1
+          image: rtsood/emco:0.0.1
           imagePullPolicy: IfNotPresent
-          command: ["/opt/mco/entrypoint", "rsync"]
-          workingDir: /opt/mco
+          command: ["/opt/emco/entrypoint", "rsync"]
+          workingDir: /opt/emco
           ports:
           - containerPort: 9041
           volumeMounts:
           - name: config
-            mountPath: /opt/mco/config.json
+            mountPath: /opt/emco/config.json
             subPath: config.json
       volumes:
         - name: config
@@ -267,16 +267,16 @@ spec:
     spec:
       containers:
         - name: ovnaction
-          image: rtsood/mco:0.0.1
+          image: rtsood/emco:0.0.1
           imagePullPolicy: IfNotPresent
-          command: ["/opt/mco/entrypoint", "ovnaction"]
-          workingDir: /opt/mco
+          command: ["/opt/emco/entrypoint", "ovnaction"]
+          workingDir: /opt/emco
           ports:
           - containerPort: 9053
           - containerPort: 9051
           volumeMounts:
           - name: config
-            mountPath: /opt/mco/config.json
+            mountPath: /opt/emco/config.json
             subPath: config.json
       volumes:
         - name: config
@@ -339,15 +339,15 @@ spec:
     spec:
       containers:
         - name: clm
-          image: rtsood/mco:0.0.1
+          image: rtsood/emco:0.0.1
           imagePullPolicy: IfNotPresent
-          command: ["/opt/mco/entrypoint", "clm"]
-          workingDir: /opt/mco
+          command: ["/opt/emco/entrypoint", "clm"]
+          workingDir: /opt/emco
           ports:
           - containerPort: 9061
           volumeMounts:
           - name: config
-            mountPath: /opt/mco/config.json
+            mountPath: /opt/emco/config.json
             subPath: config.json
       volumes:
         - name: config