Skip to content

Commit 96c8cc4

Browse files
committed
fix the bug
1 parent a0fb7a1 commit 96c8cc4

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

pkg/cluster/cluster.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,16 +1037,15 @@ func (c *Cluster) Update(oldSpec, newSpec *acidv1.Postgresql) error {
10371037
annotationsChanged, _ := c.compareAnnotations(oldSpec.Annotations, newSpec.Annotations, nil)
10381038

10391039
initUsers := !sameUsers || !sameRotatedUsers || needPoolerUser || needStreamUser
1040-
if initUsers {
1040+
if initUsers || annotationsChanged {
10411041
c.logger.Debug("initialize users")
10421042
if err := c.initUsers(); err != nil {
10431043
c.logger.Errorf("could not init users - skipping sync of secrets and databases: %v", err)
10441044
userInitFailed = true
10451045
updateFailed = true
10461046
return
10471047
}
1048-
}
1049-
if initUsers || annotationsChanged {
1048+
10501049
c.logger.Debug("syncing secrets")
10511050
//TODO: mind the secrets of the deleted/new users
10521051
if err := c.syncSecrets(); err != nil {

pkg/cluster/k8sres.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1900,12 +1900,7 @@ func (c *Cluster) generateUserSecrets() map[string]*v1.Secret {
19001900
}
19011901

19021902
func (c *Cluster) generateSingleUserSecret(pgUser spec.PgUser) *v1.Secret {
1903-
// skip rotation users (not now to check if e2e test fails)
1904-
//if pgUser.Rotated {
1905-
// return nil
1906-
//}
1907-
1908-
// skip users with no password i.e. human users (they'll be authenticated using pam)
1903+
//Skip users with no password i.e. human users (they'll be authenticated using pam)
19091904
if pgUser.Password == "" {
19101905
if pgUser.Origin != spec.RoleOriginTeamsAPI {
19111906
c.logger.Warningf("could not generate secret for a non-teamsAPI role %q: role has no password",
@@ -1914,7 +1909,7 @@ func (c *Cluster) generateSingleUserSecret(pgUser spec.PgUser) *v1.Secret {
19141909
return nil
19151910
}
19161911

1917-
// skip NOLOGIN users
1912+
//skip NOLOGIN users
19181913
for _, flag := range pgUser.Flags {
19191914
if flag == constants.RoleFlagNoLogin {
19201915
return nil

0 commit comments

Comments
 (0)