update pgo.yaml

Author: jmccormick2001

ansible/README.md

@@ -4,7 +4,7 @@
   <img src="crunchy_logo.png?raw=false" alt="Mr. Crunchy" width="150"/>
 </p>
 
-Latest Release: 4.0.0-rc11
+Latest Release: 4.0.0-rc12
 
 ## General
 

ansible/inventory

@@ -47,15 +47,15 @@ namespace='pgo'
 # 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_tag='centos7-11.3-2.4.0-rc8'
+ccp_image_tag='centos7-11.3-2.4.0-rc9'
 
 # Crunchy PostgreSQL Operator images to use.  The tags centos7 and rhel7 are acceptable.
 pgo_image_prefix='crunchydata'
-pgo_image_tag='centos7-4.0.0-rc11'
+pgo_image_tag='centos7-4.0.0-rc12'
 
 # PGO Client Install
 pgo_client_install='true'
-pgo_client_version='4.0.0-rc11'
+pgo_client_version='4.0.0-rc12'
 
 # PGO TLS
 pgo_tls_no_verify='false'

ansible/roles/pgo-operator/files/pgo-configs/collect.json

@@ -4,9 +4,6 @@
     "ports": [{
         "containerPort": 9187,
         "protocol": "TCP"
-    }, {
-        "containerPort": 9100,
-        "protocol": "TCP"
     }],
     "env": [{
         "name": "DATA_SOURCE_NAME",

apiserver.go

@@ -88,11 +88,11 @@ func main() {
 	r.HandleFunc("/version", versionservice.VersionHandler)
 	r.HandleFunc("/health", versionservice.HealthHandler)
 	r.HandleFunc("/policies", policyservice.CreatePolicyHandler)
-	r.HandleFunc("/policies/{name}", policyservice.ShowPolicyHandler).Methods("GET")
+	r.HandleFunc("/showpolicies", policyservice.ShowPolicyHandler).Methods("POST")
 	//here
-	r.HandleFunc("/policiesdelete/{name}", policyservice.DeletePolicyHandler).Methods("GET")
+	r.HandleFunc("/policiesdelete", policyservice.DeletePolicyHandler).Methods("POST")
 	r.HandleFunc("/workflow/{id}", workflowservice.ShowWorkflowHandler).Methods("GET")
-	r.HandleFunc("/pvc/{pvcname}", pvcservice.ShowPVCHandler).Methods("GET")
+	r.HandleFunc("/showpvc", pvcservice.ShowPVCHandler).Methods("POST")
 	r.HandleFunc("/policies/apply", policyservice.ApplyPolicyHandler).Methods("POST")
 	r.HandleFunc("/label", labelservice.LabelHandler).Methods("POST")
 	r.HandleFunc("/labeldelete", labelservice.DeleteLabelHandler).Methods("POST")
@@ -104,9 +104,9 @@ func main() {
 	r.HandleFunc("/usersdelete/{name}", userservice.DeleteUserHandler).Methods("GET")
 	r.HandleFunc("/upgrades", upgradeservice.CreateUpgradeHandler).Methods("POST")
 	r.HandleFunc("/clusters", clusterservice.CreateClusterHandler).Methods("POST")
-	r.HandleFunc("/clusters/{name}", clusterservice.ShowClusterHandler).Methods("GET")
+	r.HandleFunc("/showclusters", clusterservice.ShowClusterHandler).Methods("POST")
 	//here
-	r.HandleFunc("/clustersdelete/{name}", clusterservice.DeleteClusterHandler).Methods("GET")
+	r.HandleFunc("/clustersdelete", clusterservice.DeleteClusterHandler).Methods("POST")
 	r.HandleFunc("/clustersupdate/{name}", clusterservice.UpdateClusterHandler).Methods("GET")
 	r.HandleFunc("/clusters/test/{name}", clusterservice.TestClusterHandler)
 	r.HandleFunc("/clusters/scale/{name}", clusterservice.ScaleClusterHandler)

apiserver/backrestservice/backrestimpl.go

@@ -23,7 +23,6 @@ import (
 	"time"
 
 	"github.com/crunchydata/postgres-operator/apiserver/backupoptions"
-	"github.com/crunchydata/postgres-operator/operator"
 
 	crv1 "github.com/crunchydata/postgres-operator/apis/cr/v1"
 	"github.com/crunchydata/postgres-operator/apiserver"
@@ -367,26 +366,28 @@ func getInfo(clusterName, storageType, podname, ns string) (string, error) {
 	cmd = append(cmd, backrestInfoCommand)
 
 	log.Debugf("command is %v ", cmd)
-	output, stderr, err := kubeapi.ExecToPodThroughAPI(apiserver.RESTConfig, apiserver.Clientset, cmd, containername, podname, ns, nil)
-
-	if err != nil {
-		log.Error(err, stderr)
-		return "", err
+	
+	var output string
+	if storageType != "s3" { 
+		outputLocal, stderr, err := kubeapi.ExecToPodThroughAPI(apiserver.RESTConfig, apiserver.Clientset, cmd, containername, podname, ns, nil)
+		if err != nil {
+			log.Error(err, stderr)
+			return "", err
+		}
+		output = "\nStorage Type: local\n" + outputLocal
 	}
-
-	if operator.IsLocalAndS3Storage(storageType) {
+	
+	if strings.Contains(storageType, "s3") {
 		cmd = append(cmd, repoTypeFlagS3)
 		outputS3, stderr, err := kubeapi.ExecToPodThroughAPI(apiserver.RESTConfig, apiserver.Clientset, cmd, containername, podname, ns, nil)
 		if err != nil {
 			log.Error(err, stderr)
 			return "", err
 		}
-
-		output = "\nStorage Type: local\n" + output + "\nStorage Type: s3\n" + outputS3
-	}
+		output = output + "\nStorage Type: s3\n" + outputS3
+	} 
 
 	log.Debug("output=[" + output + "]")
-	log.Debug("stderr=[" + stderr + "]")
 
 	log.Debug("backrest info ends")
 	return output, err

apiserver/clusterservice/clusterimpl.go

@@ -109,20 +109,23 @@ func DeleteCluster(name, selector string, deleteData, deleteBackups bool, ns str
 }
 
 // ShowCluster ...
-func ShowCluster(name, selector, ccpimagetag, ns string) msgs.ShowClusterResponse {
+func ShowCluster(name, selector, ccpimagetag, ns, allflag string) msgs.ShowClusterResponse {
 	var err error
 
 	response := msgs.ShowClusterResponse{}
 	response.Status = msgs.Status{Code: msgs.Ok, Msg: ""}
 	response.Results = make([]msgs.ShowClusterDetail, 0)
 
-	if selector == "" && name == "all" {
+	if selector == "" && allflag == "true" {
+		log.Debugf("allflags set to true")
 	} else {
 		if selector == "" {
 			selector = "name=" + name
 		}
 	}
 
+	log.Debugf("selector on showCluster is %s", selector)
+
 	clusterList := crv1.PgclusterList{}
 
 	//get a list of all clusters

apiserver/clusterservice/clusterservice.go

@@ -18,7 +18,7 @@ limitations under the License.
 import (
 	"encoding/json"
 	"net/http"
-	"strconv"
+	//	"strconv"
 
 	"github.com/crunchydata/postgres-operator/apiserver"
 	msgs "github.com/crunchydata/postgres-operator/apiservermsgs"
@@ -85,17 +85,20 @@ func CreateClusterHandler(w http.ResponseWriter, r *http.Request) {
 // returns a ShowClusterResponse
 func ShowClusterHandler(w http.ResponseWriter, r *http.Request) {
 	var ns string
-	vars := mux.Vars(r)
-	log.Debugf("clusterservice.ShowClusterHandler %v\n", vars)
 
-	clustername := vars["name"]
+	var request msgs.ShowClusterRequest
+	_ = json.NewDecoder(r.Body).Decode(&request)
 
-	selector := r.URL.Query().Get("selector")
-	ccpimagetag := r.URL.Query().Get("ccpimagetag")
-	clientVersion := r.URL.Query().Get("version")
-	namespace := r.URL.Query().Get("namespace")
+	log.Debugf("clusterservice.ShowClusterHandler %v\n", request)
+	clustername := request.Clustername
 
-	log.Debugf("ShowClusterHandler: parameters name [%s] selector [%s] ccpimagetag [%s] version [%s] namespace [%s]", clustername, selector, ccpimagetag, clientVersion, namespace)
+	selector := request.Selector
+	ccpimagetag := request.Ccpimagetag
+	clientVersion := request.ClientVersion
+	namespace := request.Namespace
+	allflag := request.Allflag
+
+	log.Debugf("ShowClusterHandler: parameters name [%s] selector [%s] ccpimagetag [%s] version [%s] namespace [%s] allflag [%s]", clustername, selector, ccpimagetag, clientVersion, namespace, allflag)
 
 	username, err := apiserver.Authn(apiserver.SHOW_CLUSTER_PERM, w, r)
 	if err != nil {
@@ -126,7 +129,7 @@ func ShowClusterHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	resp = ShowCluster(clustername, selector, ccpimagetag, ns)
+	resp = ShowCluster(clustername, selector, ccpimagetag, ns, allflag)
 	json.NewEncoder(w).Encode(resp)
 
 }
@@ -138,28 +141,22 @@ func ShowClusterHandler(w http.ResponseWriter, r *http.Request) {
 // parameters postgresversion
 // returns a ShowClusterResponse
 func DeleteClusterHandler(w http.ResponseWriter, r *http.Request) {
+	var request msgs.DeleteClusterRequest
+	_ = json.NewDecoder(r.Body).Decode(&request)
+
 	var ns string
-	vars := mux.Vars(r)
-	log.Debugf("clusterservice.DeleteClusterHandler %v\n", vars)
+	log.Debugf("clusterservice.DeleteClusterHandler %v\n", request)
 
-	clustername := vars["name"]
+	clustername := request.Clustername
 
-	selector := r.URL.Query().Get("selector")
-	clientVersion := r.URL.Query().Get("version")
-	namespace := r.URL.Query().Get("namespace")
+	selector := request.Selector
+	clientVersion := request.ClientVersion
+	namespace := request.Namespace
 
-	deleteData := false
-	deleteDataStr := r.URL.Query().Get("delete-data")
-	if deleteDataStr != "" {
-		deleteData, _ = strconv.ParseBool(deleteDataStr)
-	}
-	deleteBackups := false
-	deleteBackupsStr := r.URL.Query().Get("delete-backups")
-	if deleteBackupsStr != "" {
-		deleteBackups, _ = strconv.ParseBool(deleteBackupsStr)
-	}
+	deleteData := request.DeleteData
+	deleteBackups := request.DeleteBackups
 
-	log.Debugf("DeleteClusterHandler: parameters namespace [%s] selector [%s] delete-data [%s] delete-backups [%s]", namespace, selector, clientVersion, deleteDataStr, deleteBackupsStr)
+	log.Debugf("DeleteClusterHandler: parameters namespace [%s] selector [%s] delete-data [%t] delete-backups [%t]", namespace, selector, clientVersion, deleteData, deleteBackups)
 
 	username, err := apiserver.Authn(apiserver.DELETE_CLUSTER_PERM, w, r)
 	if err != nil {

apiserver/common.go

@@ -33,7 +33,7 @@ var backrestStorageTypes = []string{"local", "s3"}
 func GetSecrets(cluster *crv1.Pgcluster, ns string) ([]msgs.ShowUserSecret, error) {
 
 	output := make([]msgs.ShowUserSecret, 0)
-	selector := config.LABEL_PGBOUNCER + "!=true," + config.LABEL_PGPOOL + "!=true," + config.LABEL_PG_CLUSTER + "=" + cluster.Spec.Name
+	selector := "!" + config.LABEL_PGO_BACKREST_REPO + "," + config.LABEL_PGBOUNCER + "!=true," + config.LABEL_PGPOOL + "!=true," + config.LABEL_PG_CLUSTER + "=" + cluster.Spec.Name
 
 	secrets, err := kubeapi.GetSecrets(Clientset, selector, ns)
 	if err != nil {

apiserver/policyservice/policyimpl.go

@@ -74,10 +74,10 @@ func CreatePolicy(RESTClient *rest.RESTClient, policyName, policyURL, policyFile
 }
 
 // ShowPolicy ...
-func ShowPolicy(RESTClient *rest.RESTClient, name, ns string) crv1.PgpolicyList {
+func ShowPolicy(RESTClient *rest.RESTClient, name, allflags, ns string) crv1.PgpolicyList {
 	policyList := crv1.PgpolicyList{}
 
-	if name == "all" {
+	if allflags == "true" {
 		//get a list of all policies
 		err := kubeapi.Getpgpolicies(RESTClient,
 			&policyList,

apiserver/policyservice/policyservice.go

@@ -19,7 +19,6 @@ import (
 	"encoding/json"
 	apiserver "github.com/crunchydata/postgres-operator/apiserver"
 	msgs "github.com/crunchydata/postgres-operator/apiservermsgs"
-	"github.com/gorilla/mux"
 	log "github.com/sirupsen/logrus"
 	"k8s.io/apimachinery/pkg/util/validation"
 	"net/http"
@@ -85,11 +84,13 @@ func CreatePolicyHandler(w http.ResponseWriter, r *http.Request) {
 // returns a DeletePolicyResponse
 func DeletePolicyHandler(w http.ResponseWriter, r *http.Request) {
 	var ns string
-	vars := mux.Vars(r)
 
-	policyname := vars["name"]
-	clientVersion := r.URL.Query().Get("version")
-	namespace := r.URL.Query().Get("namespace")
+	var request msgs.DeletePolicyRequest
+	_ = json.NewDecoder(r.Body).Decode(&request)
+
+	policyname := request.PolicyName
+	clientVersion := request.ClientVersion
+	namespace := request.Namespace
 
 	log.Debugf("DeletePolicyHandler parameters version [%s] name [%s] namespace [%s]", clientVersion, policyname, namespace)
 
@@ -132,12 +133,13 @@ func DeletePolicyHandler(w http.ResponseWriter, r *http.Request) {
 func ShowPolicyHandler(w http.ResponseWriter, r *http.Request) {
 	var ns string
 
-	vars := mux.Vars(r)
+	var request msgs.ShowPolicyRequest
+	_ = json.NewDecoder(r.Body).Decode(&request)
 
-	policyname := vars["name"]
+	policyname := request.Policyname
 
-	clientVersion := r.URL.Query().Get("version")
-	namespace := r.URL.Query().Get("namespace")
+	clientVersion := request.ClientVersion
+	namespace := request.Namespace
 
 	log.Debugf("ShowPolicyHandler parameters version [%s] namespace [%s] name [%s]", clientVersion, namespace, policyname)
 
@@ -150,7 +152,7 @@ func ShowPolicyHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	log.Debug("policyservice.ShowPolicyHandler GET called")
+	log.Debug("policyservice.ShowPolicyHandler POST called")
 	resp := msgs.ShowPolicyResponse{}
 	resp.Status.Code = msgs.Ok
 	resp.Status.Msg = ""
@@ -170,7 +172,7 @@ func ShowPolicyHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	resp.PolicyList = ShowPolicy(apiserver.RESTClient, policyname, ns)
+	resp.PolicyList = ShowPolicy(apiserver.RESTClient, policyname, request.Allflag, ns)
 
 	json.NewEncoder(w).Encode(resp)