reflect feedback

charts/postgres-operator/crds/operatorconfigurations.yaml

@@ -138,6 +138,7 @@ spec:
                     type: object
                     required:
                       - secretname
+                      - userkey
                       - passwordkey
                     properties:
                       secretname:

manifests/infrastructure-roles-new.yaml

@@ -3,8 +3,6 @@ data:
   # infrastructure role definition in the new format
   # robot_zmon_acid_monitoring_new
   user: cm9ib3Rfem1vbl9hY2lkX21vbml0b3JpbmdfbmV3
-  # robot_zmon
-  memberof: cm9ib3Rfem1vbg==
   # foobar_new
   password: Zm9vYmFyX25ldw==
 kind: Secret

manifests/operatorconfiguration.crd.yaml

@@ -134,6 +134,7 @@ spec:
                     type: object
                     required:
                       - secretname
+                      - userkey
                       - passwordkey
                     properties:
                       secretname:

pkg/apis/acid.zalan.do/v1/crds.go

@@ -916,7 +916,7 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
 								Items: &apiextv1beta1.JSONSchemaPropsOrArray{
 									Schema: &apiextv1beta1.JSONSchemaProps{
 										Type:     "object",
-										Required: []string{"secretname", "passwordkey"},
+										Required: []string{"secretname", "userkey", "passwordkey"},
 										Properties: map[string]apiextv1beta1.JSONSchemaProps{
 											"secretname": {
 												Type: "string",

pkg/cluster/sync.go

@@ -500,7 +500,6 @@ func (c *Cluster) syncSecrets() error {
 				c.logger.Warningf("secret %q does not contain the role %q", secretSpec.Name, secretUsername)
 				continue
 			}
-			c.Secrets[secret.UID] = secret
 			c.logger.Debugf("secret %q already exists, fetching its password", util.NameFromMeta(secret.ObjectMeta))
 			if secretUsername == c.systemUsers[constants.SuperuserKeyName].Name {
 				secretUsername = constants.SuperuserKeyName

pkg/controller/util_test.go

@@ -339,7 +339,6 @@ func TestInfrastructureRoleDefinitions(t *testing.T) {
 					},
 					UserKey:          "test-user",
 					PasswordKey:      "test-password",
-					RoleKey:          "",
 					DefaultRoleValue: "test-role",
 					Template:         false,
 				},
@@ -450,7 +449,7 @@ func TestInfrastructureRoleDefinitions(t *testing.T) {
 		{
 			[]*config.InfrastructureRole{},
 			spec.NamespacedName{},
-			"userkey: test-user, passwordkey: test-password, rolekey: test-role, template: false",
+			"userkey: test-user, passwordkey: test-password, rolekey: test-role",
 			[]*config.InfrastructureRole{},
 		},
 	}