fix merge pre26 conflicts

Author: Jeff McCormick

Makefile

@@ -65,14 +65,17 @@ apiserverimage:	check-go-vars
 	docker build -t pgo-apiserver -f $(CO_BASEOS)/Dockerfile.pgo-apiserver.$(CO_BASEOS) .
 	docker tag pgo-apiserver $(CO_IMAGE_PREFIX)/pgo-apiserver:$(CO_BASEOS)-$(CO_VERSION)
 #	docker push $(CO_IMAGE_PREFIX)/pgo-apiserver:$(CO_IMAGE_TAG)
-postgres-operator:	check-go-vars
+operator:	check-go-vars
 	go install postgres-operator.go
 operatorimage:	check-go-vars
 	go install postgres-operator.go
 	cp $(GOBIN)/postgres-operator bin/postgres-operator/
 	docker build -t postgres-operator -f $(CO_BASEOS)/Dockerfile.postgres-operator.$(CO_BASEOS) .
 	docker tag postgres-operator $(CO_IMAGE_PREFIX)/postgres-operator:$(CO_BASEOS)-$(CO_VERSION)
 #	docker push $(CO_IMAGE_PREFIX)/postgres-operator:$(CO_IMAGE_TAG)
+deepsix:
+	cd $(COROOT)/apis/cr/v1
+	deepcopy-gen --go-header-file=$(COROOT)/apis/cr/v1/header.go.txt --input-dirs=.
 lsimage:
 	docker build -t pgo-lspvc -f $(CO_BASEOS)/Dockerfile.pgo-lspvc.$(CO_BASEOS) .
 	docker tag pgo-lspvc $(CO_IMAGE_PREFIX)/pgo-lspvc:$(CO_BASEOS)-$(CO_VERSION)

README.asciidoc

@@ -1,6 +1,6 @@
 = PostgreSQL Operator
 :toc:
-v2.5, {docdate}
+v2.6, {docdate}
 
 == Overview
 
@@ -13,6 +13,7 @@ image::docs/tty.gif?raw=true[]
 The PostgreSQL Operator leverages Kubernetes Custom Resource Definitions to define custom resource types such as:
 
  * *pgcluster*
+ * *pgreplica*
  * *pgbackups*
  * *pgpolicies*
 

apis/cr/v1/backup.go

@@ -1,7 +1,7 @@
 package v1
 
 /*
- Copyright 2018 Crunchy Data Solutions, Inc.
+ Copyright 2017-2018 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

apis/cr/v1/cluster.go

@@ -1,7 +1,7 @@
 package v1
 
 /*
- Copyright 2018 Crunchy Data Solutions, Inc.
+ Copyright 2017-2018 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
@@ -33,32 +33,33 @@ type Pgcluster struct {
 
 // PgclusterSpec ...
 type PgclusterSpec struct {
-	Name              string            `json:"name"`
-	ClusterName       string            `json:"clustername"`
-	Policies          string            `json:"policies"`
-	CCPImageTag       string            `json:"ccpimagetag"`
-	Port              string            `json:"port"`
-	NodeName          string            `json:"nodename"`
-	PrimaryStorage    PgStorageSpec     `json:primarystorage`
-	ReplicaStorage    PgStorageSpec     `json:replicastorage`
-	PrimaryHost       string            `json:"primaryhost"`
-	PrimaryPassword   string            `json:"primarypassword"`
-	User              string            `json:"user"`
-	Password          string            `json:"password"`
-	Database          string            `json:"database"`
-	RootPassword      string            `json:"rootpassword"`
-	Replicas          string            `json:"replicas"`
-	Strategy          string            `json:"strategy"`
-	SecretFrom        string            `json:"secretfrom"`
-	BackupPVCName     string            `json:"backuppvcname"`
-	BackupPath        string            `json:"backuppath"`
-	UserSecretName    string            `json:"usersecretname"`
-	RootSecretName    string            `json:"rootsecretname"`
-	PrimarySecretName string            `json:"primarysecretname"`
-	Status            string            `json:"status"`
-	PswLastUpdate     string            `json:"pswlastupdate"`
-	CustomConfig      string            `json:"customconfig"`
-	UserLabels        map[string]string `json:"userlabels"`
+	Name               string               `json:"name"`
+	ClusterName        string               `json:"clustername"`
+	Policies           string               `json:"policies"`
+	CCPImageTag        string               `json:"ccpimagetag"`
+	Port               string               `json:"port"`
+	NodeName           string               `json:"nodename"`
+	PrimaryStorage     PgStorageSpec        `json:primarystorage`
+	ReplicaStorage     PgStorageSpec        `json:replicastorage`
+	ContainerResources PgContainerResources `json:containerresources`
+	PrimaryHost        string               `json:"primaryhost"`
+	PrimaryPassword    string               `json:"primarypassword"`
+	User               string               `json:"user"`
+	Password           string               `json:"password"`
+	Database           string               `json:"database"`
+	RootPassword       string               `json:"rootpassword"`
+	Replicas           string               `json:"replicas"`
+	Strategy           string               `json:"strategy"`
+	SecretFrom         string               `json:"secretfrom"`
+	BackupPVCName      string               `json:"backuppvcname"`
+	BackupPath         string               `json:"backuppath"`
+	UserSecretName     string               `json:"usersecretname"`
+	RootSecretName     string               `json:"rootsecretname"`
+	PrimarySecretName  string               `json:"primarysecretname"`
+	Status             string               `json:"status"`
+	PswLastUpdate      string               `json:"pswlastupdate"`
+	CustomConfig       string               `json:"customconfig"`
+	UserLabels         map[string]string    `json:"userlabels"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

apis/cr/v1/common.go

@@ -1,7 +1,7 @@
 package v1
 
 /*
-Copyright 2018 Crunchy Data Solutions, Inc.
+Copyright 2017-2018 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
@@ -48,3 +48,11 @@ type PgStorageSpec struct {
 	Fsgroup            string `json:"fsgroup"`
 	SupplementalGroups string `json:"supplementalgroups"`
 }
+
+// PgContainerResource ...
+type PgContainerResources struct {
+	RequestsMemory string `json:"requestsmemory"`
+	RequestsCPU    string `json:"requestscpu"`
+	LimitsMemory   string `json:"limitsmemory"`
+	LimitsCPU      string `json:"limitscpu"`
+}