Add flag --enable-helm

plugin/builtin/helmchartinflationgenerator/HelmChartInflationGenerator.go

@@ -1,11 +1,8 @@
 // Copyright 2019 The Kubernetes Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-// Helm chart generator
-//
-// Fetches the given chart from {ChartRepo}/{ChartName},
-// and inflates it to stdout, using the given values file.
-// This generator expects helm V3 or later.
+// Helm chart inflation generator.
+// Uses helm V3 to generate k8s YAML from a helm chart.
 
 //go:generate pluginator
 package main
@@ -13,7 +10,6 @@ package main
 import (
 	"bytes"
 	"fmt"
-	"io"
 	"io/ioutil"
 	"os"
 	"os/exec"
@@ -23,7 +19,6 @@ import (
 
 	"github.com/imdario/mergo"
 	"github.com/pkg/errors"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/resmap"
 	"sigs.k8s.io/kustomize/api/types"
 	"sigs.k8s.io/yaml"
@@ -32,202 +27,235 @@ import (
 // HelmChartInflationGeneratorPlugin is a plugin to generate resources
 // from a remote or local helm chart.
 type HelmChartInflationGeneratorPlugin struct {
-	h                *resmap.PluginHelpers
-	types.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
-	runHelmCommand   func([]string) ([]byte, error)
-	types.HelmChartArgs
+	h *resmap.PluginHelpers
+	types.HelmGlobals
+	types.HelmChart
 	tmpDir string
 }
 
 //noinspection GoUnusedGlobalVariable
 var KustomizePlugin HelmChartInflationGeneratorPlugin
 
+const (
+	valuesMergeOptionMerge    = "merge"
+	valuesMergeOptionOverride = "override"
+	valuesMergeOptionReplace  = "replace"
+)
+
+var legalMergeOptions = []string{
+	valuesMergeOptionMerge,
+	valuesMergeOptionOverride,
+	valuesMergeOptionReplace,
+}
+
 // Config uses the input plugin configurations `config` to setup the generator
 // options
-func (p *HelmChartInflationGeneratorPlugin) Config(h *resmap.PluginHelpers, config []byte) error {
+func (p *HelmChartInflationGeneratorPlugin) Config(
+	h *resmap.PluginHelpers, config []byte) (err error) {
+	if h.GeneralConfig() == nil {
+		return fmt.Errorf("unable to access general config")
+	}
+	if !h.GeneralConfig().HelmConfig.Enabled {
+		return fmt.Errorf("must specify --enable-helm")
+	}
+	if h.GeneralConfig().HelmConfig.Command == "" {
+		return fmt.Errorf("must specify --helm-command")
+	}
 	p.h = h
-	err := yaml.Unmarshal(config, p)
-	if err != nil {
-		return err
+	if err = yaml.Unmarshal(config, p); err != nil {
+		return
 	}
-	tmpDir, err := filesys.NewTmpConfirmedDir()
-	if err != nil {
-		return err
-	}
-	p.tmpDir = string(tmpDir)
-	if p.ChartName == "" {
-		return fmt.Errorf("chartName cannot be empty")
-	}
-	if p.ChartHome == "" {
-		p.ChartHome = filepath.Join(p.tmpDir, "chart")
-	}
-	if p.ChartRepoName == "" {
-		p.ChartRepoName = "stable"
-	}
-	if p.HelmBin == "" {
-		p.HelmBin = "helm"
-	}
-	if p.HelmHome == "" {
-		p.HelmHome = filepath.Join(p.tmpDir, ".helm")
-	}
-	if p.Values == "" {
-		p.Values = filepath.Join(p.ChartHome, p.ChartName, "values.yaml")
-	}
-	if p.ValuesMerge == "" {
-		p.ValuesMerge = "override"
-	}
-	// runHelmCommand will run `helm` command with args provided. Return stdout
-	// and error if there is any.
-	p.runHelmCommand = func(args []string) ([]byte, error) {
-		stdout := new(bytes.Buffer)
-		stderr := new(bytes.Buffer)
-		cmd := exec.Command(p.HelmBin, args...)
-		cmd.Stdout = stdout
-		cmd.Stderr = stderr
-		cmd.Env = append(os.Environ(),
-			fmt.Sprintf("HELM_CONFIG_HOME=%s", p.HelmHome),
-			fmt.Sprintf("HELM_CACHE_HOME=%s/.cache", p.HelmHome),
-			fmt.Sprintf("HELM_DATA_HOME=%s/.data", p.HelmHome),
-		)
-		err := cmd.Run()
-		if err != nil {
-			return stdout.Bytes(),
-				errors.Wrap(
-					fmt.Errorf("failed to run command %s %s", p.HelmBin, strings.Join(args, " ")),
-					stderr.String(),
-				)
-		}
-		return stdout.Bytes(), nil
-	}
-	return nil
+	return p.validateArgs()
 }
 
-// EncodeValues for writing
-func (p *HelmChartInflationGeneratorPlugin) EncodeValues(w io.Writer) error {
-	d, err := yaml.Marshal(p.ValuesLocal)
-	if err != nil {
-		return err
-	}
-	_, err = w.Write(d)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-// useValuesLocal process (merge) inflator config provided values with chart default values.yaml
-func (p *HelmChartInflationGeneratorPlugin) useValuesLocal() error {
-	// not override, merge, none
-	if !(p.ValuesMerge == "none" || p.ValuesMerge == "no" || p.ValuesMerge == "false") {
-		var pValues []byte
-		var err error
-
-		if filepath.IsAbs(p.Values) {
-			pValues, err = ioutil.ReadFile(p.Values)
-		} else {
-			pValues, err = p.h.Loader().Load(p.Values)
-		}
-		if err != nil {
-			return err
-		}
-		chValues := make(map[string]interface{})
-		err = yaml.Unmarshal(pValues, &chValues)
-		if err != nil {
-			return err
-		}
-		if p.ValuesMerge == "override" {
-			err = mergo.Merge(&chValues, p.ValuesLocal, mergo.WithOverride)
-			if err != nil {
-				return err
-			}
-		}
-		if p.ValuesMerge == "merge" {
-			err = mergo.Merge(&chValues, p.ValuesLocal)
-			if err != nil {
-				return err
-			}
-		}
-		p.ValuesLocal = chValues
-	}
-	b, err := yaml.Marshal(p.ValuesLocal)
-	if err != nil {
-		return err
-	}
-	path, err := p.writeValuesBytes(b)
-	if err != nil {
-		return err
-	}
-	p.Values = path
-	return nil
-}
-
-// copyValues will copy the relative values file into the temp directory
-// to avoid messing up with CWD.
-func (p *HelmChartInflationGeneratorPlugin) copyValues() error {
-	// only copy when the values path is not absolute
-	if filepath.IsAbs(p.Values) {
+// This uses the real file system since tmpDir may be used
+// by the helm subprocess.  Cannot use a chroot jail or fake
+// filesystem since we allow the user to use previously
+// downloaded charts.  This is safe since this plugin is
+// owned by kustomize.
+func (p *HelmChartInflationGeneratorPlugin) establishTmpDir() (err error) {
+	if p.tmpDir != "" {
+		// already done.
 		return nil
 	}
-	// we must use use loader to read values file
-	b, err := p.h.Loader().Load(p.Values)
-	if err != nil {
+	p.tmpDir, err = ioutil.TempDir("", "kustomize-helm-")
+	return err
+}
+
+func (p *HelmChartInflationGeneratorPlugin) validateArgs() (err error) {
+	if p.Name == "" {
+		return fmt.Errorf("chart name cannot be empty")
+	}
+
+	// ChartHome might be consulted by the plugin (to read
+	// values files below it), so it must be located under
+	// the loader root (unless root restrictions are
+	// disabled, in which case this can be an absolute path).
+	if p.ChartHome == "" {
+		p.ChartHome = "charts"
+	}
+
+	// The ValuesFile may be consulted by the plugin, so it must
+	// be under the loader root (unless root restrictions are
+	// disabled).
+	if p.ValuesFile == "" {
+		p.ValuesFile = filepath.Join(p.ChartHome, p.Name, "values.yaml")
+	}
+
+	if err = p.errIfIllegalValuesMerge(); err != nil {
 		return err
 	}
-	path, err := p.writeValuesBytes(b)
-	if err != nil {
-		return err
+
+	// ConfigHome is not loaded by the plugin, and can be located anywhere.
+	if p.ConfigHome == "" {
+		if err = p.establishTmpDir(); err != nil {
+			return errors.Wrap(
+				err, "unable to create tmp dir for HELM_CONFIG_HOME")
+		}
+		p.ConfigHome = filepath.Join(p.tmpDir, "helm")
 	}
-	p.Values = path
 	return nil
 }
 
-func (p *HelmChartInflationGeneratorPlugin) writeValuesBytes(b []byte) (string, error) {
-	path := filepath.Join(p.ChartHome, p.ChartName, "kustomize-values.yaml")
-	err := ioutil.WriteFile(path, b, 0644)
+func (p *HelmChartInflationGeneratorPlugin) errIfIllegalValuesMerge() error {
+	if p.ValuesMerge == "" {
+		// Use the default.
+		p.ValuesMerge = valuesMergeOptionOverride
+		return nil
+	}
+	for _, opt := range legalMergeOptions {
+		if p.ValuesMerge == opt {
+			return nil
+		}
+	}
+	return fmt.Errorf("valuesMerge must be one of %v", legalMergeOptions)
+}
+
+func (p *HelmChartInflationGeneratorPlugin) absChartHome() string {
+	if filepath.IsAbs(p.ChartHome) {
+		return p.ChartHome
+	}
+	return filepath.Join(p.h.Loader().Root(), p.ChartHome)
+}
+
+func (p *HelmChartInflationGeneratorPlugin) runHelmCommand(
+	args []string) ([]byte, error) {
+	stdout := new(bytes.Buffer)
+	stderr := new(bytes.Buffer)
+	cmd := exec.Command(p.h.GeneralConfig().HelmConfig.Command, args...)
+	cmd.Stdout = stdout
+	cmd.Stderr = stderr
+	env := []string{
+		fmt.Sprintf("HELM_CONFIG_HOME=%s", p.ConfigHome),
+		fmt.Sprintf("HELM_CACHE_HOME=%s/.cache", p.ConfigHome),
+		fmt.Sprintf("HELM_DATA_HOME=%s/.data", p.ConfigHome)}
+	cmd.Env = append(os.Environ(), env...)
+	err := cmd.Run()
+	if err != nil {
+		helm := p.h.GeneralConfig().HelmConfig.Command
+		err = errors.Wrap(
+			fmt.Errorf(
+				"unable to run: '%s %s' with env=%s (is '%s' installed?)",
+				helm, strings.Join(args, " "), env, helm),
+			stderr.String(),
+		)
+	}
+	return stdout.Bytes(), err
+}
+
+// createNewMergedValuesFile replaces/merges original values file with ValuesInline.
+func (p *HelmChartInflationGeneratorPlugin) createNewMergedValuesFile() (
+	path string, err error) {
+	if p.ValuesMerge == valuesMergeOptionMerge ||
+		p.ValuesMerge == valuesMergeOptionOverride {
+		if err = p.replaceValuesInline(); err != nil {
+			return "", err
+		}
+	}
+	var b []byte
+	b, err = yaml.Marshal(p.ValuesInline)
 	if err != nil {
 		return "", err
 	}
-	return path, nil
+	return p.writeValuesBytes(b)
+}
+
+func (p *HelmChartInflationGeneratorPlugin) replaceValuesInline() error {
+	pValues, err := p.h.Loader().Load(p.ValuesFile)
+	if err != nil {
+		return err
+	}
+	chValues := make(map[string]interface{})
+	if err = yaml.Unmarshal(pValues, &chValues); err != nil {
+		return err
+	}
+	switch p.ValuesMerge {
+	case valuesMergeOptionOverride:
+		err = mergo.Merge(
+			&chValues, p.ValuesInline, mergo.WithOverride)
+	case valuesMergeOptionMerge:
+		err = mergo.Merge(&chValues, p.ValuesInline)
+	}
+	p.ValuesInline = chValues
+	return err
+}
+
+// copyValuesFile to avoid branching.  TODO: get rid of this.
+func (p *HelmChartInflationGeneratorPlugin) copyValuesFile() (string, error) {
+	b, err := p.h.Loader().Load(p.ValuesFile)
+	if err != nil {
+		return "", err
+	}
+	return p.writeValuesBytes(b)
+}
+
+// Write a absolute path file in the tmp file system.
+func (p *HelmChartInflationGeneratorPlugin) writeValuesBytes(
+	b []byte) (string, error) {
+	if err := p.establishTmpDir(); err != nil {
+		return "", fmt.Errorf("cannot create tmp dir to write helm values")
+	}
+	path := filepath.Join(p.tmpDir, p.Name+"-kustomize-values.yaml")
+	return path, ioutil.WriteFile(path, b, 0644)
+}
+
+func (p *HelmChartInflationGeneratorPlugin) cleanup() {
+	if p.tmpDir != "" {
+		os.RemoveAll(p.tmpDir)
+	}
 }
 
 // Generate implements generator
-func (p *HelmChartInflationGeneratorPlugin) Generate() (resmap.ResMap, error) {
-	// cleanup
-	defer os.RemoveAll(p.tmpDir)
-	// check helm version. we only support V3
-	err := p.checkHelmVersion()
-	if err != nil {
+func (p *HelmChartInflationGeneratorPlugin) Generate() (rm resmap.ResMap, err error) {
+	defer p.cleanup()
+	if err = p.checkHelmVersion(); err != nil {
 		return nil, err
 	}
-	// pull the chart
-	if !p.checkLocalChart() {
-		_, err := p.runHelmCommand(p.getPullCommandArgs())
-		if err != nil {
+	if path, exists := p.chartExistsLocally(); !exists {
+		if p.Repo == "" {
+			return nil, fmt.Errorf(
+				"no repo specified for pull, no chart found at '%s'", path)
+		}
+		if _, err := p.runHelmCommand(p.pullCommand()); err != nil {
 			return nil, err
 		}
 	}
-
-	// inflator config valuesLocal
-	if len(p.ValuesLocal) > 0 {
-		err := p.useValuesLocal()
-		if err != nil {
-			return nil, err
-		}
+	if len(p.ValuesInline) > 0 {
+		p.ValuesFile, err = p.createNewMergedValuesFile()
 	} else {
-		err := p.copyValues()
-		if err != nil {
-			return nil, err
-		}
+		p.ValuesFile, err = p.copyValuesFile()
 	}
-
-	// render the charts
-	stdout, err := p.runHelmCommand(p.getTemplateCommandArgs())
+	if err != nil {
+		return nil, err
+	}
+	var stdout []byte
+	stdout, err = p.runHelmCommand(p.templateCommand())
 	if err != nil {
 		return nil, err
 	}
 
-	rm, rmfErr := p.h.ResmapFactory().NewResMapFromBytes(stdout)
-	if rmfErr == nil {
+	rm, err = p.h.ResmapFactory().NewResMapFromBytes(stdout)
+	if err == nil {
 		return rm, nil
 	}
 	// try to remove the contents before first "---" because
@@ -236,50 +264,49 @@ func (p *HelmChartInflationGeneratorPlugin) Generate() (resmap.ResMap, error) {
 	if idx := strings.Index(stdoutStr, "---"); idx != -1 {
 		return p.h.ResmapFactory().NewResMapFromBytes([]byte(stdoutStr[idx:]))
 	}
-	return nil, rmfErr
+	return nil, err
 }
 
-func (p *HelmChartInflationGeneratorPlugin) getTemplateCommandArgs() []string {
+func (p *HelmChartInflationGeneratorPlugin) templateCommand() []string {
 	args := []string{"template"}
 	if p.ReleaseName != "" {
 		args = append(args, p.ReleaseName)
 	}
-	args = append(args, filepath.Join(p.ChartHome, p.ChartName))
-	if p.ReleaseNamespace != "" {
-		args = append(args, "--namespace", p.ReleaseNamespace)
+	args = append(args, filepath.Join(p.absChartHome(), p.Name))
+	if p.ValuesFile != "" {
+		args = append(args, "--values", p.ValuesFile)
 	}
-	if p.Values != "" {
-		args = append(args, "--values", p.Values)
+	if p.ReleaseName == "" {
+		// AFAICT, this doesn't work as intended due to a bug in helm.
+		// See https://github.com/helm/helm/issues/6019
+		// I've tried placing the flag before and after the name argument.
+		args = append(args, "--generate-name")
 	}
-	args = append(args, p.ExtraArgs...)
 	return args
 }
 
-func (p *HelmChartInflationGeneratorPlugin) getPullCommandArgs() []string {
-	args := []string{"pull", "--untar", "--untardir", p.ChartHome}
-	chartName := fmt.Sprintf("%s/%s", p.ChartRepoName, p.ChartName)
-	if p.ChartVersion != "" {
-		args = append(args, "--version", p.ChartVersion)
+func (p *HelmChartInflationGeneratorPlugin) pullCommand() []string {
+	args := []string{
+		"pull",
+		"--untar",
+		"--untardir", p.absChartHome(),
+		"--repo", p.Repo,
+		p.Name}
+	if p.Version != "" {
+		args = append(args, "--version", p.Version)
 	}
-	if p.ChartRepoURL != "" {
-		args = append(args, "--repo", p.ChartRepoURL)
-		chartName = p.ChartName
-	}
-
-	args = append(args, chartName)
-
 	return args
 }
 
-// checkLocalChart will return true if the chart does exist in
+// chartExistsLocally will return true if the chart does exist in
 // local chart home.
-func (p *HelmChartInflationGeneratorPlugin) checkLocalChart() bool {
-	path := filepath.Join(p.ChartHome, p.ChartName)
+func (p *HelmChartInflationGeneratorPlugin) chartExistsLocally() (string, bool) {
+	path := filepath.Join(p.absChartHome(), p.Name)
 	s, err := os.Stat(path)
 	if err != nil {
-		return false
+		return "", false
 	}
-	return s.IsDir()
+	return path, s.IsDir()
 }
 
 // checkHelmVersion will return an error if the helm version is not V3

plugin/builtin/helmchartinflationgenerator/HelmChartInflationGenerator_test.go

@@ -1,34 +1,30 @@
 package main_test
 
-/*
 import (
 	"fmt"
-	"io/ioutil"
-	"os"
-	"path"
+	"path/filepath"
 	"testing"
 
-	"sigs.k8s.io/kustomize/api/filesys"
 	kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
 )
 
-//add tests for https://github.com/kubernetes-sigs/kustomize/pull/3713 if you plan to re-enable tests
-
 func TestHelmChartInflationGenerator(t *testing.T) {
-	th := kusttest_test.MakeEnhancedHarness(t).
+	th := kusttest_test.MakeEnhancedHarnessWithTmpRoot(t).
 		PrepBuiltin("HelmChartInflationGenerator")
 	defer th.Reset()
+	if err := th.ErrIfNoHelm(); err != nil {
+		t.Skip("skipping: " + err.Error())
+	}
 
 	rm := th.LoadAndRunGenerator(`
 apiVersion: builtin
 kind: HelmChartInflationGenerator
 metadata:
-  name: myMap
-chartName: minecraft
-chartRepoUrl: https://charts.helm.sh/stable
-chartVersion: v1.2.0
-releaseName: test
-releaseNamespace: testNamespace
+  name: myMc
+name: minecraft
+version: 3.1.3
+repo: https://itzg.github.io/minecraft-server-charts
+releaseName: moria
 `)
 
 	th.AssertActualEqualsExpected(rm, `
@@ -38,40 +34,23 @@ data:
 kind: Secret
 metadata:
   labels:
-    app: test-minecraft
-    chart: minecraft-1.2.0
+    app: moria-minecraft
+    chart: minecraft-3.1.3
     heritage: Helm
-    release: test
-  name: test-minecraft
+    release: moria
+  name: moria-minecraft
 type: Opaque
 ---
 apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  annotations:
-    volume.alpha.kubernetes.io/storage-class: default
-  labels:
-    app: test-minecraft
-    chart: minecraft-1.2.0
-    heritage: Helm
-    release: test
-  name: test-minecraft-datadir
-spec:
-  accessModes:
-  - ReadWriteOnce
-  resources:
-    requests:
-      storage: 1Gi
----
-apiVersion: v1
 kind: Service
 metadata:
+  annotations: {}
   labels:
-    app: test-minecraft
-    chart: minecraft-1.2.0
+    app: moria-minecraft
+    chart: minecraft-3.1.3
     heritage: Helm
-    release: test
-  name: test-minecraft
+    release: moria
+  name: moria-minecraft
 spec:
   ports:
   - name: minecraft
@@ -79,93 +58,35 @@ spec:
     protocol: TCP
     targetPort: minecraft
   selector:
-    app: test-minecraft
-  type: LoadBalancer
+    app: moria-minecraft
+  type: ClusterIP
 `)
 }
 
-func TestHelmChartInflationGeneratorWithValues(t *testing.T) {
-	th := kusttest_test.MakeEnhancedHarness(t).
-		PrepBuiltin("HelmChartInflationGenerator")
-	defer th.Reset()
-
-	tempDirConfirmed, err := filesys.NewTmpConfirmedDir()
-	if err != nil {
-		t.Fatal(err)
-	}
-	tempDir := string(tempDirConfirmed)
-	defer os.RemoveAll(tempDir)
-	valuesPath := path.Join(tempDir, "values.yaml")
-	ioutil.WriteFile(valuesPath, []byte(`
-minecraftServer:
-  eula: TRUE
-`), 0644)
-
-	rm := th.LoadAndRunGenerator(fmt.Sprintf(`
-apiVersion: builtin
-kind: HelmChartInflationGenerator
-metadata:
-  name: myMap
-chartName: minecraft
-chartRepoUrl: https://charts.helm.sh/stable
-chartVersion: v1.2.0
-helmBin: helm
-helmHome: %s
-chartHome: %s
-releaseName: test
-releaseNamespace: testNamespace
-values: %s
-valuesLocal:
-  resources:
-    limits:
-      memory: 512Mi
-      cpu: 1000m
-    requests:
-      memory: 512Mi
-      cpu: 200m
-`, tempDir, tempDir, valuesPath))
-
-	th.AssertActualEqualsExpected(rm, `
+const expectedInflationFmt = `
 apiVersion: v1
 data:
   rcon-password: Q0hBTkdFTUUh
 kind: Secret
 metadata:
   labels:
-    app: test-minecraft
-    chart: minecraft-1.2.0
+    app: moria-minecraft
+    chart: minecraft-3.1.3
     heritage: Helm
-    release: test
-  name: test-minecraft
+    release: moria
+  name: moria-minecraft
 type: Opaque
 ---
 apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  annotations:
-    volume.alpha.kubernetes.io/storage-class: default
-  labels:
-    app: test-minecraft
-    chart: minecraft-1.2.0
-    heritage: Helm
-    release: test
-  name: test-minecraft-datadir
-spec:
-  accessModes:
-  - ReadWriteOnce
-  resources:
-    requests:
-      storage: 1Gi
----
-apiVersion: v1
 kind: Service
 metadata:
+  annotations: {}
   labels:
-    app: test-minecraft
-    chart: minecraft-1.2.0
+    app: moria-minecraft
+    chart: minecraft-3.1.3
     heritage: Helm
-    release: test
-  name: test-minecraft
+    release: moria
+  name: moria-minecraft
 spec:
   ports:
   - name: minecraft
@@ -173,28 +94,48 @@ spec:
     protocol: TCP
     targetPort: minecraft
   selector:
-    app: test-minecraft
+    app: moria-minecraft
+  type: ClusterIP
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations: {}
+  labels:
+    app: moria-minecraft
+    chart: minecraft-3.1.3
+    heritage: Helm
+    release: moria
+  name: moria-minecraft-rcon
+spec:
+  ports:
+  - name: rcon
+    port: 25575
+    protocol: TCP
+    targetPort: rcon
+  selector:
+    app: moria-minecraft
   type: LoadBalancer
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app: test-minecraft
-    chart: minecraft-1.2.0
+    app: moria-minecraft
+    chart: minecraft-3.1.3
     heritage: Helm
-    release: test
-  name: test-minecraft
+    release: moria
+  name: moria-minecraft
 spec:
   selector:
     matchLabels:
-      app: test-minecraft
+      app: moria-minecraft
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
-        app: test-minecraft
+        app: moria-minecraft
     spec:
       containers:
       - env:
@@ -203,9 +144,9 @@ spec:
         - name: TYPE
           value: VANILLA
         - name: VERSION
-          value: 1.14.4
+          value: LATEST
         - name: DIFFICULTY
-          value: easy
+          value: %s
         - name: WHITELIST
           value: ""
         - name: OPS
@@ -222,7 +163,7 @@ spec:
           value: "true"
         - name: ENABLE_COMMAND_BLOCK
           value: "true"
-        - name: FORCE_gameMode
+        - name: FORCE_GAMEMODE
           value: "false"
         - name: GENERATE_STRUCTURES
           value: "true"
@@ -257,47 +198,48 @@ spec:
         - name: ONLINE_MODE
           value: "true"
         - name: MEMORY
-          value: 512M
+          value: 1024M
         - name: JVM_OPTS
           value: ""
         - name: JVM_XX_OPTS
           value: ""
+        - name: ENABLE_RCON
+          value: "true"
+        - name: RCON_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              key: rcon-password
+              name: moria-minecraft
         image: itzg/minecraft-server:latest
         imagePullPolicy: Always
         livenessProbe:
-          exec:
-            command:
-            - mcstatus
-            - localhost:25565
-            - status
           failureThreshold: 10
           initialDelaySeconds: 30
           periodSeconds: 5
           successThreshold: 1
+          tcpSocket:
+            port: 25565
           timeoutSeconds: 1
-        name: test-minecraft
+        name: moria-minecraft
         ports:
         - containerPort: 25565
           name: minecraft
           protocol: TCP
+        - containerPort: 25575
+          name: rcon
+          protocol: TCP
         readinessProbe:
-          exec:
-            command:
-            - mcstatus
-            - localhost:25565
-            - status
           failureThreshold: 10
           initialDelaySeconds: 30
           periodSeconds: 5
           successThreshold: 1
+          tcpSocket:
+            port: 25565
           timeoutSeconds: 1
         resources:
-          limits:
-            cpu: 1000m
-            memory: 512Mi
           requests:
-            cpu: 200m
-            memory: 512Mi
+            cpu: %dm
+            memory: %dMi
         volumeMounts:
         - mountPath: /data
           name: datadir
@@ -305,9 +247,110 @@ spec:
         fsGroup: 2000
         runAsUser: 1000
       volumes:
-      - name: datadir
-        persistentVolumeClaim:
-          claimName: test-minecraft-datadir
+      - emptyDir: {}
+        name: datadir
+`
+
+func TestHelmChartInflationGeneratorWithValuesInlineOverride(t *testing.T) {
+	th := kusttest_test.MakeEnhancedHarnessWithTmpRoot(t).
+		PrepBuiltin("HelmChartInflationGenerator")
+	defer th.Reset()
+	if err := th.ErrIfNoHelm(); err != nil {
+		t.Skip("skipping: " + err.Error())
+	}
+	rm := th.LoadAndRunGenerator(`
+apiVersion: builtin
+kind: HelmChartInflationGenerator
+metadata:
+  name: myMc
+name: minecraft
+version: 3.1.3
+repo: https://itzg.github.io/minecraft-server-charts
+releaseName: moria
+valuesInline:
+  minecraftServer:
+    eula: true
+    difficulty: hard
+    rcon:
+      enabled: true
 `)
+	th.AssertActualEqualsExpected(
+		rm, fmt.Sprintf(expectedInflationFmt,
+			"hard", // difficulty
+			500,    // cpu
+			512,    // memory
+		))
+}
+
+func TestHelmChartInflationGeneratorWithLocalValuesFile(t *testing.T) {
+	th := kusttest_test.MakeEnhancedHarnessWithTmpRoot(t).
+		PrepBuiltin("HelmChartInflationGenerator")
+	defer th.Reset()
+	if err := th.ErrIfNoHelm(); err != nil {
+		t.Skip("skipping: " + err.Error())
+	}
+	th.WriteF(filepath.Join(th.GetRoot(), "myValues.yaml"), `
+minecraftServer:
+  eula: true
+  difficulty: peaceful
+  rcon:
+    enabled: true
+resources:
+  requests:
+    cpu: 888m
+    memory: 666Mi
+`)
+	rm := th.LoadAndRunGenerator(`
+apiVersion: builtin
+kind: HelmChartInflationGenerator
+metadata:
+  name: myMc
+name: minecraft
+version: 3.1.3
+repo: https://itzg.github.io/minecraft-server-charts
+releaseName: moria
+valuesFile: myValues.yaml
+`)
+	th.AssertActualEqualsExpected(
+		rm, fmt.Sprintf(expectedInflationFmt,
+			"peaceful", // difficulty
+			888,        // cpu
+			666,        // memory
+		))
+}
+
+func TestHelmChartInflationGeneratorWithInLineReplace(t *testing.T) {
+	th := kusttest_test.MakeEnhancedHarnessWithTmpRoot(t).
+		PrepBuiltin("HelmChartInflationGenerator")
+	defer th.Reset()
+	if err := th.ErrIfNoHelm(); err != nil {
+		t.Skip("skipping: " + err.Error())
+	}
+	rm := th.LoadAndRunGenerator(`
+apiVersion: builtin
+kind: HelmChartInflationGenerator
+metadata:
+  name: myMc
+name: minecraft
+version: 3.1.3
+repo: https://itzg.github.io/minecraft-server-charts
+releaseName: moria
+valuesInline:
+  minecraftServer:
+    eula: true
+    difficulty: OMG_PLEASE_NO
+    rcon:
+      enabled: true
+  resources:
+    requests:
+      cpu: 555m
+      memory: 111Mi
+valuesMerge: replace
+`)
+	th.AssertActualEqualsExpected(
+		rm, fmt.Sprintf(expectedInflationFmt,
+			"OMG_PLEASE_NO", // difficulty
+			555,             // cpu
+			111,             // memory
+		))
 }
-*/

plugin/builtin/helmchartinflationgenerator/go.sum

@@ -33,6 +33,7 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
+github.com/evanphx/json-patch v4.5.0+incompatible h1:ouOWdg56aJriqS0huScTkVXPC5IcNrDCXZ6OoTAWu7M=
 github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
@@ -102,6 +103,7 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -159,6 +161,7 @@ github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40T
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
+github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
@@ -191,6 +194,7 @@ go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.mongodb.org/mongo-driver v1.1.2/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
+go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 h1:+FNtrFTmVw0YZGpBGX56XDee331t6JAXeK2bcyhLOOc=
 go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod h1:nmDLcffg48OtT/PSW0Hg7FvpRQsQh5OSqIylirxKC7o=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=