starlingx
/
config
Code Issues Proposed changes

Support icr.io docker registry service parameters 

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

PASS: build-pkgs -c -a
PASS: build-image
PASS: boot
PASS  bootstrap, with localhost.yaml changes applied beforehand
PASS: system service-parameter-delete
PASS: system service-parameter-add
PASS  system service-parameter-modify
PASS  system service-parameter-apply
PASS: portieris image downloaded from private repo after apply

Story: 2010394
Task: 47166

Signed-off-by: Rahul Roshan Kachchap <rahulroshan.kachchap@windriver.com>
Change-Id: I7664402efbf5a3d05a7e62002a721e7dbbc28c88
This commit is contained in:
Rahul Roshan Kachchap 2023-01-19 01:46:48 -05:00
parent e7366adc41
commit ee9b3e21b9
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sysinv/sysinv/sysinv/sysinv/common/constants.py
View File

@ -1113,6 +1113,7 @@ SERVICE_PARAM_SECTION_DOCKER_QUAY_REGISTRY = 'quay-registry'
SERVICE_PARAM_SECTION_DOCKER_ELASTIC_REGISTRY = 'elastic-registry'
SERVICE_PARAM_SECTION_DOCKER_GHCR_REGISTRY = 'ghcr-registry'
SERVICE_PARAM_SECTION_DOCKER_REGISTRYK8S_REGISTRY = 'registryk8s-registry'
SERVICE_PARAM_SECTION_DOCKER_ICR_REGISTRY = 'icr-registry'
SERVICE_PARAM_NAME_DOCKER_URL = 'url'
SERVICE_PARAM_NAME_DOCKER_AUTH_SECRET = 'auth-secret'
SERVICE_PARAM_NAME_DOCKER_TYPE = 'type'
@ -1130,6 +1131,7 @@ DEFAULT_DOCKER_DOCKER_REGISTRY = 'docker.io'
DEFAULT_DOCKER_ELASTIC_REGISTRY = 'docker.elastic.co'
DEFAULT_DOCKER_GHCR_REGISTRY = 'ghcr.io'
DEFAULT_DOCKER_REGISTRYK8S_REGISTRY = 'registry.k8s.io'
DEFAULT_DOCKER_ICR_REGISTRY = 'icr.io'
DEFAULT_REGISTRIES_INFO = {
SERVICE_PARAM_SECTION_DOCKER_K8S_REGISTRY: {
@ -1166,6 +1168,11 @@ DEFAULT_REGISTRIES_INFO = {
'registry_default': DEFAULT_DOCKER_REGISTRYK8S_REGISTRY,
'registry_replaced': None,
'registry_auth': None
},
SERVICE_PARAM_SECTION_DOCKER_ICR_REGISTRY: {
'registry_default': DEFAULT_DOCKER_ICR_REGISTRY,
'registry_replaced': None,
'registry_auth': None
}
}

12
sysinv/sysinv/sysinv/sysinv/common/service_parameter.py
View File

@ -1123,6 +1123,13 @@ DOCKER_REGISTRYK8S_REGISTRY_PARAMETER_RESOURCE = {
'platform::docker::params::registryk8s_registry_secure',
}
DOCKER_ICR_REGISTRY_PARAMETER_RESOURCE = {
constants.SERVICE_PARAM_NAME_DOCKER_URL:
'platform::docker::params::icr_registry',
constants.SERVICE_PARAM_NAME_DOCKER_SECURE_REGISTRY:
'platform::docker::params::icr_registry_secure',
}
KUBERNETES_CERTIFICATES_PARAMETER_OPTIONAL = [
constants.SERVICE_PARAM_NAME_KUBERNETES_API_SAN_LIST,
]
@ -1477,6 +1484,11 @@ SERVICE_PARAMETER_SCHEMA = {
SERVICE_PARAM_OPTIONAL: DOCKER_REGISTRIES_PARAMETER_OPTIONAL,
SERVICE_PARAM_VALIDATOR: DOCKER_REGISTRIES_PARAMETER_VALIDATOR,
SERVICE_PARAM_RESOURCE: DOCKER_REGISTRYK8S_REGISTRY_PARAMETER_RESOURCE
},
constants.SERVICE_PARAM_SECTION_DOCKER_ICR_REGISTRY: {
SERVICE_PARAM_OPTIONAL: DOCKER_REGISTRIES_PARAMETER_OPTIONAL,
SERVICE_PARAM_VALIDATOR: DOCKER_REGISTRIES_PARAMETER_VALIDATOR,
SERVICE_PARAM_RESOURCE: DOCKER_ICR_REGISTRY_PARAMETER_RESOURCE
}
},
constants.SERVICE_TYPE_KUBERNETES: {