Merge branch 'master' into client-go-3

pkg/cluster/cluster.go

pkg/cluster/k8sres.go

pkg/cluster/pg.go

pkg/cluster/pod.go

pkg/cluster/resources.go

pkg/cluster/sync.go

pkg/cluster/util.go

pkg/controller/controller.go

pkg/controller/exec.go

pkg/controller/pod.go

pkg/controller/postgresql.go

pkg/controller/util.go

pkg/spec/postgresql.go

pkg/util/retryutil/retry_util.go

pkg/util/teams/teams.go

pkg/util/users/users.go