starlingx
/
clients
Code Issues Proposed changes

Add support for different tags for remote-cli 

There may be cases where the image tags for the platform
and application side remote clients may be different. This
mostly covers post release scenarios where, we only make
changes to one of the clients

Story: 2005312
Task: 36734
Change-Id: Id6419fdb1409c57e97866de50ec1f637f4e9b71b
Signed-off-by: Stefan Dinescu <stefan.dinescu@windriver.com>
This commit is contained in:
Stefan Dinescu 2019-09-23 13:47:01 +03:00
parent 1871e51590
commit 3ba1deb0d3
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
remote_cli/README
View File

@ -73,7 +73,12 @@ EOF
kubectl apply -f admin-login.yaml
TOKEN_DATA=$(kubectl -n kube-system describe secret $(kubectl -n kube-system get secret | grep ${USER} | awk '{print $1}') | grep "token:" | awk '{print $2}')
source /etc/platform/openrc
OAM_IP=$(system oam-show |grep oam_ip| awk '{print $4}')
OAM_IP=$(system oam-show |grep oam_floating_ip| awk '{print $4}')
if [ -z "$OAM_IP" ]; then
# AIO-SX doesn't use oam_floating_ip, but instead uses just oam_ip
OAM_IP=$(system oam-show |grep oam_ip| awk '{print $4}')
fi
kubectl config --kubeconfig ${OUTPUT_FILE} set-cluster stxcluster --server=https://${OAM_IP}:6443 --insecure-skip-tls-verify
kubectl config --kubeconfig ${OUTPUT_FILE} set-credentials ${USER} --token=$TOKEN_DATA
@ -96,11 +101,11 @@ kubectl config --kubeconfig ${OUTPUT_FILE} use-context stxcluster-default
By default this will generate a remote_client_openstack.sh file
5. When access to the Kubernetes platform side is required, on your console,
source the platform side generated at step 3.
source the platform side generated at step 4.
Example: source remote_client_platform.sh
When access to the Openstack application side is required, on your console,
source the platform side generated at step 3.
source the platform side generated at step 4.
Example: source remote_client_openstack.sh
When prompted, enter your openstack password.

4
remote_cli/client_wrapper.sh
View File

@ -9,11 +9,11 @@
KUBE_CFG_PATH="/root/.kube/config"
if [[ "$CONFIG_TYPE" = "platform" ]]; then
CLIENT_IMAGE_NAME="docker.io/starlingx/stx-platformclients:${DOCKER_IMAGE_TAG}"
CLIENT_IMAGE_NAME="docker.io/starlingx/stx-platformclients:${PLATFORM_DOCKER_IMAGE_TAG}"
# We only need to configure the kubernetes authentication file on the platform container
VOLUME_LIST="--volume ${OSC_WORKDIR}:/wd --volume ${K8S_CONFIG_FILE}:${KUBE_CFG_PATH}"
else
CLIENT_IMAGE_NAME="docker.io/starlingx/stx-openstackclients:${DOCKER_IMAGE_TAG}"
CLIENT_IMAGE_NAME="docker.io/starlingx/stx-openstackclients:${APPLICATION_DOCKER_IMAGE_TAG}"
VOLUME_LIST="--volume ${OSC_WORKDIR}:/wd"
fi

3
remote_cli/docker_image_version.sh
View File

@ -1 +1,2 @@
export DOCKER_IMAGE_TAG="master-centos-stable-latest"
export PLATFORM_DOCKER_IMAGE_TAG="master-centos-stable-latest"
export APPLICATION_DOCKER_IMAGE_TAG="master-centos-stable-latest"