starlingx
/
config
Code Issues Proposed changes

Support ghcr docker registry service parameters 

In an effort to uprev the SR-IOV and multus images, add the
necessary service parameters for the ghcr registry.  Going forward,
the upstream images are tracked and stored at ghcr.io

Story: 2008972
Task: 42928

Signed-off-by: Steven Webster <steven.webster@windriver.com>
Change-Id: Id4a88de65d5ff4dc158227b05c3f64d2ec9cc988
(cherry picked from commit 3ebdb80f58)
This commit is contained in:
Steven Webster 2021-07-28 15:37:22 -04:00 committed by Daniel Safta
parent 2450ba753d
commit d97dd66f45
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

@ -1077,6 +1077,7 @@ SERVICE_PARAM_SECTION_DOCKER_GCR_REGISTRY = 'gcr-registry'
SERVICE_PARAM_SECTION_DOCKER_K8S_REGISTRY = 'k8s-registry'
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_NAME_DOCKER_URL = 'url'
SERVICE_PARAM_NAME_DOCKER_AUTH_SECRET = 'auth-secret'
SERVICE_PARAM_NAME_DOCKER_TYPE = 'type'
@ -1092,6 +1093,7 @@ DEFAULT_DOCKER_GCR_REGISTRY = 'gcr.io'
DEFAULT_DOCKER_QUAY_REGISTRY = 'quay.io'
DEFAULT_DOCKER_DOCKER_REGISTRY = 'docker.io'
DEFAULT_DOCKER_ELASTIC_REGISTRY = 'docker.elastic.co'
DEFAULT_DOCKER_GHCR_REGISTRY = 'ghcr.io'
DEFAULT_REGISTRIES_INFO = {
SERVICE_PARAM_SECTION_DOCKER_K8S_REGISTRY: {
@ -1118,6 +1120,11 @@ DEFAULT_REGISTRIES_INFO = {
'registry_default': DEFAULT_DOCKER_ELASTIC_REGISTRY,
'registry_replaced': None,
'registry_auth': None
},
SERVICE_PARAM_SECTION_DOCKER_GHCR_REGISTRY: {
'registry_default': DEFAULT_DOCKER_GHCR_REGISTRY,
'registry_replaced': None,
'registry_auth': None
}
}

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

@ -613,6 +613,13 @@ DOCKER_ELASTIC_REGISTRY_PARAMETER_RESOURCE = {
'platform::docker::params::elastic_registry_secure',
}
DOCKER_GHCR_REGISTRY_PARAMETER_RESOURCE = {
constants.SERVICE_PARAM_NAME_DOCKER_URL:
'platform::docker::params::ghcr_registry',
constants.SERVICE_PARAM_NAME_DOCKER_SECURE_REGISTRY:
'platform::docker::params::ghcr_registry_secure',
}
KUBERNETES_CERTIFICATES_PARAMETER_OPTIONAL = [
constants.SERVICE_PARAM_NAME_KUBERNETES_API_SAN_LIST,
]
@ -791,6 +798,11 @@ SERVICE_PARAMETER_SCHEMA = {
SERVICE_PARAM_OPTIONAL: DOCKER_REGISTRIES_PARAMETER_OPTIONAL,
SERVICE_PARAM_VALIDATOR: DOCKER_REGISTRIES_PARAMETER_VALIDATOR,
SERVICE_PARAM_RESOURCE: DOCKER_ELASTIC_REGISTRY_PARAMETER_RESOURCE
},
constants.SERVICE_PARAM_SECTION_DOCKER_GHCR_REGISTRY: {
SERVICE_PARAM_OPTIONAL: DOCKER_REGISTRIES_PARAMETER_OPTIONAL,
SERVICE_PARAM_VALIDATOR: DOCKER_REGISTRIES_PARAMETER_VALIDATOR,
SERVICE_PARAM_RESOURCE: DOCKER_GHCR_REGISTRY_PARAMETER_RESOURCE
}
},
constants.SERVICE_TYPE_KUBERNETES: {