various fixes prior to release including CCP_IMAGE_PREFIX support in operator

Jeff McCormick · Jeff McCormick · commit 03cdf130dc35 · 2017-11-20T20:16:36.000-06:00
diff --git a/apiserver/loadservice/loadimpl.go b/apiserver/loadservice/loadimpl.go
@@ -35,6 +35,7 @@ import (
 
 type loadJobTemplateFields struct {
 	Name            string
+	COImagePrefix   string
 	COImageTag      string
 	DbHost          string
 	DbDatabase      string
@@ -106,6 +107,7 @@ func Load(request *msgs.LoadRequest) msgs.LoadResponse {
 		return resp
 	}
 
+	LoadConfigTemplate.COImagePrefix = viper.GetString("COImagePrefix")
 	LoadConfigTemplate.COImageTag = viper.GetString("COImageTag")
 	LoadConfigTemplate.DbDatabase = viper.GetString("DbDatabase")
 	LoadConfigTemplate.DbUser = viper.GetString("DbUser")
@@ -207,6 +209,9 @@ func createJob(clusterName, namespace string) error {
 
 func validateConfig() error {
 	var err error
+	if viper.GetString("COImagePrefix") == "" {
+		return errors.New("COImagePrefix is not supplied")
+	}
 	if viper.GetString("COImageTag") == "" {
 		return errors.New("COImageTag is not supplied")
 	}
diff --git a/apiserver/pvcservice/pvcimpl.go b/apiserver/pvcservice/pvcimpl.go
@@ -32,10 +32,11 @@ import (
 )
 
 type lspvcTemplateFields struct {
-	Name       string
-	COImageTag string
-	BackupRoot string
-	PVCName    string
+	Name          string
+	COImagePrefix string
+	COImageTag    string
+	BackupRoot    string
+	PVCName       string
 }
 
 var lspvcTemplate *template.Template
@@ -98,10 +99,11 @@ func printPVCListing(namespace, pvcName, PVCRoot string) ([]string, error) {
 	}
 
 	pvcFields := lspvcTemplateFields{
-		Name:       podName,
-		COImageTag: viper.GetString("Pgo.COImageTag"),
-		BackupRoot: pvcRoot,
-		PVCName:    pvcName,
+		Name:          podName,
+		COImagePrefix: viper.GetString("Pgo.COImagePrefix"),
+		COImageTag:    viper.GetString("Pgo.COImageTag"),
+		BackupRoot:    pvcRoot,
+		PVCName:       pvcName,
 	}
 
 	err = lspvcTemplate.Execute(&doc2, pvcFields)
diff --git a/centos7/Dockerfile.apiserver.centos7 b/centos7/Dockerfile.apiserver.centos7
@@ -1,6 +1,6 @@
 FROM centos:7
 
-LABEL Release="2.1" Vendor="Crunchy Data Solutions" 
+LABEL Release="2.2" Vendor="Crunchy Data Solutions" 
 
 ENV PGVERSION="9.6" PGDG_REPO="pgdg-centos96-9.6-3.noarch.rpm"
 
diff --git a/centos7/Dockerfile.csvload.centos7 b/centos7/Dockerfile.csvload.centos7
@@ -3,10 +3,10 @@ FROM centos:7
 LABEL name="crunchydata/csvload" \
         vendor="crunchy data" \
       	PostgresVersion="9.6" \
-      	PostgresFullVersion="9.6.5" \
+      	PostgresFullVersion="9.6.6" \
         version="7.3" \
-        release="2.1" \
-        build-date="2017-11-08" \
+        release="2.2" \
+        build-date="2017-11-28" \
         url="https://crunchydata.com" \
         summary="loads a CSV file into a database" \
         description="executed by the operator, loads a CSV file." \
diff --git a/centos7/Dockerfile.lspvc.centos7 b/centos7/Dockerfile.lspvc.centos7
@@ -1,6 +1,6 @@
 FROM centos:7
 
-LABEL Release="2.1" Vendor="Crunchy Data Solutions" 
+LABEL Release="2.2" Vendor="Crunchy Data Solutions" 
 
 RUN yum -y update && yum -y clean all
 
diff --git a/centos7/Dockerfile.postgres-operator.centos7 b/centos7/Dockerfile.postgres-operator.centos7
@@ -1,6 +1,6 @@
 FROM centos:7
 
-LABEL Release="2.1" Vendor="Crunchy Data Solutions" 
+LABEL Release="2.2" Vendor="Crunchy Data Solutions" 
 
 ENV PGVERSION="9.6" PGDG_REPO="pgdg-centos96-9.6-3.noarch.rpm"
 
diff --git a/conf/apiserver/pgo.csvload-template.json b/conf/apiserver/pgo.csvload-template.json
@@ -25,7 +25,7 @@
 
                 "containers": [{
                     "name": "csvload",
-                    "image": "crunchydata/csvload:{{.COImageTag}}",
+                    "image": "{{.COImagePrefix}}/csvload:{{.COImageTag}}",
                     "volumeMounts": [{
                         "mountPath": "/pgdata",
                         "name": "pgdata",
diff --git a/conf/apiserver/pgo.lspvc-template.json b/conf/apiserver/pgo.lspvc-template.json
@@ -15,7 +15,7 @@
             "securityContext": {
                 "privileged": false
             },
-            "image": "crunchydata/lspvc:{{.COImageTag}}",
+            "image": "{{.COImagePrefix}}/lspvc:{{.COImageTag}}",
             "env": [{
                 "name": "BACKUP_ROOT",
                 "value": "{{.BackupRoot}}"
diff --git a/conf/apiserver/pgo.yaml b/conf/apiserver/pgo.yaml
@@ -1,5 +1,6 @@
 Namespace:  demo
 Cluster:
+  CCPImagePrefix:  crunchydata
   CCPImageTag:  centos7-9.6.5-1.6.0
   Port:  5432
   PrimaryPassword:  password
@@ -27,5 +28,6 @@ Pgo:
   APIServerUrl:  http://localhost:8080
   LSPVCTemplate:  /config/pgo.lspvc-template.json
   CSVLoadTemplate:  /config/pgo.csvload-template.json
-  COImageTag:  centos7-2.1
+  COImagePrefix:  crunchydata
+  COImageTag:  centos7-2.2
   Debug:  true
diff --git a/conf/client/.crunchy.yaml b/conf/client/.crunchy.yaml
diff --git a/conf/postgres-operator/backup-job.json b/conf/postgres-operator/backup-job.json
@@ -23,7 +23,7 @@
 
                 "containers": [{
                     "name": "backup",
-                    "image": "crunchydata/crunchy-backup:{{.CCPImageTag}}",
+                    "image": "{{.CCPImagePrefix}}/crunchy-backup:{{.CCPImageTag}}",
                     "volumeMounts": [{
                         "mountPath": "/pgdata",
                         "name": "pgdata",
diff --git a/conf/postgres-operator/cluster/1/cluster-deployment-1.json b/conf/postgres-operator/cluster/1/cluster-deployment-1.json
@@ -23,7 +23,7 @@
 
                 "containers": [{
                     "name": "database",
-                    "image": "crunchydata/crunchy-postgres:{{.CCPImageTag}}",
+                    "image": "{{.CCPImagePrefix}}/crunchy-postgres:{{.CCPImageTag}}",
                     "readinessProbe": {
                         "exec": {
                             "command": [
diff --git a/conf/postgres-operator/cluster/1/cluster-replica-deployment-1-shared.json b/conf/postgres-operator/cluster/1/cluster-replica-deployment-1-shared.json
@@ -18,7 +18,7 @@
 
                 "containers": [{
                     "name": "database",
-                    "image": "crunchydata/crunchy-postgres:{{.CCPImageTag}}",
+                    "image": "{{.CCPImagePrefix}}/crunchy-postgres:{{.CCPImageTag}}",
                     "env": [{
                         "name": "PG_PRIMARY_PORT",
                         "value": "{{.Port}}"
diff --git a/conf/postgres-operator/cluster/1/cluster-replica-deployment-1.json b/conf/postgres-operator/cluster/1/cluster-replica-deployment-1.json
@@ -18,7 +18,7 @@
 
                 "containers": [{
                     "name": "database",
-                    "image": "crunchydata/crunchy-postgres:{{.CCPImageTag}}",
+                    "image": "{{.CCPImagePrefix}}/crunchy-postgres:{{.CCPImageTag}}",
                     "env": [{
                         "name": "PG_PRIMARY_PORT",
                         "value": "{{.Port}}"
diff --git a/conf/postgres-operator/cluster/1/cluster-upgrade-job-1.json b/conf/postgres-operator/cluster/1/cluster-upgrade-job-1.json
@@ -30,7 +30,7 @@
 
                 "containers": [{
                     "name": "upgrade",
-                    "image": "crunchydata/crunchy-upgrade:{{.CCPImageTag}}",
+                    "image": "{{.CCPImagePrefix}}/crunchy-upgrade:{{.CCPImageTag}}",
                     "volumeMounts": [{
                         "mountPath": "/pgolddata",
                         "name": "pgolddata",
diff --git a/deploy/deployment.json b/deploy/deployment.json
@@ -38,6 +38,9 @@
                     "image": "crunchydata/postgres-operator:$CO_IMAGE_TAG",
                     "imagePullPolicy": "IfNotPresent",
                     "env": [{
+                        "name": "CCP_IMAGE_PREFIX",
+                        "value": "crunchydata"
+                    }, {
                         "name": "DEBUG",
                         "value": "true"
                     }, {
diff --git a/operator/backup/backup.go b/operator/backup/backup.go
@@ -20,6 +20,7 @@ import (
 	"encoding/json"
 	log "github.com/Sirupsen/logrus"
 	crv1 "github.com/crunchydata/postgres-operator/apis/cr/v1"
+	"github.com/crunchydata/postgres-operator/operator"
 	"github.com/crunchydata/postgres-operator/operator/pvc"
 	"github.com/crunchydata/postgres-operator/util"
 	"io/ioutil"
@@ -33,6 +34,7 @@ import (
 type jobTemplateFields struct {
 	Name            string
 	PvcName         string
+	CCPImagePrefix  string
 	CCPImageTag     string
 	SecurityContext string
 	BackupHost      string
@@ -86,6 +88,7 @@ func AddBackupBase(clientset *kubernetes.Clientset, client *rest.RESTClient, job
 	jobFields := jobTemplateFields{
 		Name:            job.Spec.Name,
 		PvcName:         util.CreatePVCSnippet(job.Spec.StorageSpec.StorageType, pvcName),
+		CCPImagePrefix:  operator.CCPImagePrefix,
 		CCPImageTag:     job.Spec.CCPImageTag,
 		SecurityContext: util.CreateSecContext(job.Spec.StorageSpec.Fsgroup, job.Spec.StorageSpec.SupplementalGroups),
 		BackupHost:      job.Spec.BackupHost,
diff --git a/operator/cluster/cluster.go b/operator/cluster/cluster.go
@@ -56,6 +56,7 @@ type DeploymentTemplateFields struct {
 	Name              string
 	ClusterName       string
 	Port              string
+	CCPImagePrefix    string
 	CCPImageTag       string
 	Database          string
 	OperatorLabels    string
diff --git a/operator/cluster/cluster_strategy_1.go b/operator/cluster/cluster_strategy_1.go
@@ -23,6 +23,7 @@ import (
 	"encoding/json"
 	log "github.com/Sirupsen/logrus"
 	crv1 "github.com/crunchydata/postgres-operator/apis/cr/v1"
+	"github.com/crunchydata/postgres-operator/operator"
 	"github.com/crunchydata/postgres-operator/operator/pvc"
 	"github.com/crunchydata/postgres-operator/util"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -91,11 +92,14 @@ func (r Strategy1) AddCluster(clientset *kubernetes.Clientset, client *rest.REST
 
 	primaryLabels := getPrimaryLabels(cl.Spec.Name, cl.Spec.ClusterName, false, false, cl.Spec.UserLabels)
 
+	log.Debug("CCPImagePrefix before create cluster " + operator.CCPImagePrefix)
+
 	//create the primary deployment
 	deploymentFields := DeploymentTemplateFields{
 		Name:              cl.Spec.Name,
 		ClusterName:       cl.Spec.Name,
 		Port:              cl.Spec.Port,
+		CCPImagePrefix:    operator.CCPImagePrefix,
 		CCPImageTag:       cl.Spec.CCPImageTag,
 		PVCName:           util.CreatePVCSnippet(cl.Spec.PrimaryStorage.StorageType, primaryPVCName),
 		OperatorLabels:    util.GetLabelsFromMap(primaryLabels),
@@ -453,6 +457,7 @@ func (r Strategy1) CreateReplica(serviceName string, clientset *kubernetes.Clien
 		Name:              depName,
 		ClusterName:       clusterName,
 		Port:              cl.Spec.Port,
+		CCPImagePrefix:    operator.CCPImagePrefix,
 		CCPImageTag:       cl.Spec.CCPImageTag,
 		PVCName:           pvcName,
 		PrimaryHost:       cl.Spec.PrimaryHost,
diff --git a/operator/cluster/upgrade_strategy_1.go b/operator/cluster/upgrade_strategy_1.go
@@ -23,6 +23,7 @@ import (
 	"encoding/json"
 	log "github.com/Sirupsen/logrus"
 	crv1 "github.com/crunchydata/postgres-operator/apis/cr/v1"
+	"github.com/crunchydata/postgres-operator/operator"
 	"github.com/crunchydata/postgres-operator/operator/pvc"
 	"github.com/crunchydata/postgres-operator/util"
 	"k8s.io/client-go/kubernetes"
@@ -40,6 +41,7 @@ type JobTemplateFields struct {
 	Name            string
 	OldPVCName      string
 	NewPVCName      string
+	CCPImagePrefix  string
 	CCPImageTag     string
 	OldDatabaseName string
 	NewDatabaseName string
@@ -77,6 +79,7 @@ func (r Strategy1) MinorUpgrade(clientset *kubernetes.Clientset, restclient *res
 		Name:              cl.Spec.Name,
 		ClusterName:       cl.Spec.Name,
 		Port:              cl.Spec.Port,
+		CCPImagePrefix:    operator.CCPImagePrefix,
 		CCPImageTag:       upgrade.Spec.CCPImageTag,
 		PVCName:           util.CreatePVCSnippet(cl.Spec.PrimaryStorage.StorageType, cl.Spec.PrimaryStorage.Name),
 		OperatorLabels:    util.GetLabelsFromMap(primaryLabels),
@@ -142,6 +145,7 @@ func (r Strategy1) MajorUpgrade(clientset *kubernetes.Clientset, restclient *res
 		Name:            upgrade.Spec.Name,
 		NewPVCName:      pvcName,
 		OldPVCName:      upgrade.Spec.OldPVCName,
+		CCPImagePrefix:  operator.CCPImagePrefix,
 		CCPImageTag:     upgrade.Spec.CCPImageTag,
 		OldDatabaseName: upgrade.Spec.OldDatabaseName,
 		NewDatabaseName: upgrade.Spec.NewDatabaseName,
@@ -201,6 +205,7 @@ func (r Strategy1) MajorUpgradeFinalize(clientset *kubernetes.Clientset, client
 		Name:              cl.Spec.Name,
 		ClusterName:       cl.Spec.Name,
 		Port:              cl.Spec.Port,
+		CCPImagePrefix:    operator.CCPImagePrefix,
 		CCPImageTag:       upgrade.Spec.CCPImageTag,
 		PVCName:           util.CreatePVCSnippet(cl.Spec.PrimaryStorage.StorageType, upgrade.Spec.NewPVCName),
 		OperatorLabels:    util.GetLabelsFromMap(primaryLabels),
diff --git a/operator/common.go b/operator/common.go
@@ -0,0 +1,34 @@
+package operator
+
+/*
+ Copyright 2017 Crunchy Data Solutions, Inc.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+import (
+	log "github.com/Sirupsen/logrus"
+	"os"
+)
+
+var CCPImagePrefix string
+
+func Initialize() {
+	CCPImagePrefix = os.Getenv("CCP_IMAGE_PREFIX")
+	if CCPImagePrefix == "" {
+		log.Debug("CCP_IMAGE_PREFIX not set, using default")
+		CCPImagePrefix = "crunchydata"
+	} else {
+		log.Debug("CCP_IMAGE_PREFIX set, using " + CCPImagePrefix)
+	}
+
+}
diff --git a/pgo/cmd/pvc.go b/pgo/cmd/pvc.go
@@ -72,6 +72,11 @@ func printPVC(pvcName, pvcRoot string) {
 	}
 	log.Debugf("response = %v\n", response)
 
+	if response.Status.Code == apiservermsgs.Error {
+		log.Error(response.Status.Msg)
+		return
+	}
+
 	for k, v := range response.Results {
 		if k == len(response.Results)-1 {
 			fmt.Printf("%s%s\n", TreeTrunk, "/"+v)
diff --git a/postgres-operator.go b/postgres-operator.go
@@ -36,6 +36,7 @@ import (
 
 	crdclient "github.com/crunchydata/postgres-operator/client"
 	"github.com/crunchydata/postgres-operator/controller"
+	"github.com/crunchydata/postgres-operator/operator"
 	"github.com/crunchydata/postgres-operator/operator/backup"
 	"github.com/crunchydata/postgres-operator/operator/cluster"
 	"k8s.io/client-go/kubernetes"
@@ -55,6 +56,8 @@ func main() {
 		log.Info("debug flag set to false")
 	}
 
+	operator.Initialize()
+
 	// Create the client config. Use kubeconfig if given, otherwise assume in-cluster.
 	config, err := buildConfig(*kubeconfig)
 	if err != nil {
diff --git a/rhel7/Dockerfile.apiserver.rhel7 b/rhel7/Dockerfile.apiserver.rhel7
@@ -1,7 +1,7 @@
 FROM registry.access.redhat.com/rhel7.3
 
 
-LABEL Release="2.1" Vendor="Crunchy Data Solutions" 
+LABEL Release="2.2" Vendor="Crunchy Data Solutions" 
 
 ENV PGVERSION="9.6" PGDG_REPO="pgdg-centos96-9.6-3.noarch.rpm"
 
diff --git a/rhel7/Dockerfile.csvload.rhel7 b/rhel7/Dockerfile.csvload.rhel7
@@ -3,10 +3,10 @@ FROM registry.access.redhat.com/rhel7.3
 LABEL name="crunchydata/csvload" \
         vendor="crunchy data" \
       	PostgresVersion="9.6" \
-      	PostgresFullVersion="9.6.5" \
+      	PostgresFullVersion="9.6.6" \
         version="7.3" \
-        release="2.1" \
-        build-date="2017-11-08" \
+        release="2.2" \
+        build-date="2017-11-28" \
         url="https://crunchydata.com" \
         summary="loads a CSV file into a database" \
         description="executed by the operator, loads a CSV file." \
diff --git a/rhel7/Dockerfile.lspvc.rhel7 b/rhel7/Dockerfile.lspvc.rhel7
diff --git a/rhel7/Dockerfile.postgres-operator.rhel7 b/rhel7/Dockerfile.postgres-operator.rhel7
