update version numbers to 3.0"

jmccormick2001 · jmccormick2001 · commit 2bae209250e7 · 2018-05-14T21:09:33.000-05:00
diff --git a/README.asciidoc b/README.asciidoc
@@ -2,7 +2,7 @@
 image::docs/crunchy_logo.png[Hyla Arborea,width="40%",height="40%", align="center"]
 = PostgreSQL Operator
 
-v2.7, {docdate}
+v3.0, {docdate}
 
 The *postgres-operator* is a controller that runs within a Kubernetes cluster that provides a means to deploy and manage PostgreSQL clusters.
 
diff --git a/apiserver/versionservice/versionimpl.go b/apiserver/versionservice/versionimpl.go
@@ -25,7 +25,7 @@ func Version() msgs.VersionResponse {
 	resp := msgs.VersionResponse{}
 	resp.Status.Code = msgs.Ok
 	resp.Status.Msg = "apiserver version"
-	resp.Version = "2.7"
+	resp.Version = "3.0"
 
 	return resp
 }
diff --git a/bin/pull.sh b/bin/pull.sh
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 export P_IMAGE_PREFIX=registry-dev.crunchydata.com/crunchydata
-export CO_IMAGE_TAG=centos7-2.7
+export CO_IMAGE_TAG=centos7-3.0
 
 docker pull $P_IMAGE_PREFIX/pgo-lspvc:$CO_IMAGE_TAG
 docker tag $P_IMAGE_PREFIX/pgo-lspvc:$CO_IMAGE_TAG $CO_IMAGE_PREFIX/pgo-lspvc:$CO_IMAGE_TAG
diff --git a/centos7/Dockerfile.pgo-apiserver.centos7 b/centos7/Dockerfile.pgo-apiserver.centos7
@@ -1,6 +1,6 @@
 FROM centos:7
 
-LABEL Release="2.7" Vendor="Crunchy Data Solutions" 
+LABEL Release="3.0" Vendor="Crunchy Data Solutions" 
 
 ENV PGVERSION="9.6" PGDG_REPO="pgdg-centos96-9.6-3.noarch.rpm"
 
diff --git a/centos7/Dockerfile.pgo-load.centos7 b/centos7/Dockerfile.pgo-load.centos7
@@ -5,8 +5,8 @@ LABEL name="crunchydata/pgo-load" \
       	PostgresVersion="9.6" \
       	PostgresFullVersion="9.6.9" \
         version="7.3" \
-        release="2.7" \
-        build-date="2018-05-09" \
+        release="3.0" \
+        build-date="2018-05-14" \
         url="https://crunchydata.com" \
         summary="loads a CSV or json file into a database" \
         description="executed by the operator, loads a CSV or json file." \
diff --git a/centos7/Dockerfile.pgo-lspvc.centos7 b/centos7/Dockerfile.pgo-lspvc.centos7
@@ -1,6 +1,6 @@
 FROM centos:7
 
-LABEL Release="2.7" Vendor="Crunchy Data Solutions" 
+LABEL Release="3.0" Vendor="Crunchy Data Solutions" 
 
 RUN yum -y update && yum -y clean all
 
diff --git a/centos7/Dockerfile.pgo-rmdata.centos7 b/centos7/Dockerfile.pgo-rmdata.centos7
@@ -1,6 +1,6 @@
 FROM centos:7
 
-LABEL Release="2.7" Vendor="Crunchy Data Solutions" 
+LABEL Release="3.0" 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.7" Vendor="Crunchy Data Solutions" 
+LABEL Release="3.0" Vendor="Crunchy Data Solutions" 
 
 ENV PGVERSION="9.6" PGDG_REPO="pgdg-centos96-9.6-3.noarch.rpm"
 
diff --git a/chart/postgres-operator/Chart.yaml b/chart/postgres-operator/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 description: CrunchyData Postgres Operator Helm chart
 name: postgres-operator
 version: 0.1.3
-appVersion: 2.7
+appVersion: 3.0
 keywords:
 - postgres
 - database
diff --git a/chart/postgres-operator/files/apiserver/pgo.yaml b/chart/postgres-operator/files/apiserver/pgo.yaml
@@ -43,4 +43,4 @@ Pgo:
   LSPVCTemplate:  /config/pgo.lspvc-template.json
   LoadTemplate:  /config/pgo.load-template.json
   COImagePrefix:  crunchydata
-  COImageTag:  centos7-2.7
+  COImageTag:  centos7-3.0
diff --git a/chart/postgres-operator/values.yaml b/chart/postgres-operator/values.yaml
@@ -5,14 +5,14 @@ replicaCount: 1
 
 image:
   repository: crunchydata/postgres-operator
-  tag: centos7-2.7
+  tag: centos7-3.0
   pullPolicy: IfNotPresent
 
 env:
   debug: "true"
   ccp_image_prefix: "crunchydata"
   co_image_prefix: "crunchydata"
-  co_image_tag: "centos7-2.7"
+  co_image_tag: "centos7-3.0"
 
 resources:
   limits:
diff --git a/conf/apiserver/pgo.yaml b/conf/apiserver/pgo.yaml
@@ -1,6 +1,6 @@
 Cluster:
   CCPImagePrefix:  crunchydata
-  CCPImageTag:  centos7-10.4-1.8.3-rc3
+  CCPImageTag:  centos7-10.4-1.8.3
   Port:  5432
   User:  testuser
   Database:  userdb
@@ -44,4 +44,4 @@ Pgo:
   LSPVCTemplate:  /config/pgo.lspvc-template.json
   LoadTemplate:  /config/pgo.load-template.json
   COImagePrefix:  crunchydata
-  COImageTag:  centos7-2.7-rc3
+  COImageTag:  centos7-3.0
diff --git a/examples/pgo.yaml.emptydir b/examples/pgo.yaml.emptydir
@@ -25,4 +25,4 @@ Pgo:
   LSPVCTemplate:  /config/pgo.lspvc-template.json
   LoadTemplate:  /config/pgo.load-template.json
   COImagePrefix:  crunchydata
-  COImageTag:  centos7-2.7
+  COImageTag:  centos7-3.0
diff --git a/examples/pgo.yaml.hostpath b/examples/pgo.yaml.hostpath
@@ -22,4 +22,4 @@ Pgo:
   LSPVCTemplate:  /config/pgo.lspvc-template.json
   LoadTemplate:  /config/pgo.load-template.json
   COImagePrefix:  crunchydata
-  COImageTag:  centos7-2.7
+  COImageTag:  centos7-3.0
diff --git a/examples/pgo.yaml.nfs b/examples/pgo.yaml.nfs
@@ -25,4 +25,4 @@ Pgo:
   LSPVCTemplate:  /config/pgo.lspvc-template.json
   LoadTemplate:  /config/pgo.load-template.json
   COImagePrefix:  crunchydata
-  COImageTag:  centos7-2.7
+  COImageTag:  centos7-3.0
diff --git a/examples/pgo.yaml.storageclass b/examples/pgo.yaml.storageclass
@@ -26,4 +26,4 @@ Pgo:
   LSPVCTemplate:  /config/pgo.lspvc-template.json
   LoadTemplate:  /config/pgo.load-template.json
   COImagePrefix:  crunchydata
-  COImageTag:  centos7-2.7
+  COImageTag:  centos7-3.0
diff --git a/examples/quickstart-for-gke.sh b/examples/quickstart-for-gke.sh
@@ -15,7 +15,7 @@
 
 LOG="pgo-installer.log"
 
-export PGORELEASE=2.7
+export PGORELEASE=3.0
 
 echo "Testing for dependencies..." | tee -a $LOG
 
@@ -57,7 +57,7 @@ export GOPATH=$HOME/odev
 export GOBIN=$GOPATH/bin
 export PATH=$PATH:$GOPATH/bin
 export CO_IMAGE_PREFIX=crunchydata
-export CO_IMAGE_TAG=centos7-2.7
+export CO_IMAGE_TAG=centos7-3.0
 export COROOT=$GOPATH/src/github.com/crunchydata/postgres-operator
 export CO_APISERVER_URL=https://127.0.0.1:18443
 export PGO_CA_CERT=$COROOT/conf/apiserver/server.crt
diff --git a/examples/quickstart-for-ocp.sh b/examples/quickstart-for-ocp.sh
@@ -15,7 +15,7 @@
 
 LOG="pgo-installer.log"
 
-export PGORELEASE=2.7
+export PGORELEASE=3.0
 
 echo "Testing for dependencies..." | tee -a $LOG
 
@@ -57,7 +57,7 @@ export GOPATH=$HOME/odev
 export GOBIN=$GOPATH/bin
 export PATH=$PATH:$GOPATH/bin
 export CO_IMAGE_PREFIX=crunchydata
-export CO_IMAGE_TAG=centos7-2.7
+export CO_IMAGE_TAG=centos7-3.0
 export COROOT=$GOPATH/src/github.com/crunchydata/postgres-operator
 export CO_APISERVER_URL=https://127.0.0.1:18443
 export PGO_CA_CERT=$COROOT/conf/apiserver/server.crt
diff --git a/examples/sample-json-load-config.yaml b/examples/sample-json-load-config.yaml
@@ -1,5 +1,5 @@
 COImagePrefix:  crunchydata
-COImageTag:  centos7-2.7-rc3
+COImageTag:  centos7-3.0
 DbDatabase:  userdb
 DbUser:  postgres
 DbPort:  5432
diff --git a/examples/sample-load-config.yaml b/examples/sample-load-config.yaml
@@ -1,5 +1,5 @@
 COImagePrefix:  crunchydata
-COImageTag:  centos7-2.7-rc1
+COImageTag:  centos7-3.0
 DbDatabase:  userdb
 DbUser:  postgres
 DbPort:  5432
diff --git a/golang-examples/config.go b/golang-examples/config.go
@@ -77,7 +77,7 @@ func main() {
 	thisconfig.PgoDef.LSPVCTemplate = "this lspvc template"
 	thisconfig.PgoDef.LoadTemplate = "loadtempaltepath"
 	thisconfig.PgoDef.COImagePrefix = "crunchydata"
-	thisconfig.PgoDef.COImageTag = "centos7-2.7"
+	thisconfig.PgoDef.COImageTag = "centos7-3.0"
 
 	//json.Unmarshal(buf, &c)
 
diff --git a/golang-examples/pgo.json b/golang-examples/pgo.json
@@ -53,6 +53,6 @@
         "LSPVCTemplate": "/config/pgo.lspvc-template.json",
         "LoadTemplate": "/config/pgo.load-template.json",
         "COImagePrefix": "crunchydata",
-        "COImageTag": "centos7-2.7"
+        "COImageTag": "centos7-3.0"
     }
 }
diff --git a/pgo/cmd/version.go b/pgo/cmd/version.go
@@ -26,7 +26,7 @@ import (
 	"os"
 )
 
-const ClientVersion = "2.7"
+const ClientVersion = "3.0"
 
 var versionCmd = &cobra.Command{
 	Use:   "version",
diff --git a/rhel7/Dockerfile.pgo-apiserver.rhel7 b/rhel7/Dockerfile.pgo-apiserver.rhel7
@@ -1,7 +1,7 @@
 FROM registry.access.redhat.com/rhel7
 
 
-LABEL Release="2.7" Vendor="Crunchy Data Solutions" 
+LABEL Release="3.0" Vendor="Crunchy Data Solutions" 
 
 ENV PGVERSION="9.6" PGDG_REPO="pgdg-centos96-9.6-3.noarch.rpm"
 
diff --git a/rhel7/Dockerfile.pgo-load.rhel7 b/rhel7/Dockerfile.pgo-load.rhel7
@@ -5,8 +5,8 @@ LABEL name="crunchydata/pgo-load" \
       	PostgresVersion="9.6" \
       	PostgresFullVersion="9.6.9" \
         version="7.3" \
-        release="2.7" \
-        build-date="2018-05-09" \
+        release="3.0" \
+        build-date="2018-05-14" \
         url="https://crunchydata.com" \
         summary="loads a CSV or json file into a database" \
         description="executed by the operator, loads a CSV or json file." \
diff --git a/rhel7/Dockerfile.pgo-lspvc.rhel7 b/rhel7/Dockerfile.pgo-lspvc.rhel7
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhel7
 
-LABEL Release="2.7" Vendor="Crunchy Data Solutions" 
+LABEL Release="3.0" Vendor="Crunchy Data Solutions" 
 
 RUN yum -y update && yum -y clean all
 
diff --git a/rhel7/Dockerfile.pgo-rmdata.rhel7 b/rhel7/Dockerfile.pgo-rmdata.rhel7
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhel7
 
-LABEL Release="2.7" Vendor="Crunchy Data Solutions" 
+LABEL Release="3.0" Vendor="Crunchy Data Solutions" 
 
 RUN yum -y update && yum -y clean all
 
diff --git a/rhel7/Dockerfile.postgres-operator.rhel7 b/rhel7/Dockerfile.postgres-operator.rhel7
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhel7
 
-LABEL Release="2.7" Vendor="Crunchy Data Solutions" 
+LABEL Release="3.0" Vendor="Crunchy Data Solutions" 
 
 ENV PGVERSION="9.6" PGDG_REPO="pgdg-centos96-9.6-3.noarch.rpm"
 

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ func Version() msgs.VersionResponse {`
`25`	`25`	`resp := msgs.VersionResponse{}`
`26`	`26`	`resp.Status.Code = msgs.Ok`
`27`	`27`	`resp.Status.Msg = "apiserver version"`
`28`		`- resp.Version = "2.7"`
	`28`	`+ resp.Version = "3.0"`
`29`	`29`
`30`	`30`	`return resp`
`31`	`31`	`}`