kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-05-17 18:25:26 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Remove config.kubernetes.io/package annotation

Browse Source 
It doesn't do anything useful
This commit is contained in:
Phillip Wittrock
2020-01-07 11:22:34 -08:00
parent 0cae0feb9b
commit e473433cba
9 changed files with 16 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/config/internal/commands/cat_test.go
View File

@@ -90,7 +90,6 @@ metadata:
name: foo
annotations:
app: nginx2
config.kubernetes.io/package: '.'
config.kubernetes.io/path: 'f1.yaml'
spec:
replicas: 1
@@ -100,7 +99,6 @@ metadata:
name: foo
annotations:
app: nginx
config.kubernetes.io/package: '.'
config.kubernetes.io/path: 'f1.yaml'
spec:
selector:
@@ -114,7 +112,6 @@ metadata:
app: nginx
annotations:
app: nginx
config.kubernetes.io/package: '.'
config.kubernetes.io/path: 'f2.yaml'
spec:
replicas: 3
@@ -196,7 +193,6 @@ metadata:
name: foo
annotations:
app: nginx2
config.kubernetes.io/package: '.'
config.kubernetes.io/path: 'f1.yaml'
spec:
replicas: 1
@@ -206,7 +202,6 @@ metadata:
name: foo
annotations:
app: nginx
config.kubernetes.io/package: '.'
config.kubernetes.io/path: 'f1.yaml'
spec:
selector:
@@ -218,7 +213,6 @@ metadata:
name: foo
annotations:
config.kubernetes.io/local-config: "true"
config.kubernetes.io/package: '.'
config.kubernetes.io/path: 'f2.yaml'
configFn:
container:
@@ -233,7 +227,6 @@ metadata:
name: bar
annotations:
app: nginx
config.kubernetes.io/package: '.'
config.kubernetes.io/path: 'f2.yaml'
spec:
replicas: 3
@@ -314,7 +307,6 @@ metadata:
name: foo
annotations:
config.kubernetes.io/local-config: "true"
config.kubernetes.io/package: '.'
config.kubernetes.io/path: 'f2.yaml'
configFn:
container:
@@ -414,7 +406,6 @@ metadata:
name: foo
annotations:
app: nginx2
config.kubernetes.io/package: '.'
config.kubernetes.io/path: 'f1.yaml'
spec:
replicas: 1
@@ -424,7 +415,6 @@ metadata:
name: foo
annotations:
app: nginx
config.kubernetes.io/package: '.'
config.kubernetes.io/path: 'f1.yaml'
spec:
selector:
@@ -438,7 +428,6 @@ metadata:
app: nginx
annotations:
app: nginx
config.kubernetes.io/package: '.'
config.kubernetes.io/path: 'f2.yaml'
spec:
replicas: 3
@@ -536,7 +525,6 @@ metadata:
name: foo
annotations:
app: nginx2
config.kubernetes.io/package: '.'
config.kubernetes.io/path: 'f1.yaml'
spec:
replicas: 1
@@ -546,7 +534,6 @@ metadata:
name: foo
annotations:
app: nginx
config.kubernetes.io/package: '.'
config.kubernetes.io/path: 'f1.yaml'
spec:
selector:
@@ -560,7 +547,6 @@ metadata:
app: nginx
annotations:
app: nginx
config.kubernetes.io/package: '.'
config.kubernetes.io/path: 'f2.yaml'
spec:
replicas: 3

2
cmd/config/internal/commands/grep_test.go
View File

@@ -76,7 +76,6 @@ metadata:
annotations:
app: nginx2
config.kubernetes.io/index: '0'
config.kubernetes.io/package: '.'
config.kubernetes.io/path: 'f1.yaml'
spec:
replicas: 1
@@ -87,7 +86,6 @@ metadata:
annotations:
app: nginx
config.kubernetes.io/index: '1'
config.kubernetes.io/package: '.'
config.kubernetes.io/path: 'f1.yaml'
spec:
selector:

9
cmd/config/internal/commands/tree_test.go
View File

@@ -104,7 +104,6 @@ metadata:
namespace: default
annotations:
app: nginx2
config.kubernetes.io/package: .
config.kubernetes.io/path: f1.yaml
spec:
replicas: 1
@@ -118,7 +117,6 @@ metadata:
namespace: default
annotations:
app: nginx2
config.kubernetes.io/package: .
config.kubernetes.io/path: f1.yaml
spec:
replicas: 1
@@ -132,7 +130,6 @@ metadata:
namespace: default
annotations:
app: nginx2
config.kubernetes.io/package: .
config.kubernetes.io/path: f1.yaml
spec:
replicas: 1
@@ -146,7 +143,6 @@ metadata:
namespace: default2
annotations:
app: nginx2
config.kubernetes.io/package: .
config.kubernetes.io/path: f1.yaml
spec:
replicas: 1
@@ -160,7 +156,6 @@ metadata:
namespace: default
annotations:
app: nginx3
config.kubernetes.io/package: .
config.kubernetes.io/path: f1.yaml
spec:
replicas: 1
@@ -171,8 +166,7 @@ metadata:
app: nginx
annotations:
app: nginx
config.kubernetes.io/package: bar-package
config.kubernetes.io/path: f2.yaml
config.kubernetes.io/path: bar-package/f2.yaml
name: bar
spec:
replicas: 3
@@ -183,7 +177,6 @@ metadata:
namespace: default
annotations:
app: nginx
config.kubernetes.io/package: .
config.kubernetes.io/path: f1.yaml
spec:
selector:

3
kyaml/kio/kioutil/kioutil.go
View File

@@ -20,9 +20,6 @@ const (
// PathAnnotation records the path to the file the Resource was read from
PathAnnotation AnnotationKey = "config.kubernetes.io/path"
// PackageAnnotation records the name of the package the Resource was read from
PackageAnnotation AnnotationKey = "config.kubernetes.io/package"
)
func GetFileAnnotations(rn *yaml.RNode) (string, string, error) {

1
kyaml/kio/pkgio_reader.go
View File

@@ -263,7 +263,6 @@ func (r *LocalPackageReader) initReaderAnnotations(path string, _ os.FileInfo) {
r.SetAnnotations = map[string]string{}
}
if !r.OmitReaderAnnotations {
r.SetAnnotations[kioutil.PackageAnnotation] = filepath.Dir(path)
r.SetAnnotations[kioutil.PathAnnotation] = path
}
}

15
kyaml/kio/pkgio_reader_test.go
View File

@@ -109,14 +109,12 @@ func TestLocalPackageReader_Read_pkg(t *testing.T) {
metadata:
annotations:
config.kubernetes.io/index: '0'
config.kubernetes.io/package: '.'
config.kubernetes.io/path: 'a_test.yaml'
`,
`c: d # second
metadata:
annotations:
config.kubernetes.io/index: '1'
config.kubernetes.io/package: '.'
config.kubernetes.io/path: 'a_test.yaml'
`,
`# second thing
@@ -128,7 +126,6 @@ g:
metadata:
annotations:
config.kubernetes.io/index: '0'
config.kubernetes.io/package: '.'
config.kubernetes.io/path: 'b_test.yaml'
`,
}
@@ -171,14 +168,12 @@ func TestLocalPackageReader_Read_file(t *testing.T) {
metadata:
annotations:
config.kubernetes.io/index: '0'
config.kubernetes.io/package: '.'
config.kubernetes.io/path: 'a_test.yaml'
`,
`c: d # second
metadata:
annotations:
config.kubernetes.io/index: '1'
config.kubernetes.io/package: '.'
config.kubernetes.io/path: 'a_test.yaml'
`,
}
@@ -270,14 +265,12 @@ func TestLocalPackageReader_Read_nestedDirs(t *testing.T) {
metadata:
annotations:
config.kubernetes.io/index: '0'
config.kubernetes.io/package: 'a${SEP}b'
config.kubernetes.io/path: 'a${SEP}b${SEP}a_test.yaml'
`,
`c: d # second
metadata:
annotations:
config.kubernetes.io/index: '1'
config.kubernetes.io/package: 'a${SEP}b'
config.kubernetes.io/path: 'a${SEP}b${SEP}a_test.yaml'
`,
`# second thing
@@ -289,7 +282,6 @@ g:
metadata:
annotations:
config.kubernetes.io/index: '0'
config.kubernetes.io/package: 'a${SEP}b'
config.kubernetes.io/path: 'a${SEP}b${SEP}b_test.yaml'
`,
}
@@ -328,14 +320,12 @@ func TestLocalPackageReader_Read_matchRegex(t *testing.T) {
metadata:
annotations:
config.kubernetes.io/index: '0'
config.kubernetes.io/package: 'a${SEP}b'
config.kubernetes.io/path: 'a${SEP}b${SEP}a_test.yaml'
`,
`c: d # second
metadata:
annotations:
config.kubernetes.io/index: '1'
config.kubernetes.io/package: 'a${SEP}b'
config.kubernetes.io/path: 'a${SEP}b${SEP}a_test.yaml'
`,
}
@@ -371,14 +361,12 @@ func TestLocalPackageReader_Read_skipSubpackage(t *testing.T) {
metadata:
annotations:
config.kubernetes.io/index: '0'
config.kubernetes.io/package: 'a${SEP}b'
config.kubernetes.io/path: 'a${SEP}b${SEP}a_test.yaml'
`,
`c: d # second
metadata:
annotations:
config.kubernetes.io/index: '1'
config.kubernetes.io/package: 'a${SEP}b'
config.kubernetes.io/path: 'a${SEP}b${SEP}a_test.yaml'
`,
}
@@ -414,14 +402,12 @@ func TestLocalPackageReader_Read_includeSubpackage(t *testing.T) {
metadata:
annotations:
config.kubernetes.io/index: '0'
config.kubernetes.io/package: 'a${SEP}b'
config.kubernetes.io/path: 'a${SEP}b${SEP}a_test.yaml'
`,
`c: d # second
metadata:
annotations:
config.kubernetes.io/index: '1'
config.kubernetes.io/package: 'a${SEP}b'
config.kubernetes.io/path: 'a${SEP}b${SEP}a_test.yaml'
`,
`# second thing
@@ -433,7 +419,6 @@ g:
metadata:
annotations:
config.kubernetes.io/index: '0'
config.kubernetes.io/package: 'a${SEP}c'
config.kubernetes.io/path: 'a${SEP}c${SEP}c_test.yaml'
`,
}

1
kyaml/kio/pkgio_writer.go
View File

@@ -58,7 +58,6 @@ func (r LocalPackageWriter) Write(nodes []*yaml.RNode) error {
}
if !r.KeepReaderAnnotations {
r.ClearAnnotations = append(r.ClearAnnotations, kioutil.PackageAnnotation)
r.ClearAnnotations = append(r.ClearAnnotations, kioutil.PathAnnotation)
}

2
kyaml/kio/tree.go
View File

@@ -258,7 +258,7 @@ func (p TreeWriter) index(nodes []*yaml.RNode) map[string][]*yaml.RNode {
// not a resource
continue
}
pkg := meta.Annotations[kioutil.PackageAnnotation]
pkg := filepath.Dir(meta.Annotations[kioutil.PathAnnotation])
indexByPackage[pkg] = append(indexByPackage[pkg], nodes[i])
}
return indexByPackage

42
kyaml/kio/tree_test.go
View File

@@ -21,8 +21,7 @@ metadata:
namespace: default
annotations:
app: nginx3
config.kubernetes.io/package: foo-package/3
config.kubernetes.io/path: f3.yaml
config.kubernetes.io/path: foo-package/3/f3.yaml
spec:
replicas: 1
---
@@ -34,8 +33,7 @@ metadata:
namespace: default
annotations:
app: nginx2
config.kubernetes.io/package: foo-package
config.kubernetes.io/path: f1.yaml
config.kubernetes.io/path: foo-package/f1.yaml
spec:
replicas: 1
---
@@ -45,8 +43,7 @@ metadata:
app: nginx
annotations:
app: nginx
config.kubernetes.io/package: bar-package
config.kubernetes.io/path: f2.yaml
config.kubernetes.io/path: bar-package/f2.yaml
name: bar
spec:
replicas: 3
@@ -57,8 +54,7 @@ metadata:
namespace: default
annotations:
app: nginx
config.kubernetes.io/package: foo-package
config.kubernetes.io/path: f1.yaml
config.kubernetes.io/path: foo-package/f1.yaml
spec:
selector:
app: nginx
@@ -94,7 +90,6 @@ metadata:
namespace: default
annotations:
app: nginx3
config.kubernetes.io/package: .
config.kubernetes.io/path: f3.yaml
spec:
replicas: 1
@@ -107,8 +102,7 @@ metadata:
namespace: default
annotations:
app: nginx2
config.kubernetes.io/package: foo-package
config.kubernetes.io/path: f1.yaml
config.kubernetes.io/path: foo-package/f1.yaml
spec:
replicas: 1
---
@@ -118,8 +112,8 @@ metadata:
app: nginx
annotations:
app: nginx
config.kubernetes.io/package: bar-package
config.kubernetes.io/path: f2.yaml
config.kubernetes.io/package:
config.kubernetes.io/path: bar-package/f2.yaml
name: bar
spec:
replicas: 3
@@ -167,7 +161,6 @@ metadata:
namespace: default
annotations:
app: nginx2
config.kubernetes.io/package: .
config.kubernetes.io/path: f1.yaml
spec:
replicas: 1
@@ -181,7 +174,6 @@ metadata:
namespace: default
annotations:
app: nginx2
config.kubernetes.io/package: .
config.kubernetes.io/path: f1.yaml
spec:
replicas: 1
@@ -195,7 +187,6 @@ metadata:
namespace: default
annotations:
app: nginx2
config.kubernetes.io/package: .
config.kubernetes.io/path: f1.yaml
spec:
replicas: 1
@@ -209,7 +200,6 @@ metadata:
namespace: default2
annotations:
app: nginx2
config.kubernetes.io/package: .
config.kubernetes.io/path: f1.yaml
spec:
replicas: 1
@@ -223,7 +213,6 @@ metadata:
namespace: default
annotations:
app: nginx3
config.kubernetes.io/package: .
config.kubernetes.io/path: f1.yaml
spec:
replicas: 1
@@ -234,8 +223,7 @@ metadata:
app: nginx
annotations:
app: nginx
config.kubernetes.io/package: bar-package
config.kubernetes.io/path: f2.yaml
config.kubernetes.io/path: bar-package/f2.yaml
name: bar
spec:
replicas: 3
@@ -246,7 +234,6 @@ metadata:
namespace: default
annotations:
app: nginx
config.kubernetes.io/package: .
config.kubernetes.io/path: f1.yaml
spec:
selector:
@@ -550,13 +537,12 @@ metadata:
}
if !assert.Equal(t, `
└──
├── [.] Service myapp-staging/cockroachdb
├── [.] StatefulSet myapp-staging/cockroachdb
├── [.] Pod myapp-staging/cockroachdb-0
├── [.] Pod myapp-staging/cockroachdb-1
├── [.] Pod myapp-staging/cockroachdb-2
└── [.] Application myapp-staging/myapp
├── [.] Service myapp-staging/cockroachdb
├── [.] StatefulSet myapp-staging/cockroachdb
├── [.] Pod myapp-staging/cockroachdb-0
├── [.] Pod myapp-staging/cockroachdb-1
├── [.] Pod myapp-staging/cockroachdb-2
└── [.] Application myapp-staging/myapp
`, out.String()) {
t.FailNow()
}