Remove the "ContainerResources" configuration

This is now replaced with the one-off settings that are available
in the PostgreSQL Operator. It is still possible to achieve similar
behavior by modifying the various Job / Pod templates that are
deployed in the "pgo-config" ConfigMap. However, this helps the
Operator to do things in a more Kubernetes standard way.

Author: Jonathan S. Katz

apis/crunchydata.com/v1/common.go

@@ -122,15 +122,6 @@ func (s PgStorageSpec) GetSupplementalGroups() []int64 {
 	return supplementalGroups
 }
 
-// PgContainerResource ...
-// swagger:ignore
-type PgContainerResources struct {
-	RequestsMemory string `json:"requestsmemory"`
-	RequestsCPU    string `json:"requestscpu"`
-	LimitsMemory   string `json:"limitsmemory"`
-	LimitsCPU      string `json:"limitscpu"`
-}
-
 // CompletedStatus -
 const CompletedStatus = "completed"
 

apis/crunchydata.com/v1/zz_generated.deepcopy.go

@@ -730,14 +730,6 @@ func CreateCluster(request *msgs.CreateClusterRequest, ns, pgouser string) msgs.
 		}
 	}
 
-	if request.ContainerResources != "" {
-		if apiserver.IsValidContainerResource(request.ContainerResources) == false {
-			resp.Status.Code = msgs.Error
-			resp.Status.Msg = request.ContainerResources + " ContainerResource config was not found "
-			return resp
-		}
-	}
-
 	// if a value is provided in the request for PodAntiAffinity, then ensure is valid.  If
 	// it is, then set the user label for pod anti-affinity to the request value
 	// (which in turn becomes a *Label* which is important for anti-affinity).

apiserver/clusterservice/clusterimpl.go

@@ -60,11 +60,6 @@ func ScaleClusterHandler(w http.ResponseWriter, r *http.Request) {
 	//    in: "path"
 	//    type: "int"
 	//    required: true
-	//  - name: "resources-config"
-	//    description: "The name of a container resource configuration in pgo.yaml that holds CPU and memory requests and limits."
-	//    in: "path"
-	//    type: "string"
-	//    required: false
 	//  - name: "storage-config"
 	//    description: "The service type to use in the replica Service. If not set, the default in pgo.yaml will be used."
 	//    in: "path"

apiserver/clusterservice/scaleservice.go

@@ -38,26 +38,20 @@ import (
 )
 
 type loadJobTemplateFields struct {
-	Name               string
-	PGOImagePrefix     string
-	PGOImageTag        string
-	DbHost             string
-	DbDatabase         string
-	DbUser             string
-	DbPass             string
-	DbPort             string
-	TableToLoad        string
-	FilePath           string
-	FileType           string
-	PVCName            string
-	SecurityContext    string
-	ContainerResources string
-	PGUserSecret       string
-}
-
-type containerResourcesTemplateFields struct {
-	RequestsMemory, RequestsCPU string
-	LimitsMemory, LimitsCPU     string
+	Name            string
+	PGOImagePrefix  string
+	PGOImageTag     string
+	DbHost          string
+	DbDatabase      string
+	DbUser          string
+	DbPass          string
+	DbPort          string
+	TableToLoad     string
+	FilePath        string
+	FileType        string
+	PVCName         string
+	SecurityContext string
+	PGUserSecret    string
 }
 
 // LoadConfig ...
@@ -107,7 +101,6 @@ func Load(request *msgs.LoadRequest, ns, pgouser string) msgs.LoadResponse {
 	LoadConfigTemplate.FileType = LoadCfg.FileType
 	LoadConfigTemplate.PVCName = LoadCfg.PVCName
 	LoadConfigTemplate.SecurityContext = operutil.GetPodSecurityContext(supplementalGroups)
-	LoadConfigTemplate.ContainerResources = ""
 
 	clusterList := crv1.PgclusterList{}
 	if len(request.Args) == 0 && request.Selector == "" {

apiserver/loadservice/loadimpl.go

@@ -33,7 +33,6 @@ import (
 	"github.com/crunchydata/postgres-operator/tlsutil"
 	log "github.com/sirupsen/logrus"
 	v1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 )
@@ -84,11 +83,6 @@ type CredentialDetail struct {
 
 var Pgo config.PgoConfig
 
-type containerResourcesTemplateFields struct {
-	RequestsMemory, RequestsCPU string
-	LimitsMemory, LimitsCPU     string
-}
-
 func Initialize() {
 
 	PgoNamespace = os.Getenv("PGO_OPERATOR_NAMESPACE")
@@ -185,12 +179,6 @@ func initConfig() {
 		log.Error("Storage Settings are not defined correctly, can't continue")
 		os.Exit(2)
 	}
-
-	if !validContainerResourcesSettings() {
-		log.Error("Container Resources settings are not defined correctly, can't continue")
-		os.Exit(2)
-	}
-
 }
 
 func BasicAuthCheck(username, password string) bool {
@@ -347,17 +335,6 @@ func Authn(perm string, w http.ResponseWriter, r *http.Request) (string, error)
 
 }
 
-func validContainerResourcesSettings() bool {
-	log.Infof("ContainerResources has %d definitions", len(Pgo.ContainerResources))
-
-	//validate any Container Resources in pgo.yaml for correct formats
-	if !IsValidContainerResourceValues() {
-		return false
-	}
-
-	return true
-}
-
 func validStorageSettings() bool {
 	log.Infof("Storage has %d definitions", len(Pgo.Storage))
 
@@ -387,11 +364,6 @@ func validStorageSettings() bool {
 
 }
 
-func IsValidContainerResource(name string) bool {
-	_, ok := Pgo.ContainerResources[name]
-	return ok
-}
-
 func IsValidStorageName(name string) bool {
 	_, ok := Pgo.Storage[name]
 	return ok
@@ -408,37 +380,6 @@ func ValidateNodeLabel(nodeLabel string) error {
 	return nil
 }
 
-func IsValidContainerResourceValues() bool {
-
-	var err error
-
-	for k, v := range Pgo.ContainerResources {
-		log.Infof("Container Resources %s [%v]", k, v)
-		resources, _ := Pgo.GetContainerResource(k)
-		_, err = resource.ParseQuantity(resources.RequestsMemory)
-		if err != nil {
-			log.Errorf("%s.RequestsMemory value invalid format", k)
-			return false
-		}
-		_, err = resource.ParseQuantity(resources.RequestsCPU)
-		if err != nil {
-			log.Errorf("%s.RequestsCPU value invalid format", k)
-			return false
-		}
-		_, err = resource.ParseQuantity(resources.LimitsMemory)
-		if err != nil {
-			log.Errorf("%s.LimitsMemory value invalid format", k)
-			return false
-		}
-		_, err = resource.ParseQuantity(resources.LimitsCPU)
-		if err != nil {
-			log.Errorf("%s.LimitsCPU value invalid format", k)
-			return false
-		}
-	}
-	return true
-}
-
 func validateWithKube() {
 	log.Debug("validateWithKube called")
 

apiserver/root.go

@@ -69,7 +69,6 @@ type CreateClusterRequest struct {
 	CustomConfig         string
 	StorageConfig        string
 	ReplicaStorageConfig string
-	ContainerResources   string
 	// Version of API client
 	// required: true
 	ClientVersion             string

apiservermsgs/clustermsgs.go

@@ -13,7 +13,6 @@
                     "initialDelaySeconds": 20,
                     "periodSeconds": 10
                 },
-                {{.ContainerResources }}
                 "env": [ {
                     "name": "BADGER_TARGET",
                     "value": "{{.BadgerTarget}}"

conf/postgres-operator/pgbadger.json

@@ -42,7 +42,6 @@
                                 "readOnly": false
                             }
                         ],
-                        {{.ContainerResources}}
                         "env": [
                             {
                                 "name": "PGDUMP_HOST",

conf/postgres-operator/pgdump-job.json

@@ -32,9 +32,6 @@
                         "name": "pgdata",
                         "readOnly": true
                     }],
-
-                    {{.ContainerResources }}
-
                     "env": [{
                         "name": "TABLE_TO_LOAD",
                         "value": "{{.TableToLoad}}"