starlingx/config
Code Issues Proposed changes

Download Portieris image during upgrade

Browse Source 
During an upgrade, the portieris image is downloaded from dockerhub.
This is because the new portieris image comes from an unknown (icr)
registry. At the time of upgrade, the icr registry is not configured.
This would fail if the system has no external access.
This commit enhances the upgrade script to try downloading from an
existing configured registry.

Test Cases:

PASS: Portieris upgrade. Look at the sysinv log to ensure the framework
      detects the image in the local registry, pushed by the upgrade
      script.
PASS: run the new section of the script on a lab configured with
      authenticated bootstrap registry

Story: 2010394
Task: 47678

Signed-off-by: Jerry Sun <jerry.sun@windriver.com>
Change-Id: I14f904618dd873e82fa23a429370c67d78d499f2
This commit is contained in:
Jerry Sun 2023-03-17 15:45:49 -04:00
parent e948a02f29
commit f7e5e57ab1
1 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
controllerconfig/controllerconfig/upgrade-scripts/73-upgrade-portieris.sh
View File

@ -291,6 +291,48 @@ if [ "x${UPGRADE_APP_VERSION}" != "x${EXISTING_APP_VERSION}" ]; then
fi
# download new portieris image, since it comes from a new registry
# which is not configured in the previous release
log "$NAME: adding portieris image to local registry"
IMAGE="portieris/portieris:v0.13.1"
system registry-image-tags icr.io/portieris/portieris| grep 'v0\.13\.1'
if [ $? -eq 0 ]; then
log "$NAME: image ${IMAGE} already exists, nothing needs to be done."
else
DOCKER_REGISTRY_UUID=$( system service-parameter-list --service docker --section docker-registry | grep " url " | awk -F '|' '{print $2}'| xargs );
DOCKER_REGISTRY_VALUE=$( system service-parameter-show $DOCKER_REGISTRY_UUID | grep " value " | awk -F '|' '{print $3}'| xargs );
ICR_REGISTRY=$(echo $DOCKER_REGISTRY_VALUE | sed 's;/docker;/icr;');
# check if the system is configured to pull from an authenticated registry
REGISTRY_IS_AUTHED=0
system service-parameter-list --service docker --section docker-registry | grep auth-secret
if [ $? -eq 0 ]; then
REGISTRY_IS_AUTHED=1
log "$NAME: logging in to docker registry using credentials stored in barbican"
BARBICAN_SECRET_UUID=$(system service-parameter-list --service docker --section docker-registry | grep auth-secret | awk -F '|' '{print $6}' | xargs);
BARBICAN_SECRET=$( openstack secret get $BARBICAN_SECRET_UUID -p -f value );
DOCKER_REGISTRY_CREDS=$(echo $BARBICAN_SECRET | sed 's;username:;-u ;' | sed 's;password:;-p ;')
docker login $DOCKER_REGISTRY_VALUE $DOCKER_REGISTRY_CREDS
fi
docker pull ${ICR_REGISTRY}/${IMAGE};
docker tag ${ICR_REGISTRY}/${IMAGE} registry.local:9001/icr.io/${IMAGE}
echo ${OS_PASSWORD} | docker login -u ${OS_USERNAME} --password-stdin registry.local:9001
docker push registry.local:9001/icr.io/${IMAGE}
if [ $REGISTRY_IS_AUTHED -eq 1 ]; then
docker logout $DOCKER_REGISTRY_VALUE
fi
# double check the image tag
system registry-image-tags icr.io/portieris/portieris | grep 'v0\.13\.1'
if [ $? -ne 0 ]; then
log "$NAME: $IMAGE not tagged correctly, exiting for manual intervention"
exit 1
else
log "$NAME: done."
fi
fi
# apply new portieris
log "$NAME: Applying ${UPGRADE_APP_NAME}, version ${UPGRADE_APP_VERSION}"
system application-apply ${UPGRADE_APP_NAME}