Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Kustomize to 3.5.4 #8

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update Kustomize to 3.5.4 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.12-stretch
FROM golang:1.13-stretch

RUN apt-get update && apt-get install -y \
curl \
Expand All @@ -8,7 +8,7 @@ RUN apt-get update && apt-get install -y \

WORKDIR /code

RUN GO111MODULE=on go get sigs.k8s.io/kustomize/kustomize/v3@v3.2.1
RUN GO111MODULE=on go get sigs.k8s.io/kustomize/kustomize/v3@v3.5.4

COPY go.mod go.sum ./
RUN go mod download
Expand Down
23 changes: 9 additions & 14 deletions SecretsFromVault.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"strings"

"github.com/hashicorp/vault/api"
"sigs.k8s.io/kustomize/v3/pkg/ifc"
"sigs.k8s.io/kustomize/v3/pkg/resmap"
"sigs.k8s.io/kustomize/v3/pkg/types"
"sigs.k8s.io/kustomize/api/kv"
"sigs.k8s.io/kustomize/api/resmap"
"sigs.k8s.io/kustomize/api/types"
"sigs.k8s.io/yaml"
)

Expand All @@ -26,8 +26,7 @@ type secretSpec struct {
}

type plugin struct {
rf *resmap.Factory
ldr ifc.Loader
ph *resmap.PluginHelpers
Spec secretSpec `json:"spec,omitempty" yaml:"spec,omitempty"`
types.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
VaultClient *api.Client
Expand All @@ -37,7 +36,7 @@ type plugin struct {
//noinspection GoUnusedGlobalVariable
var KustomizePlugin plugin

func (p *plugin) Config(ldr ifc.Loader, rf *resmap.Factory, c []byte) error {
func (p *plugin) Config(ph *resmap.PluginHelpers, c []byte) error {
vaultAddr, ok := os.LookupEnv("VAULT_ADDR")
if !ok {
return errors.New("missing `VAULT_ADDR` env var: required")
Expand All @@ -59,8 +58,7 @@ func (p *plugin) Config(ldr ifc.Loader, rf *resmap.Factory, c []byte) error {

client.SetToken(vaultToken)

p.rf = rf
p.ldr = ldr
p.ph = ph
p.VaultClient = client

return yaml.Unmarshal(c, p)
Expand Down Expand Up @@ -88,7 +86,8 @@ func (p *plugin) Generate() (resmap.ResMap, error) {
args.LiteralSources = append(args.LiteralSources, entry)
}

return p.rf.FromSecretArgs(p.ldr, p.Spec.Options, args)
return p.ph.ResmapFactory().FromSecretArgs(
kv.NewLoader(p.ph.Loader(), p.ph.Validator()), p.Spec.Options, args)
}

func getVaultToken() (string, error) {
Expand Down Expand Up @@ -124,11 +123,7 @@ func (p *plugin) getSecretFromVault(path string, key string) (value string, err
return "", fmt.Errorf("the path %s was not found", path)
}

data, ok := secret.Data["data"].(map[string]interface{})
if !ok {
return "", fmt.Errorf("malformed secret data: %q", secret.Data["data"])
}
if v, ok := data[key].(string); ok {
if v, ok := secret.Data[key].(string); ok {
return v, nil
}

Expand Down
7 changes: 3 additions & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
module github.com/RealGeeks/kustomize-kvsource-vault

go 1.12
go 1.13

require (
github.com/hashicorp/vault/api v1.0.5-0.20190909210825-c14bd9a2b1d2
github.com/spf13/pflag v1.0.5 // indirect
sigs.k8s.io/kustomize/v3 v3.2.0
github.com/hashicorp/vault/api v1.0.4
sigs.k8s.io/kustomize/api v0.3.2
sigs.k8s.io/yaml v1.1.0
)
Loading