Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
postgres-operator
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GitHub Mirror
zalando
postgres-operator
Commits
abd04e6f
Commit
abd04e6f
authored
8 years ago
by
Oleksii Kliukin
Browse files
Options
Downloads
Patches
Plain Diff
Avoid abbreviations in user-facing parameters.
parent
03064637
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
cmd/main.go
+4
-4
4 additions, 4 deletions
cmd/main.go
pkg/util/config/config.go
+1
-1
1 addition, 1 deletion
pkg/util/config/config.go
with
5 additions
and
5 deletions
cmd/main.go
+
4
−
4
View file @
abd04e6f
...
@@ -20,14 +20,14 @@ var (
...
@@ -20,14 +20,14 @@ var (
configMapName
spec
.
NamespacedName
configMapName
spec
.
NamespacedName
OutOfCluster
bool
OutOfCluster
bool
noTeamsAPI
bool
noTeamsAPI
bool
noD
B
Access
bool
noD
atabase
Access
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
(
&
noD
B
Access
,
"nodatabaseaccess"
,
false
,
"Disable all access to the database from the operator side."
)
flag
.
BoolVar
(
&
noD
atabase
Access
,
"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() {
...
@@ -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
noD
B
Access
{
if
noD
atabase
Access
{
configMapData
[
"enable_d
b
_access"
]
=
"false"
configMapData
[
"enable_d
atabase
_access"
]
=
"false"
}
}
if
noTeamsAPI
{
if
noTeamsAPI
{
configMapData
[
"enable_teams_api"
]
=
"false"
configMapData
[
"enable_teams_api"
]
=
"false"
...
...
This diff is collapsed.
Click to expand it.
pkg/util/config/config.go
+
1
−
1
View file @
abd04e6f
...
@@ -52,7 +52,7 @@ type Config struct {
...
@@ -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_d
b
_access" default:"true"`
EnableDBAccess
bool
`name:"enable_d
atabase
_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"`
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment