Merge pull request #23 from cybertec-postgresql/v0.7.0-build-fixes

V0.7.0 build fixes

Makefile

@@ -1,6 +1,6 @@
 .PHONY: clean local test linux macos mocks docker push e2e
 
-BINARY ?= postgres-operator
+BINARY ?= cybertec-pg-operator
 BUILD_FLAGS ?= -v
 CGO_ENABLED ?= 0
 ifeq ($(RACE),1)
@@ -12,7 +12,7 @@ LOCAL_BUILD_FLAGS ?= $(BUILD_FLAGS)
 LDFLAGS ?= -X=main.version=$(VERSION)
 DOCKERDIR = docker
 
-IMAGE ?= registry.opensource.zalan.do/acid/$(BINARY)
+IMAGE ?= docker.io/cybertecpostgresql/$(BINARY)
 TAG ?= $(VERSION)
 GITHEAD = $(shell git rev-parse --short HEAD)
 GITURL = $(shell git config --get remote.origin.url)

hack/update-codegen.sh

@@ -5,7 +5,7 @@ set -o nounset
 set -o pipefail
 
 GENERATED_PACKAGE_ROOT="github.com"
-OPERATOR_PACKAGE_ROOT="${GENERATED_PACKAGE_ROOT}/zalando/postgres-operator"
+OPERATOR_PACKAGE_ROOT="${GENERATED_PACKAGE_ROOT}/cybertec-postgresql/cybertec-pg-operator"
 SCRIPT_ROOT=$(dirname ${BASH_SOURCE})/..
 TARGET_CODE_DIR=${1-${SCRIPT_ROOT}/pkg}
 CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo "${GOPATH}"/src/k8s.io/code-generator)}

pkg/apis/cpo.opensource.cybertec.at/register.go

@@ -1,4 +1,4 @@
-package acidzalando
+package cpoopensourcecybertecat
 
 const (
 	// GroupName is the group name for the operator CRDs

pkg/cluster/cluster.go

@@ -13,7 +13,7 @@ import (
 	"sync"
 	"time"
 
-	acidv1 "github.com/cybertec-postgresql/cybertec-pg-operator/pkg/apis/cpo.opensource.cybertec.at/v1"
+	cpov1 "github.com/cybertec-postgresql/cybertec-pg-operator/pkg/apis/cpo.opensource.cybertec.at/v1"
 	"github.com/sirupsen/logrus"
 
 	"github.com/cybertec-postgresql/cybertec-pg-operator/pkg/generated/clientset/versioned/scheme"
@@ -69,7 +69,7 @@ type kubeResources struct {
 // Cluster describes postgresql cluster
 type Cluster struct {
 	kubeResources
-	acidv1.Postgresql
+	cpov1.Postgresql
 	Config
 	logger           *logrus.Entry
 	eventRecorder    record.EventRecorder
@@ -106,7 +106,7 @@ type compareStatefulsetResult struct {
 }
 
 // New creates a new cluster. This function should be called from a controller.
-func New(cfg Config, kubeClient k8sutil.KubernetesClient, pgSpec acidv1.Postgresql, logger *logrus.Entry, eventRecorder record.EventRecorder) *Cluster {
+func New(cfg Config, kubeClient k8sutil.KubernetesClient, pgSpec cpov1.Postgresql, logger *logrus.Entry, eventRecorder record.EventRecorder) *Cluster {
 	deletePropagationPolicy := metav1.DeletePropagationOrphan
 
 	podEventsQueue := cache.NewFIFO(func(obj interface{}) (string, error) {
@@ -122,11 +122,11 @@ func New(cfg Config, kubeClient k8sutil.KubernetesClient, pgSpec acidv1.Postgres
 		passwordEncryption = "scram-sha-256"
 	}
 	if pgSpec.Spec.Monitoring != nil {
-		flg := acidv1.UserFlags{constants.RoleFlagLogin}
+		flg := cpov1.UserFlags{constants.RoleFlagLogin}
 		if pgSpec.Spec.Users != nil {
 			pgSpec.Spec.Users[monitorUsername] = flg
 		} else {
-			users := make(map[string]acidv1.UserFlags)
+			users := make(map[string]cpov1.UserFlags)
 			pgSpec.Spec.Users = users
 			pgSpec.Spec.Users[monitorUsername] = flg
 		}
@@ -262,13 +262,13 @@ func (c *Cluster) Create() (err error) {
 
 	defer func() {
 		if err == nil {
-			c.KubeClient.SetPostgresCRDStatus(c.clusterName(), acidv1.ClusterStatusRunning) //TODO: are you sure it's running?
+			c.KubeClient.SetPostgresCRDStatus(c.clusterName(), cpov1.ClusterStatusRunning) //TODO: are you sure it's running?
 		} else {
-			c.KubeClient.SetPostgresCRDStatus(c.clusterName(), acidv1.ClusterStatusAddFailed)
+			c.KubeClient.SetPostgresCRDStatus(c.clusterName(), cpov1.ClusterStatusAddFailed)
 		}
 	}()
 
-	c.KubeClient.SetPostgresCRDStatus(c.clusterName(), acidv1.ClusterStatusCreating)
+	c.KubeClient.SetPostgresCRDStatus(c.clusterName(), cpov1.ClusterStatusCreating)
 	c.eventRecorder.Event(c.GetReference(), v1.EventTypeNormal, "Create", "Started creation of new cluster resources")
 
 	for _, role := range []PostgresRole{Master, Replica} {
@@ -852,22 +852,22 @@ func (c *Cluster) compareServices(old, new *v1.Service) (bool, string) {
 // (i.e. service) is treated as an error
 // logical backup cron jobs are an exception: a user-initiated Update can enable a logical backup job
 // for a cluster that had no such job before. In this case a missing job is not an error.
-func (c *Cluster) Update(oldSpec, newSpec *acidv1.Postgresql) error {
+func (c *Cluster) Update(oldSpec, newSpec *cpov1.Postgresql) error {
 	updateFailed := false
 	userInitFailed := false
 	syncStatefulSet := false
 
 	c.mu.Lock()
 	defer c.mu.Unlock()
 
-	c.KubeClient.SetPostgresCRDStatus(c.clusterName(), acidv1.ClusterStatusUpdating)
+	c.KubeClient.SetPostgresCRDStatus(c.clusterName(), cpov1.ClusterStatusUpdating)
 	c.setSpec(newSpec)
 
 	defer func() {
 		if updateFailed {
-			c.KubeClient.SetPostgresCRDStatus(c.clusterName(), acidv1.ClusterStatusUpdateFailed)
+			c.KubeClient.SetPostgresCRDStatus(c.clusterName(), cpov1.ClusterStatusUpdateFailed)
 		} else {
-			c.KubeClient.SetPostgresCRDStatus(c.clusterName(), acidv1.ClusterStatusRunning)
+			c.KubeClient.SetPostgresCRDStatus(c.clusterName(), cpov1.ClusterStatusRunning)
 		}
 	}()
 
@@ -1215,7 +1215,7 @@ func (c *Cluster) Delete() {
 }
 
 // NeedsRepair returns true if the cluster should be included in the repair scan (based on its in-memory status).
-func (c *Cluster) NeedsRepair() (bool, acidv1.PostgresStatus) {
+func (c *Cluster) NeedsRepair() (bool, cpov1.PostgresStatus) {
 	c.specMu.RLock()
 	defer c.specMu.RUnlock()
 	return !c.Status.Success(), c.Status
@@ -1330,7 +1330,7 @@ func (c *Cluster) initSystemUsers() {
 func (c *Cluster) initPreparedDatabaseRoles() error {
 
 	if c.Spec.PreparedDatabases != nil && len(c.Spec.PreparedDatabases) == 0 { // TODO: add option to disable creating such a default DB
-		c.Spec.PreparedDatabases = map[string]acidv1.PreparedDatabase{strings.Replace(c.Name, "-", "_", -1): {}}
+		c.Spec.PreparedDatabases = map[string]cpov1.PreparedDatabase{strings.Replace(c.Name, "-", "_", -1): {}}
 	}
 
 	// create maps with default roles/users as keys and their membership as values
@@ -1349,7 +1349,7 @@ func (c *Cluster) initPreparedDatabaseRoles() error {
 		// get list of prepared schemas to set in search_path
 		preparedSchemas := preparedDB.PreparedSchemas
 		if len(preparedDB.PreparedSchemas) == 0 {
-			preparedSchemas = map[string]acidv1.PreparedSchema{"data": {DefaultRoles: util.True()}}
+			preparedSchemas = map[string]cpov1.PreparedSchema{"data": {DefaultRoles: util.True()}}
 		}
 
 		var searchPath strings.Builder