kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-10 08:20:59 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Fix some nits.

Browse Source
This commit is contained in:
jregan
2019-05-20 19:56:07 -07:00
parent a2d4423630
commit b92ee25696
5 changed files with 15 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -19,7 +19,7 @@ git:
language: go language: go
go: go:
- 1.12 - "1.12"
go_import_path: sigs.k8s.io/kustomize go_import_path: sigs.k8s.io/kustomize

2
docs/inventory_object.md
View File

@@ -42,7 +42,7 @@ The _inventory_ ConfigMap contains two special annotations:
"version":"v1", "version":"v1",
"kind":"Deployment", "kind":"Deployment",
"name":"mysql", "name":"mysql",
"namespace":"default", "namespace":"default"
} }
], ],
"~G_v1_Service|default|mysql":null "~G_v1_Service|default|mysql":null

19
k8sdeps/transformer/inventory/inventory.go
View File

@@ -1,18 +1,5 @@
/* // Copyright 2019 The Kubernetes Authors.
Copyright 2019 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package inventory package inventory
@@ -85,7 +72,7 @@ func (o *inventoryTransformer) Transform(m resmap.ResMap) error {
opts := &types.GeneratorOptions{ opts := &types.GeneratorOptions{
Annotations: make(map[string]string), Annotations: make(map[string]string),
} }
opts.Annotations[inventory.InventoryHashAnnotation] = h opts.Annotations[inventory.HashAnnotation] = h
err = invty.UpdateAnnotations(opts.Annotations) err = invty.UpdateAnnotations(opts.Annotations)
if err != nil { if err != nil {
return err return err

25
pkg/inventory/constants.go
View File

@@ -1,25 +1,12 @@
/* // Copyright 2019 The Kubernetes Authors.
Copyright 2019 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package inventory package inventory
const ( const (
// the annotation for inventory hash // Annotation that contains the inventory content.
InventoryHashAnnotation = "kustomize.config.k8s.io/InventoryHash" ContentAnnotation = "kustomize.config.k8s.io/Inventory"
// the annotation that contains the inventory information // Annotation for inventory content hash.
InventoryAnnotation = "kustomize.config.k8s.io/Inventory" HashAnnotation = "kustomize.config.k8s.io/InventoryHash"
) )

21
pkg/inventory/inventory.go
View File

@@ -1,18 +1,5 @@
/* // Copyright 2019 The Kubernetes Authors.
Copyright 2019 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package inventory package inventory
@@ -234,13 +221,13 @@ func (a *Inventory) UpdateAnnotations(annot map[string]string) error {
if err != nil { if err != nil {
return err return err
} }
annot[InventoryAnnotation] = string(data) annot[ContentAnnotation] = string(data)
return nil return nil
} }
// LoadFromAnnotation loads the Inventory date from the annotation map // LoadFromAnnotation loads the Inventory date from the annotation map
func (a *Inventory) LoadFromAnnotation(annot map[string]string) error { func (a *Inventory) LoadFromAnnotation(annot map[string]string) error {
value, ok := annot[InventoryAnnotation] value, ok := annot[ContentAnnotation]
if ok { if ok {
return a.unMarshal([]byte(value)) return a.unMarshal([]byte(value))
} }