Skip to content

Commit

Permalink
Merge pull request #31 from uswitch/add-push-gateway
Browse files Browse the repository at this point in the history
Add push gateway as a flag and pass to vault sidecar
  • Loading branch information
waiariki-koia authored Oct 29, 2020
2 parents cb9be84 + 6ae7dff commit c5eee90
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
2 changes: 2 additions & 0 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (

var (
vaultAddr string
gatewayAddr string
loginPath string
secretPathFormat string
sidecarImage string
Expand All @@ -30,6 +31,7 @@ func main() {
kingpin.Flag("vault-address", "URL of vault").Required().StringVar(&vaultAddr)
kingpin.Flag("login-path", "Kubernetes auth login path for vault").Required().StringVar(&loginPath)
kingpin.Flag("sidecar-image", "Vault-creds sidecar image to use").Required().StringVar(&sidecarImage)
kingpin.Flag("gateway-address", "URL of Push Gateway").StringVar(&gatewayAddr)
kingpin.Flag("secret-path-format", "The format for the path used for reading database credentials, where the first %s is the database name and the second %s is the role").Default("%s/creds/%s").StringVar(&secretPathFormat)
kingpin.Parse()
log.SetOutput(os.Stderr)
Expand Down
1 change: 1 addition & 0 deletions vault.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ func addVault(pod *corev1.Pod, namespace, serviceAccountToken string, databases
Name: containerName,
Args: []string{
"--vault-addr=" + vaultAddr,
"--gateway-addr=" + gatewayAddr,
"--ca-cert=/vault.ca",
"--secret-path=" + secretPath,
"--login-path=" + loginPath,
Expand Down

0 comments on commit c5eee90

Please sign in to comment.