From 585fd07c43dc69d14921d3be4c48c6ef652f960b Mon Sep 17 00:00:00 2001
From: Felix Kunde <felix-kunde@gmx.de>
Date: Fri, 4 Mar 2022 11:03:35 +0100
Subject: [PATCH] fix typo addtional

---
 pkg/apis/acid.zalan.do/v1/operator_configuration_type.go | 2 +-
 pkg/apis/acid.zalan.do/v1/zz_generated.deepcopy.go       | 4 ++--
 pkg/cluster/cluster.go                                   | 2 +-
 pkg/controller/operator_config.go                        | 2 +-
 pkg/util/config/config.go                                | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkg/apis/acid.zalan.do/v1/operator_configuration_type.go b/pkg/apis/acid.zalan.do/v1/operator_configuration_type.go
index d2a0e8969..7066729b8 100644
--- a/pkg/apis/acid.zalan.do/v1/operator_configuration_type.go
+++ b/pkg/apis/acid.zalan.do/v1/operator_configuration_type.go
@@ -39,7 +39,7 @@ type OperatorConfigurationList struct {
 type PostgresUsersConfiguration struct {
 	SuperUsername                 string   `json:"super_username,omitempty"`
 	ReplicationUsername           string   `json:"replication_username,omitempty"`
-	AddtionalOwnerRoles           []string `json:"additional_owner_roles,omitempty"`
+	AdditionalOwnerRoles          []string `json:"additional_owner_roles,omitempty"`
 	EnablePasswordRotation        bool     `json:"enable_password_rotation,omitempty"`
 	PasswordRotationInterval      uint32   `json:"password_rotation_interval,omitempty"`
 	PasswordRotationUserRetention uint32   `json:"password_rotation_user_retention,omitempty"`
diff --git a/pkg/apis/acid.zalan.do/v1/zz_generated.deepcopy.go b/pkg/apis/acid.zalan.do/v1/zz_generated.deepcopy.go
index 4b791293d..7f22f5444 100644
--- a/pkg/apis/acid.zalan.do/v1/zz_generated.deepcopy.go
+++ b/pkg/apis/acid.zalan.do/v1/zz_generated.deepcopy.go
@@ -916,8 +916,8 @@ func (in *PostgresTeamSpec) DeepCopy() *PostgresTeamSpec {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *PostgresUsersConfiguration) DeepCopyInto(out *PostgresUsersConfiguration) {
 	*out = *in
-	if in.AddtionalOwnerRoles != nil {
-		in, out := &in.AddtionalOwnerRoles, &out.AddtionalOwnerRoles
+	if in.AdditionalOwnerRoles != nil {
+		in, out := &in.AdditionalOwnerRoles, &out.AdditionalOwnerRoles
 		*out = make([]string, len(*in))
 		copy(*out, *in)
 	}
diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go
index 6567e6c9c..80c59f872 100644
--- a/pkg/cluster/cluster.go
+++ b/pkg/cluster/cluster.go
@@ -1300,7 +1300,7 @@ func (c *Cluster) initRobotUsers() error {
 }
 
 func (c *Cluster) initAdditionalOwnerRoles() {
-	for _, additionalOwner := range c.OpConfig.AddtionalOwnerRoles {
+	for _, additionalOwner := range c.OpConfig.AdditionalOwnerRoles {
 		// fetch all database owners the additional should become a member of
 		memberOf := make([]string, 0)
 		for username, pgUser := range c.pgUsers {
diff --git a/pkg/controller/operator_config.go b/pkg/controller/operator_config.go
index ccf2bc424..a511bde10 100644
--- a/pkg/controller/operator_config.go
+++ b/pkg/controller/operator_config.go
@@ -55,7 +55,7 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur
 	// user config
 	result.SuperUsername = util.Coalesce(fromCRD.PostgresUsersConfiguration.SuperUsername, "postgres")
 	result.ReplicationUsername = util.Coalesce(fromCRD.PostgresUsersConfiguration.ReplicationUsername, "standby")
-	result.CronAdminUsername = fromCRD.PostgresUsersConfiguration.CronAdminUsername
+	result.AdditionalOwnerRoles = fromCRD.PostgresUsersConfiguration.AdditionalOwnerRoles
 	result.EnablePasswordRotation = fromCRD.PostgresUsersConfiguration.EnablePasswordRotation
 	result.PasswordRotationInterval = util.CoalesceUInt32(fromCRD.PostgresUsersConfiguration.PasswordRotationInterval, 90)
 	result.PasswordRotationUserRetention = util.CoalesceUInt32(fromCRD.PostgresUsersConfiguration.DeepCopy().PasswordRotationUserRetention, 180)
diff --git a/pkg/util/config/config.go b/pkg/util/config/config.go
index 9619403f7..eef22ca9f 100644
--- a/pkg/util/config/config.go
+++ b/pkg/util/config/config.go
@@ -101,7 +101,7 @@ type Auth struct {
 	InfrastructureRolesDefs       string                `name:"infrastructure_roles_secrets"`
 	SuperUsername                 string                `name:"super_username" default:"postgres"`
 	ReplicationUsername           string                `name:"replication_username" default:"standby"`
-	AddtionalOwnerRoles           []string              `name:"additional_owner_roles" default:""`
+	AdditionalOwnerRoles          []string              `name:"additional_owner_roles" default:""`
 	EnablePasswordRotation        bool                  `name:"enable_password_rotation" default:"false"`
 	PasswordRotationInterval      uint32                `name:"password_rotation_interval" default:"90"`
 	PasswordRotationUserRetention uint32                `name:"password_rotation_user_retention" default:"180"`