Set new default registry

This defaults the registry to
registry.developers.crunchydata.com/crunchydata

Issue: [ch7976]

Author: Jonathan S. Katz

conf/postgres-operator/pgo.yaml

@@ -1,5 +1,5 @@
 Cluster:
-  CCPImagePrefix:  crunchydata
+  CCPImagePrefix:  registry.developers.crunchydata.com/crunchydata
   Metrics:  false
   Badger:  false
   CCPImageTag:  centos7-12.2-4.3.0
@@ -78,5 +78,5 @@ Storage:
     StorageClass:  rook-ceph-block
 Pgo:
   Audit:  false
-  PGOImagePrefix:  crunchydata
+  PGOImagePrefix:  registry.developers.crunchydata.com/crunchydata
   PGOImageTag:  centos7-4.3.0

examples/envs.sh

@@ -18,7 +18,7 @@ export PGO_CMD=kubectl
 export PGOROOT=$GOPATH/src/github.com/crunchydata/postgres-operator
 
 # the version of the Operator you run is set by these vars
-export PGO_IMAGE_PREFIX=crunchydata
+export PGO_IMAGE_PREFIX=registry.developers.crunchydata.com/crunchydata
 export PGO_BASEOS=centos7
 export PGO_VERSION=4.3.0
 export PGO_IMAGE_TAG=$PGO_BASEOS-$PGO_VERSION

examples/load/sample-json-load-config-sc.yaml

@@ -1,4 +1,4 @@
-PGOImagePrefix:  crunchydata
+PGOImagePrefix:  registry.developers.crunchydata.com/crunchydata
 PGOImageTag:  centos7-4.3.0
 DbDatabase:  userdb
 DbUser:  postgres

examples/load/sample-json-load-config.yaml

@@ -1,4 +1,4 @@
-PGOImagePrefix:  crunchydata
+PGOImagePrefix:  registry.developers.crunchydata.com/crunchydata
 PGOImageTag:  centos7-4.3.0
 DbDatabase:  userdb
 DbUser:  postgres

examples/load/sample-load-config.yaml

@@ -1,4 +1,4 @@
-PGOImagePrefix:  crunchydata
+PGOImagePrefix:  registry.developers.crunchydata.com/crunchydata
 PGOImageTag:  centos7-4.3.0
 DbDatabase:  userdb
 DbUser:  postgres

installers/ansible/inventory

@@ -92,7 +92,7 @@ namespace='pgouser1,pgouser2'
 # Crunchy Container Suite images to use. The tags centos7 and rhel7 are acceptable.
 # CentOS7 images can be found in dockerhub: https://hub.docker.com/u/crunchydata
 # RHEL7 images are available to Crunchy customers: https://access.crunchydata.com/login/
-ccp_image_prefix='crunchydata'
+ccp_image_prefix='registry.developers.crunchydata.com/crunchydata'
 ccp_image_tag='centos7-12.2-4.3.0'
 
 # Name of a Secret containing credentials for container image registries.
@@ -101,7 +101,7 @@ ccp_image_pull_secret=''
 ccp_image_pull_secret_manifest=''
 
 # Crunchy PostgreSQL Operator images to use.  The tags centos7 and rhel7 are acceptable.
-pgo_image_prefix='crunchydata'
+pgo_image_prefix='registry.developers.crunchydata.com/crunchydata'
 pgo_image_tag='centos7-4.3.0'
 
 # Name of a Secret containing credentials for container image registries.

installers/gcp-marketplace/inventory.ini

@@ -15,11 +15,11 @@ pgo_installation_name='${OPERATOR_NAME}'
 pgo_operator_namespace='${OPERATOR_NAMESPACE}'
 namespace=''
 
-ccp_image_prefix='docker.io/crunchydata'
+ccp_image_prefix='registry.developers.crunchydata.com/crunchydata'
 ccp_image_tag='centos7-12.2-4.3.0'
 ccp_image_pull_secret=''
 ccp_image_pull_secret_manifest=''
-pgo_image_prefix='docker.io/crunchydata'
+pgo_image_prefix='registry.developers.crunchydata.com/crunchydata'
 pgo_image_tag='centos7-4.3.0'
 
 pgo_image='${OPERATOR_IMAGE}'

installers/kubectl/postgres-operator.yml

@@ -34,7 +34,7 @@ spec:
             containers:
             - name: pgo-deploy
               command: ["/pgo-deploy.sh"]
-              image: crunchydata/pgo-deployer:centos7-4.3.0
+              image: registry.developers.crunchydata.com/crunchydata/pgo-deployer:centos7-4.3.0
               imagePullPolicy: IfNotPresent
               env:
                   - name: ANSIBLE_CONFIG
@@ -52,7 +52,7 @@ spec:
                   - name: CREATE_RBAC
                     value: "true"
                   - name: CCP_IMAGE_PREFIX
-                    value: "crunchydata"
+                    value: "registry.developers.crunchydata.com/crunchydata"
                   - name: CCP_IMAGE_TAG
                     value: "centos7-12.2-4.3.0"
                   - name: DB_PASSWORD_LENGTH
@@ -96,7 +96,7 @@ spec:
                   - name: PGO_CLIENT_VERSION
                     value: "v4.3.0"
                   - name: PGO_IMAGE_PREFIX
-                    value: "crunchydata"
+                    value: "registry.developers.crunchydata.com/crunchydata"
                   - name: PGO_IMAGE_TAG
                     value: "centos7-4.3.0"
                   - name: PGO_INSTALLATION_NAME

installers/olm/Makefile

@@ -1,13 +1,13 @@
 .DEFAULT_GOAL := help
 
-CCP_IMAGE_PREFIX ?= crunchydata
+CCP_IMAGE_PREFIX ?= registry.developers.crunchydata.com/crunchydata
 CCP_IMAGE_TAG ?= $(PGO_BASEOS)-$(CCP_PG_FULLVERSION)-$(PGO_VERSION)
 CCP_PG_FULLVERSION ?= 12.2
 KUBECONFIG ?= $(HOME)/.kube/config
 OLM_TOOLS ?= registry.localhost:5000/postgres-operator-olm-tools:$(OLM_VERSION)
 OLM_VERSION ?= 0.13.0
 PGO_BASEOS ?= centos7
-PGO_IMAGE_PREFIX ?= crunchydata
+PGO_IMAGE_PREFIX ?= registry.developers.crunchydata.com/crunchydata
 PGO_IMAGE_TAG ?= $(PGO_BASEOS)-$(PGO_VERSION)
 PGO_VERSION ?= 4.3.0
 

operator/common.go

@@ -28,6 +28,11 @@ import (
 	"k8s.io/client-go/kubernetes"
 )
 
+const (
+	// defaultRegistry is the default registry to pull the container images from
+	defaultRegistry = "registry.developers.crunchydata.com/crunchydata"
+)
+
 var CRUNCHY_DEBUG bool
 var NAMESPACE string
 
@@ -90,14 +95,14 @@ func Initialize(clientset *kubernetes.Clientset) {
 	log.Printf("PrimaryStorage=%v\n", Pgo.Storage["storage1"])
 
 	if Pgo.Cluster.CCPImagePrefix == "" {
-		log.Debug("pgo.yaml CCPImagePrefix not set, using default")
-		Pgo.Cluster.CCPImagePrefix = "crunchydata"
+		log.Debugf("pgo.yaml CCPImagePrefix not set, using default %q", defaultRegistry)
+		Pgo.Cluster.CCPImagePrefix = defaultRegistry
 	} else {
 		log.Debugf("pgo.yaml CCPImagePrefix set, using %s", Pgo.Cluster.CCPImagePrefix)
 	}
 	if Pgo.Pgo.PGOImagePrefix == "" {
-		log.Debug("pgo.yaml PGOImagePrefix not set, using default")
-		Pgo.Pgo.PGOImagePrefix = "crunchydata"
+		log.Debugf("pgo.yaml PGOImagePrefix not set, using default %q", defaultRegistry)
+		Pgo.Pgo.PGOImagePrefix = defaultRegistry
 	} else {
 		log.Debugf("PGOImagePrefix set, using %s", Pgo.Pgo.PGOImagePrefix)
 	}