From f62a053be5006ace1714ea4226b51fd4e5377afa Mon Sep 17 00:00:00 2001
From: Mohamed Abukar <abukar.mohamed@nokia.com>
Date: Mon, 9 Mar 2020 18:14:39 +0200
Subject: [PATCH] Add kubectl

Change-Id: Ied875a13981d696f2d64e395c101f0edef68d508
Signed-off-by: Mohamed Abukar <abukar.mohamed@nokia.com>
---
 Dockerfile                    | 8 +++++++-
 agent/test/o1-create-xapp.xml | 4 ++--
 container-tag.yaml            | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e03eb96..2869aec 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -69,7 +69,7 @@ RUN \
 RUN \
       cd /opt/dev && \
       git clone https://github.com/sysrepo/sysrepo.git && \
-      cd sysrepo && sed -i -e 's/2000/30000/g' src/common.h.in && \
+      cd sysrepo && sed -i -e 's/2000/30000/g;s/5000/30000/g' src/common.h.in && \
       mkdir build && cd build && \
       cmake -DCMAKE_BUILD_TYPE:String="Release" -DENABLE_TESTS=OFF -DREPOSITORY_LOC:PATH=/etc/sysrepo .. && \
       make -j2 && \
@@ -109,6 +109,10 @@ ARG RMRDEVURL=https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/r
 RUN wget --content-disposition ${RMRLIBURL} && dpkg -i rmr_${RMRVERSION}_amd64.deb
 RUN wget --content-disposition ${RMRDEVURL} && dpkg -i rmr-dev_${RMRVERSION}_amd64.deb
 RUN rm -f rmr_${RMRVERSION}_amd64.deb rmr-dev_${RMRVERSION}_amd64.deb
+
+# Install kubectl from Docker Hub
+COPY --from=lachlanevenson/k8s-kubectl:v1.16.0 /usr/local/bin/kubectl /usr/local/bin/kubectl
+
 RUN ldconfig
 
 # Swagger
@@ -195,6 +199,8 @@ COPY --from=o1mediator-build /usr/local/share/ /usr/local/share/
 COPY --from=o1mediator-build /usr/local/etc/ /usr/local/etc/
 COPY --from=o1mediator-build /usr/local/bin/ /usr/local/bin/
 COPY --from=o1mediator-build /usr/local/lib/ /usr/local/lib/
+COPY --from=o1mediator-build /usr/local/bin/kubectl /usr/local/bin/kubectl
+
 RUN ldconfig
 
 # copy yang models with data
diff --git a/agent/test/o1-create-xapp.xml b/agent/test/o1-create-xapp.xml
index 600f5fd..0ce8098 100755
--- a/agent/test/o1-create-xapp.xml
+++ b/agent/test/o1-create-xapp.xml
@@ -2,8 +2,8 @@
     <xapps xmlns="urn:o-ran:ric:xapp-desc:1.0">
         <xapp xmlns:xc="urn:ietf:params:xml:ns:netconf:base:1.0" xc:operation="create">
             <name>ueec</name>
-            <release-name>ueec-xapp</release-name>
-            <version>0.0.1</version>
+            <release-name>ueec</release-name>
+            <version>0.0.4</version>
             <namespace>ricxapp</namespace>
         </xapp>
     </xapps>    
diff --git a/container-tag.yaml b/container-tag.yaml
index dc6f324..66a2515 100644
--- a/container-tag.yaml
+++ b/container-tag.yaml
@@ -2,4 +2,4 @@
 # By default this file is in the docker build directory,
 # but the location can configured in the JJB template.
 ---
-tag: 0.4.0
+tag: 0.4.2
-- 
2.16.6