fix show-pvc and update dockerfiles

Author: Jeff McCormick

centos7/Dockerfile.csvload.centos7

@@ -5,8 +5,8 @@ LABEL name="crunchydata/csvload" \
       	PostgresVersion="9.6" \
       	PostgresFullVersion="9.6.5" \
         version="7.3" \
-        release="1.5.2" \
-        build-date="2017-09-28" \
+        release="2.0" \
+        build-date="2017-10-28" \
         url="https://crunchydata.com" \
         summary="loads a CSV file into a database" \
         description="executed by the operator, loads a CSV file." \

centos7/Dockerfile.lspvc.centos7

@@ -1,6 +1,6 @@
 FROM centos:7
 
-LABEL Release="1.5.2" Vendor="Crunchy Data Solutions" 
+LABEL Release="2.0" Vendor="Crunchy Data Solutions" 
 
 RUN yum -y update && yum -y clean all
 

operator/backup/backup.go

@@ -79,8 +79,8 @@ func AddBackupBase(clientset *kubernetes.Clientset, client *rest.RESTClient, job
 		log.Info("created backup PVC =" + pvcName + " in namespace " + namespace)
 	}
 
-	//update the pvc name in the TPR
-	err = util.Patch(client, "/spec/pvcname", pvcName, "pgbackups", job.Spec.Name, namespace)
+	//update the pvc name in the CRD
+	err = util.Patch(client, "/spec/storagespec/name", pvcName, "pgbackups", job.Spec.Name, namespace)
 
 	//create the job -
 	jobFields := jobTemplateFields{

pgo/cmd/pvc.go

@@ -64,7 +64,7 @@ func printPVC(pvcName string) {
 
 // PrintPVCListing ...
 func PrintPVCListing(pvcName string) {
-	var podPath = viper.GetString("Pgo.LspvcTemplate")
+	var podPath = viper.GetString("Pgo.LSPVCTemplate")
 	var PodTemplate *template.Template
 	var err error
 	var buf []byte

rhel7/Dockerfile.csvload.rhel7

@@ -0,0 +1,44 @@
+FROM registry.access.redhat.com/rhel7.3
+
+LABEL name="crunchydata/csvload" \
+        vendor="crunchy data" \
+      	PostgresVersion="9.6" \
+      	PostgresFullVersion="9.6.5" \
+        version="7.3" \
+        release="2.0" \
+        build-date="2017-10-28" \
+        url="https://crunchydata.com" \
+        summary="loads a CSV file into a database" \
+        description="executed by the operator, loads a CSV file." \
+        io.k8s.description="cvsload container" \
+        io.k8s.display-name="Crunchy cvsload container" \
+        io.openshift.expose-services="" \
+        io.openshift.tags="crunchy,database"
+
+# Crunchy Postgres repo
+ADD conf/CRUNCHY-GPG-KEY.public  /
+ADD conf/crunchypg96.repo /etc/yum.repos.d/
+RUN rpm --import CRUNCHY-GPG-KEY.public
+
+RUN rpm -Uvh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm 
+
+RUN yum -y update &&  yum -y install epel-release \
+ && yum install -y \
+	gettext \
+	hostname \
+ 	nss_wrapper \
+	openssh-clients \
+	procps-ng \
+ && yum -y install postgresql96 \
+ && yum clean all -y
+
+RUN mkdir -p /opt/cpm/bin /opt/cpm/conf 
+ADD bin/csvload/ /opt/cpm/bin
+ADD conf/csvload/ /opt/cpm/conf
+RUN chown -R 26:26 /opt/cpm 
+
+VOLUME /pgdata
+
+USER 26
+
+CMD ["/opt/cpm/bin/start.sh"]

rhel7/Dockerfile.lspvc.rhel7

@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhel7.3
 
-LABEL Release="1.5.2" Vendor="Crunchy Data Solutions" 
+LABEL Release="2.0" Vendor="Crunchy Data Solutions" 
 
 RUN yum -y update && yum -y clean all
 

rhel7/Dockerfile.postgres-operator.rhel7

@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhel7.3
 
-LABEL Release="1.5.2" Vendor="Crunchy Data Solutions" 
+LABEL Release="2.0" Vendor="Crunchy Data Solutions" 
 
 ENV PGVERSION="9.6" PGDG_REPO="pgdg-centos96-9.6-3.noarch.rpm"