Convert plugins to accept bytes instead of unstruct.

This commit is contained in:
Jeffrey Regan
2019-05-07 17:54:02 -07:00
committed by jregan
parent 06acd3caa9
commit 2e71a3b862
14 changed files with 109 additions and 96 deletions

View File

@@ -22,27 +22,31 @@ import (
"sigs.k8s.io/kustomize/pkg/ifc"
"sigs.k8s.io/kustomize/pkg/resmap"
"sigs.k8s.io/kustomize/pkg/types"
"sigs.k8s.io/yaml"
)
type plugin struct {
ldr ifc.Loader
rf *resmap.Factory
options types.GeneratorOptions
args types.ConfigMapArgs
types.GeneratorOptions
types.ConfigMapArgs
}
var KustomizePlugin plugin
func (p *plugin) Config(
ldr ifc.Loader, rf *resmap.Factory, k ifc.Kunstructured) (err error) {
ldr ifc.Loader, rf *resmap.Factory, config []byte) (err error) {
p.GeneratorOptions = types.GeneratorOptions{}
p.ConfigMapArgs = types.ConfigMapArgs{}
err = yaml.Unmarshal(config, p)
p.ldr = ldr
p.rf = rf
p.args.GeneratorArgs, err = resmap.GeneratorArgsFromKunstruct(k)
return
}
func (p *plugin) Generate() (resmap.ResMap, error) {
argsList := make([]types.ConfigMapArgs, 1)
argsList[0] = p.args
return p.rf.NewResMapFromConfigMapArgs(p.ldr, &p.options, argsList)
argsList[0] = p.ConfigMapArgs
return p.rf.NewResMapFromConfigMapArgs(
p.ldr, &p.GeneratorOptions, argsList)
}

View File

@@ -46,8 +46,9 @@ COLOR=red
apiVersion: builtin
kind: ConfigMapGenerator
metadata:
name: myMap
envFiles:
name: myMapGen
name: myMap
envs:
- devops.env
- uxteam.env
literals:

View File

@@ -22,34 +22,31 @@ import (
"sigs.k8s.io/kustomize/pkg/ifc"
"sigs.k8s.io/kustomize/pkg/resmap"
"sigs.k8s.io/kustomize/pkg/types"
"sigs.k8s.io/yaml"
)
type plugin struct {
ldr ifc.Loader
rf *resmap.Factory
options types.GeneratorOptions
args types.SecretArgs
ldr ifc.Loader
rf *resmap.Factory
types.GeneratorOptions
types.SecretArgs
}
var KustomizePlugin plugin
func (p *plugin) Config(
ldr ifc.Loader, rf *resmap.Factory, k ifc.Kunstructured) (err error) {
ldr ifc.Loader, rf *resmap.Factory, config []byte) (err error) {
p.GeneratorOptions = types.GeneratorOptions{}
p.SecretArgs = types.SecretArgs{}
err = yaml.Unmarshal(config, p)
p.ldr = ldr
p.rf = rf
p.args.GeneratorArgs, err = resmap.GeneratorArgsFromKunstruct(k)
if err != nil {
return
}
p.args.Type, err = k.GetFieldValue("type")
if !resmap.IsAcceptableError(err) {
return
}
return nil
return
}
func (p *plugin) Generate() (resmap.ResMap, error) {
argsList := make([]types.SecretArgs, 1)
argsList[0] = p.args
return p.rf.NewResMapFromSecretArgs(p.ldr, &p.options, argsList)
argsList[0] = p.SecretArgs
return p.rf.NewResMapFromSecretArgs(
p.ldr, &p.GeneratorOptions, argsList)
}

View File

@@ -50,12 +50,14 @@ consectetur adipiscing elit.
apiVersion: builtin
kind: SecretGenerator
metadata:
name: mySecret
name: exampleSecGen
name: mySecret
namespace: whatever
behavior: merge
envFiles:
envs:
- a.env
- b.env
valueFiles:
files:
- obscure=longsecret.txt
literals:
- FRUIT=apple
@@ -73,6 +75,7 @@ data:
kind: Secret
metadata:
name: mySecret
namespace: whatever
type: Opaque
`)
}

View File

@@ -30,7 +30,7 @@ type plugin struct{}
var KustomizePlugin plugin
func (p *plugin) Config(
ldr ifc.Loader, rf *resmap.Factory, k ifc.Kunstructured) error {
ldr ifc.Loader, rf *resmap.Factory, c []byte) error {
return nil
}

View File

@@ -26,22 +26,23 @@ import (
"sigs.k8s.io/kustomize/pkg/ifc"
"sigs.k8s.io/kustomize/pkg/resmap"
"sigs.k8s.io/kustomize/pkg/resource"
"sigs.k8s.io/yaml"
)
type plugin struct {
ServiceName string
Port string
Name string `json:"name,omitempty" yaml:"name,omitempty"`
Port string `json:"port,omitempty" yaml:"port,omitempty"`
}
var KustomizePlugin plugin
var manifest = `
const tmpl = `
apiVersion: v1
kind: Service
metadata:
labels:
app: dev
name: {{.ServiceName}}
name: {{.Name}}
spec:
ports:
- port: {{.Port}}
@@ -50,23 +51,13 @@ spec:
`
func (p *plugin) Config(
ldr ifc.Loader, rf *resmap.Factory, k ifc.Kunstructured) error {
var err error
p.ServiceName, err = k.GetFieldValue("service")
if err != nil {
return err
}
p.Port, err = k.GetFieldValue("port")
if err != nil {
return err
}
return nil
ldr ifc.Loader, rf *resmap.Factory, config []byte) error {
return yaml.Unmarshal(config, p)
}
func (p *plugin) Generate() (resmap.ResMap, error) {
var buf bytes.Buffer
temp := template.Must(template.New("manifest").Parse(manifest))
temp := template.Must(template.New("tmpl").Parse(tmpl))
err := temp.Execute(&buf, p)
if err != nil {
return nil, err

View File

@@ -16,44 +16,34 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
// Assuming GOPATH is something like
// ~/gopath
// and this source file is located at
// $GOPATH/src/sigs.k8s.io/kustomize/plugins/StringPrefixer.go,
// build it like this:
// dir=$GOPATH/src/sigs.k8s.io/kustomize/plugins
// go build -buildmode plugin -tags=plugin \
// -o $dir/StringPrefixer.so $dir/StringPrefixer.go
package main
import (
"fmt"
"sigs.k8s.io/kustomize/pkg/ifc"
"sigs.k8s.io/kustomize/pkg/resmap"
"sigs.k8s.io/kustomize/pkg/transformers"
"sigs.k8s.io/kustomize/pkg/transformers/config"
"sigs.k8s.io/yaml"
)
type plugin struct {
prefix string
Metadata metaData `json:"metadata,omitempty" yaml:"metadata,omitempty"`
}
type metaData struct {
Name string `json:"name,omitempty" yaml:"name,omitempty"`
}
var KustomizePlugin plugin
func (p *plugin) Config(
ldr ifc.Loader, rf *resmap.Factory, k ifc.Kunstructured) error {
name := k.GetName()
if name == "" {
return fmt.Errorf("name cannot be empty")
}
p.prefix = name + "-"
return nil
ldr ifc.Loader, rf *resmap.Factory, c []byte) error {
return yaml.Unmarshal(c, p)
}
func (p *plugin) Transform(m resmap.ResMap) error {
tr, err := transformers.NewNamePrefixSuffixTransformer(
p.prefix, "",
p.Metadata.Name + "-", "",
config.MakeDefaultConfig().NamePrefix)
if err != nil {
return err