Skip to content

Commit

Permalink
Merge pull request #19 from vimeo/update-deps-20200717
Browse files Browse the repository at this point in the history
Update Dependencies
  • Loading branch information
sergiosalvatore authored Jul 17, 2020
2 parents a977f4b + 4ca605f commit a1b02b6
Show file tree
Hide file tree
Showing 8 changed files with 485 additions and 881 deletions.
19 changes: 7 additions & 12 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,11 @@ module github.com/vimeo/pentagon
go 1.14

require (
cloud.google.com/go v0.26.0
github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f // indirect
github.com/elazarl/goproxy/ext v0.0.0-20190421051319-9d40249d3c2f // indirect
github.com/hashicorp/vault/api v1.0.1
github.com/imdario/mergo v0.3.7 // indirect
gopkg.in/yaml.v2 v2.2.1
k8s.io/api v0.0.0-20190313235455-40a48860b5ab
k8s.io/apimachinery v0.0.0-20190313205120-d7deff9243b1
k8s.io/client-go v11.0.0+incompatible
k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7 // indirect
sigs.k8s.io/kind v0.0.0-20190413011403-161151a26faf
cloud.google.com/go v0.61.0
github.com/googleapis/gnostic v0.2.0 // indirect
github.com/hashicorp/vault/api v1.0.4
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.18.6
k8s.io/apimachinery v0.18.6
k8s.io/client-go v0.18.6
)
535 changes: 428 additions & 107 deletions go.sum

Large diffs are not rendered by default.

18 changes: 17 additions & 1 deletion pentagon/main.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
package main

import (
"context"
"fmt"
"io/ioutil"
"log"
"net/url"
"os"
"os/signal"
"strings"
"syscall"

"cloud.google.com/go/compute/metadata"
"github.com/hashicorp/vault/api"
Expand All @@ -19,6 +22,19 @@ import (
)

func main() {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()

sigChan := make(chan os.Signal, 1)
signal.Notify(sigChan, os.Interrupt, syscall.SIGTERM)
go func() {
<-sigChan
log.Printf("caught signal")
cancel()
// We're done with this channel, remove the signal handler.
signal.Stop(sigChan)
}()

if len(os.Args) != 2 {
log.Printf(
"incorrect number of arguments. need 2, got %d [%#v]",
Expand Down Expand Up @@ -67,7 +83,7 @@ func main() {
config.Label,
)

err = reflector.Reflect(config.Mappings)
err = reflector.Reflect(ctx, config.Mappings)
if err != nil {
log.Printf("error reflecting vault values into kubernetes: %s", err)
os.Exit(40)
Expand Down
Loading

0 comments on commit a1b02b6

Please sign in to comment.