public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Avoid abbreviations in user-facing parameters.

This commit is contained in:
Oleksii Kliukin 2017-05-12 17:44:51 +02:00
parent 03064637f1
commit abd04e6f5a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/main.go
View File

@ -20,14 +20,14 @@ var (
configMapName spec.NamespacedName configMapName spec.NamespacedName
OutOfCluster bool OutOfCluster bool
noTeamsAPI bool noTeamsAPI bool
noDBAccess bool noDatabaseAccess bool
version string version string
) )
func init() { func init() {
flag.StringVar(&KubeConfigFile, "kubeconfig", "", "Path to kubeconfig file with authorization and master location information.") flag.StringVar(&KubeConfigFile, "kubeconfig", "", "Path to kubeconfig file with authorization and master location information.")
flag.BoolVar(&OutOfCluster, "outofcluster", false, "Whether the operator runs in- our outside of the Kubernetes cluster.") flag.BoolVar(&OutOfCluster, "outofcluster", false, "Whether the operator runs in- our outside of the Kubernetes cluster.")
flag.BoolVar(&noDBAccess, "nodatabaseaccess", false, "Disable all access to the database from the operator side.") flag.BoolVar(&noDatabaseAccess, "nodatabaseaccess", false, "Disable all access to the database from the operator side.")
flag.BoolVar(&noTeamsAPI, "noteamsapi", false, "Disable all access to the teams API") flag.BoolVar(&noTeamsAPI, "noteamsapi", false, "Disable all access to the teams API")
flag.Parse() flag.Parse()
@ -91,8 +91,8 @@ func main() {
if configMapData["namespace"] == "" { // Namespace in ConfigMap has priority over env var if configMapData["namespace"] == "" { // Namespace in ConfigMap has priority over env var
configMapData["namespace"] = podNamespace configMapData["namespace"] = podNamespace
} }
if noDBAccess { if noDatabaseAccess {
configMapData["enable_db_access"] = "false" configMapData["enable_database_access"] = "false"
} }
if noTeamsAPI { if noTeamsAPI {
configMapData["enable_teams_api"] = "false" configMapData["enable_teams_api"] = "false"

2
pkg/util/config/config.go
View File

@ -52,7 +52,7 @@ type Config struct {
WALES3Bucket string `name:"wal_s3_bucket"` WALES3Bucket string `name:"wal_s3_bucket"`
KubeIAMRole string `name:"kube_iam_role"` KubeIAMRole string `name:"kube_iam_role"`
DebugLogging bool `name:"debug_logging" default:"false"` DebugLogging bool `name:"debug_logging" default:"false"`
EnableDBAccess bool `name:"enable_db_access" default:"true"` EnableDBAccess bool `name:"enable_database_access" default:"true"`
EnableTeamsAPI bool `name:"enable_teams_api" default:"true"` EnableTeamsAPI bool `name:"enable_teams_api" default:"true"`
DNSNameFormat string `name:"dns_name_format" default:"%s.%s.%s"` DNSNameFormat string `name:"dns_name_format" default:"%s.%s.%s"`
Workers uint32 `name:"workers" default:"4"` Workers uint32 `name:"workers" default:"4"`