diff --git a/sysinv/sysinv/sysinv/sysinv/common/constants.py b/sysinv/sysinv/sysinv/sysinv/common/constants.py index 7296ce824b..a6a539441d 100644 --- a/sysinv/sysinv/sysinv/sysinv/common/constants.py +++ b/sysinv/sysinv/sysinv/sysinv/common/constants.py @@ -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 } } diff --git a/sysinv/sysinv/sysinv/sysinv/common/service_parameter.py b/sysinv/sysinv/sysinv/sysinv/common/service_parameter.py index 37d934ca61..50fda91409 100644 --- a/sysinv/sysinv/sysinv/sysinv/common/service_parameter.py +++ b/sysinv/sysinv/sysinv/sysinv/common/service_parameter.py @@ -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: {