Merge "[OOM][DCAE] Chartmuseum deployment support"

diff --combined kubernetes/common/repositoryGenerator/templates/_repository.tpl
index 488db05,95cbd20..211cf1c
--- 1/kubernetes/common/repositoryGenerator/templates/_repository.tpl
--- 2/kubernetes/common/repositoryGenerator/templates/_repository.tpl
+++ b/kubernetes/common/repositoryGenerator/templates/_repository.tpl
@@@ -67,6 -67,15 +67,15 @@@
    {{- include "repositoryGenerator._repositoryHelper" (merge (dict "repoName" "googleK8sRepository") .) }}
  {{- end -}}
  
+ {{/*
+   Resolve the name of the GithubContainer registry
+   - .Values.global.githubContainerRegistry  : default image githubContainerRegistry for all dockerHub images
+   - .Values.githubContainerRegistryOverride : override global githubContainerRegistry on a per chart basis
+ */}}
+ {{- define "repositoryGenerator.githubContainerRegistry" -}}
+   {{- include "repositoryGenerator._repositoryHelper" (merge (dict "repoName" "githubContainerRegistry") .) }}
+ {{- end -}}
+ 
  {{- define "repositoryGenerator.image._helper" -}}
    {{- $dot := default . .dot -}}
    {{- $initRoot := default $dot.Values.repositoryGenerator .initRoot -}}
@@@ -83,6 -92,10 +92,6 @@@
    {{- include "repositoryGenerator.image._helper" (merge (dict "image" "curlImage") .) }}
  {{- end -}}
  
 -{{- define "repositoryGenerator.image.certserviceclient" -}}
 -  {{- include "repositoryGenerator.image._helper" (merge (dict "image" "certServiceClientImage") .) }}
 -{{- end -}}
 -
  {{- define "repositoryGenerator.image.dcaepolicysync" -}}
    {{- include "repositoryGenerator.image._helper" (merge (dict "image" "dcaePolicySyncImage") .) }}
  {{- end -}}
@@@ -139,7 -152,7 +148,7 @@@
    {{/* Our version of helm doesn't support deepCopy so we need this nasty trick */}}
    {{- $subchartDot := fromJson (include "common.subChartDot" (dict "dot" $dot "initRoot" $initRoot)) }}
    {{- $repoCreds := "" }}
 -  {{- if $subchartDot.Values.global.dockerHubRepositoryCred }}
 +  {{- if $subchartDot.Values.global.repositoryCred }}
    {{-   $repo := $subchartDot.Values.global.repository }}
    {{-   $cred := $subchartDot.Values.global.repositoryCred }}
    {{-   $mail := default "@" $cred.mail }}
@@@ -182,5 -195,17 +191,17 @@@
    {{-     $repoCreds = printf "%s, %s" $repoCreds $gcrRepoCreds }}
    {{-   end }}
    {{- end }}
+   {{- if $subchartDot.Values.global.githubContainerRegistryCred }}
+   {{-   $ghcrRepo := $subchartDot.Values.global.githubContainerRegistry }}
+   {{-   $ghcrCred := $subchartDot.Values.global.githubContainerRegistryCred }}
+   {{-   $ghcrMail := default "@" $ghcrCred.mail }}
+   {{-   $ghcrAuth := printf "%s:%s" $ghcrCred.user $ghcrCred.password | b64enc }}
+   {{-   $ghcrRepoCreds := printf "\"%s\":{\"username\":\"%s\",\"password\":\"%s\",\"email\":\"%s\",\"auth\":\"%s\"}" $ghcrRepo $ghcrCred.user $ghcrCred.password $ghcrMail $ghcrAuth }}
+   {{-   if eq "" $repoCreds }}
+   {{-     $repoCreds = $ghcrRepoCreds }}
+   {{-   else }}
+   {{-     $repoCreds = printf "%s, %s" $repoCreds $ghcrRepoCreds }}
+   {{-   end }}
+   {{- end }}
    {{- printf "{%s}" $repoCreds | b64enc -}}
  {{- end -}}

diff --combined kubernetes/common/repositoryGenerator/values.yaml
index bf21e2d,3fdf76d..2a01112
--- 1/kubernetes/common/repositoryGenerator/values.yaml
--- 2/kubernetes/common/repositoryGenerator/values.yaml
+++ b/kubernetes/common/repositoryGenerator/values.yaml
@@@ -19,10 -19,12 +19,11 @@@ global
    dockerHubRepository: docker.io
    elasticRepository: docker.elastic.co
    googleK8sRepository: k8s.gcr.io
+   githubContainerRegistry: ghcr.io
  
    # common global images
    busyboxImage: busybox:1.32
    curlImage: curlimages/curl:7.69.1
 -  certServiceClientImage: onap/org.onap.oom.platform.cert-service.oom-certservice-client:2.3.3
    envsubstImage: dibi/envsubst:1
    # there's only latest image for htpasswd
    htpasswdImage: xmartlabs/htpasswd:latest
@@@ -55,6 -57,7 +56,6 @@@
  imageRepoMapping:
    busyboxImage: dockerHubRepository
    curlImage: dockerHubRepository
 -  certServiceClientImage: repository
    envsubstImage: dockerHubRepository
    htpasswdImage: dockerHubRepository
    jreImage: repository

diff --combined kubernetes/onap/values.yaml
index 0e2b13b,a3d67c2..028b43a
--- 1/kubernetes/onap/values.yaml
--- 2/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@@ -47,7 -47,7 +47,7 @@@ global
    dockerHubRepository: &dockerHubRepository docker.io
    elasticRepository: &elasticRepository docker.elastic.co
    googleK8sRepository: k8s.gcr.io
- 
+   githubContainerRegistry: ghcr.io
  
    #/!\ DEPRECATED /!\
    # Legacy repositories which will be removed at the end of migration.
@@@ -194,6 -194,7 +194,6 @@@
  
    # Enabling CMPv2
    cmpv2Enabled: true
 -  CMPv2CertManagerIntegration: false
    platform:
      certificates:
        clientSecretName: oom-cert-service-client-tls-secret
@@@ -203,6 -204,17 +203,6 @@@
        keystorePasswordSecretKey: password
        truststorePasswordSecretName: oom-cert-service-certificates-password
        truststorePasswordSecretKey: password
 -    certServiceClient:
 -      image: onap/org.onap.oom.platform.cert-service.oom-certservice-client:2.3.3
 -      certificatesSecretMountPath: /etc/onap/oom/certservice/certs/
 -      envVariables:
 -        certPath: "/var/custom-certs"
 -        # Certificate related
 -        caName: "RA"
 -        # Client configuration related
 -        requestURL: "https://oom-cert-service:8443/v1/certificate/"
 -        requestTimeout: "30000"
 -        outputType: "P12"
  
    # Indicates offline deployment build
    # Set to true if you are rendering helm charts for offline deployment