Add support registry.k8s.io docker registry service parameter

In an effort to uprev the SPO images, add the
necessary service parameters for the registry.k8s.io registry.
Going forward,the upstream images are tracked and
stored at registry.k8s.io

Depends-On: https://review.opendev.org/c/starlingx/config/+/869433

PASS: build-pkgs -c -a
PASS: build-image
PASS: boot
PASS: SPO image downloaded from private repo after apply

Story: 2010310
Task: 47131

Signed-off-by: Rahul Roshan Kachchap <rahulroshan.kachchap@windriver.com>
Change-Id: I1f72252905045000fc7acc8368303f05c3c12a95
This commit is contained in:
Rahul Roshan Kachchap
2023-01-12 00:39:36 -05:00
parent 93318327fc
commit b8cda01359
2 changed files with 11 additions and 8 deletions

View File

@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (c) 2021 Wind River Systems, Inc.
# Copyright (c) 2021-2023 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -21,11 +21,13 @@
# $3 - registry username (optional)
# $4 - registry password (optional)
#
# This script manipulates the parameters 'url', 'type' and 'auth-secret' of docker service.
# Each one of these three parameters may exist inside the docker service sections docker-registry, elastic-registry,
# gcr-registry, ghcr-registry, k8s-registry and quay-registry, so 18 parameters are manipulated in total.
# Each section of service docker is referred also as registry in this script.
#
# This script manipulates the parameters 'url', 'type' and 'auth-secret'
# of docker service.Each one of these three parameters may exist inside
# the docker service sections docker-registry, elastic-registry,
# gcr-registry, ghcr-registry, k8s-registry, quay-registry and
# registryk8s-registry so 19 parameters are manipulated in total.
# Each section of service docker is referred also as registry in this
# script.
if (( $# != 2 && $# != 4 )); then
echo "The format of the command: $0 registry_base_url registry_type [registry_username] [registry_password]"
@@ -51,6 +53,7 @@ REGISTRY_DICT['gcr-registry']='gcr.io'
REGISTRY_DICT['ghcr-registry']='ghcr.io'
REGISTRY_DICT['k8s-registry']='k8s.gcr.io'
REGISTRY_DICT['quay-registry']='quay.io'
REGISTRY_DICT['registryk8s-registry']='registry.k8s.io'
source /etc/platform/openrc

View File

@@ -1,6 +1,6 @@
#!/bin/bash -e
#
# Copyright (c) 2021-2022 Wind River Systems, Inc.
# Copyright (c) 2021-2023 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -42,7 +42,7 @@ fi
# Constant variables
NEW_CREDS="username:${usr} password:${pw}"
REGISTRY_LIST="docker-registry quay-registry elastic-registry gcr-registry \
k8s-registry ghcr-registry"
k8s-registry ghcr-registry registryk8s-registry"
CENTRAL_REGISTRY_URL="registry.central"
echo