remove patches and imageTags from kustomization.yaml

kubernetes-sigs · Jan 25, 2019 · c461f1f · c461f1f
1 parent 028724d
commit c461f1f
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 344 deletions.
diff --git a/docs/kustomization.yaml b/docs/kustomization.yaml
@@ -156,7 +156,7 @@ bases:
 # a memory request/limit, change an env var in a
 # ConfigMap, etc.  Small patches are easy to review and
 # easy to mix together in overlays.
-patches:
+patchesStrategicMerge:
 - service_port_8888.yaml
 - deployment_increase_replicas.yaml
 - deployment_increase_memory.yaml
@@ -311,24 +311,3 @@ images:
     newName: my-app
   - name: alpine
     digest: sha256:24a0c4b4a4c0eb97a1aabb8e29f18e917d05abfe1b7a7c07857230879ce7d3d3
-
-# ImageTags is deprecated, instead use Image.
-# ImageTags modify the tags for images without creating patches.
-# E.g. Given this fragment of a Deployment:
-# ```
-#  containers:
-#    - name: myapp
-#      image: mycontainerregistry/myimage:v0
-#    - name: nginxapp
-#      image: nginx:1.7.9
-#```
-# one can change the tag of myimage to v1 and the tag of nginx to 1.8.0 with the following:
-#
-# It also supports digests. If digest is present newTag is ignored.
-imageTags:
-  - name: mycontainerregistry/myimage
-    newTag: v1
-  - name: nginx
-    newTag: 1.8.0
-  - name: alpine
-    digest: sha256:24a0c4b4a4c0eb97a1aabb8e29f18e917d05abfe1b7a7c07857230879ce7d3d3
diff --git a/pkg/commands/edit/set/all.go b/pkg/commands/edit/set/all.go
@@ -42,7 +42,6 @@ func NewCmdSet(fsys fs.FileSystem, v ifc.Validator) *cobra.Command {
 		newCmdSetNamePrefix(fsys),
 		newCmdSetNameSuffix(fsys),
 		newCmdSetNamespace(fsys, v),
-		newCmdSetImageTag(fsys),
 		newCmdSetImage(fsys),
 	)
 	return c

diff --git a/pkg/commands/edit/set/setimage.go b/pkg/commands/edit/set/setimage.go
@@ -18,6 +18,7 @@ package set
 
 import (
 	"errors"
+	"regexp"
 	"sort"
 	"strings"
 
@@ -31,6 +32,8 @@ type setImageOptions struct {
 	imageMap map[string]image.Image
 }
 
+var pattern = regexp.MustCompile("^(.*):([a-zA-Z0-9._-]*)$")
+
 // errors
 
 var (

diff --git a/pkg/commands/edit/set/setimagetag.go b/pkg/commands/edit/set/setimagetag.go
diff --git a/pkg/commands/edit/set/setimagetag_test.go b/pkg/commands/edit/set/setimagetag_test.go
diff --git a/pkg/commands/kustfile/kustomizationfile.go b/pkg/commands/kustfile/kustomizationfile.go
@@ -59,15 +59,13 @@ func determineFieldOrder() []string {
 		"Crds",
 		"CommonLabels",
 		"CommonAnnotations",
-		"Patches",
 		"PatchesStrategicMerge",
 		"PatchesJson6902",
 		"ConfigMapGenerator",
 		"SecretGenerator",
 		"GeneratorOptions",
 		"Vars",
 		"Images",
-		"ImageTags",
 		"Configurations",
 	}
 
@@ -148,12 +146,12 @@ func (mf *kustomizationFile) Read() (*types.Kustomization, error) {
 	if err != nil {
 		return nil, err
 	}
+	data = types.DealWithDeprecatedFields(data)
 	var k types.Kustomization
 	err = yaml.Unmarshal(data, &k)
 	if err != nil {
 		return nil, err
 	}
-	k.DealWithDeprecatedFields()
 	msgs := k.DealWithMissingFields()
 	if len(msgs) > 0 {
 		log.Printf(strings.Join(msgs, "\n"))

diff --git a/pkg/commands/kustfile/kustomizationfile_test.go b/pkg/commands/kustfile/kustomizationfile_test.go
@@ -45,7 +45,6 @@ func TestFieldOrder(t *testing.T) {
 		"GeneratorOptions",
 		"Vars",
 		"Images",
-		"ImageTags",
 		"Configurations",
 	}
 	actual := determineFieldOrder()
@@ -85,52 +84,6 @@ func TestWriteAndRead(t *testing.T) {
 	}
 }
 
-// Deprecated fields should not survive being read.
-func TestDeprecationOfPatches(t *testing.T) {
-	hasDeprecatedFields := []byte(`
-namePrefix: acme
-nameSuffix: emca
-patches:
-- alice
-patchesStrategicMerge:
-- bob
-`)
-	fSys := fs.MakeFakeFS()
-	fSys.WriteTestKustomizationWith(hasDeprecatedFields)
-	mf, err := NewKustomizationFile(fSys)
-	if err != nil {
-		t.Fatalf("Unexpected Error: %v", err)
-	}
-	k, err := mf.Read()
-	if err != nil {
-		t.Fatalf("Couldn't read kustomization file: %v\n", err)
-	}
-	if k.NamePrefix != "acme" {
-		t.Fatalf("Unexpected name prefix")
-	}
-	if k.NameSuffix != "emca" {
-		t.Fatalf("Unexpected name suffix")
-	}
-	if len(k.Patches) > 0 {
-		t.Fatalf("Expected nothing in Patches.")
-	}
-	if len(k.PatchesStrategicMerge) != 2 {
-		t.Fatalf(
-			"Expected len(k.PatchesStrategicMerge) == 2, got %d",
-			len(k.PatchesStrategicMerge))
-	}
-	m := make(map[string]bool)
-	for _, v := range k.PatchesStrategicMerge {
-		m[string(v)] = true
-	}
-	if _, f := m["alice"]; !f {
-		t.Fatalf("Expected alice in PatchesStrategicMerge")
-	}
-	if _, f := m["bob"]; !f {
-		t.Fatalf("Expected bob in PatchesStrategicMerge")
-	}
-}
-
 func TestNewNotExist(t *testing.T) {
 	fakeFS := fs.MakeFakeFS()
 	_, err := NewKustomizationFile(fakeFS)

diff --git a/pkg/target/baseandoverlaymedium_test.go b/pkg/target/baseandoverlaymedium_test.go
@@ -162,7 +162,7 @@ configMapGenerator:
 - name: app-config
   files:
   - configmap/app-init.ini
-imageTags:
+images:
 - name: nginx
   newTag: 1.8.0`)