mirror of
https://github.com/kubernetes-sigs/kustomize.git
synced 2026-05-17 18:25:26 +00:00
Fix some nits.
This commit is contained in:
@@ -19,7 +19,7 @@ git:
|
||||
language: go
|
||||
|
||||
go:
|
||||
- 1.12
|
||||
- "1.12"
|
||||
|
||||
go_import_path: sigs.k8s.io/kustomize
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ The _inventory_ ConfigMap contains two special annotations:
|
||||
"version":"v1",
|
||||
"kind":"Deployment",
|
||||
"name":"mysql",
|
||||
"namespace":"default",
|
||||
"namespace":"default"
|
||||
}
|
||||
],
|
||||
"~G_v1_Service|default|mysql":null
|
||||
|
||||
@@ -1,18 +1,5 @@
|
||||
/*
|
||||
Copyright 2019 The Kubernetes Authors.
|
||||
|
||||
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.
|
||||
*/
|
||||
// Copyright 2019 The Kubernetes Authors.
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package inventory
|
||||
|
||||
@@ -85,7 +72,7 @@ func (o *inventoryTransformer) Transform(m resmap.ResMap) error {
|
||||
opts := &types.GeneratorOptions{
|
||||
Annotations: make(map[string]string),
|
||||
}
|
||||
opts.Annotations[inventory.InventoryHashAnnotation] = h
|
||||
opts.Annotations[inventory.HashAnnotation] = h
|
||||
err = invty.UpdateAnnotations(opts.Annotations)
|
||||
if err != nil {
|
||||
return err
|
||||
|
||||
@@ -1,25 +1,12 @@
|
||||
/*
|
||||
Copyright 2019 The Kubernetes Authors.
|
||||
|
||||
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.
|
||||
*/
|
||||
// Copyright 2019 The Kubernetes Authors.
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package inventory
|
||||
|
||||
const (
|
||||
// the annotation for inventory hash
|
||||
InventoryHashAnnotation = "kustomize.config.k8s.io/InventoryHash"
|
||||
// Annotation that contains the inventory content.
|
||||
ContentAnnotation = "kustomize.config.k8s.io/Inventory"
|
||||
|
||||
// the annotation that contains the inventory information
|
||||
InventoryAnnotation = "kustomize.config.k8s.io/Inventory"
|
||||
// Annotation for inventory content hash.
|
||||
HashAnnotation = "kustomize.config.k8s.io/InventoryHash"
|
||||
)
|
||||
|
||||
@@ -1,18 +1,5 @@
|
||||
/*
|
||||
Copyright 2019 The Kubernetes Authors.
|
||||
|
||||
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.
|
||||
*/
|
||||
// Copyright 2019 The Kubernetes Authors.
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package inventory
|
||||
|
||||
@@ -234,13 +221,13 @@ func (a *Inventory) UpdateAnnotations(annot map[string]string) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
annot[InventoryAnnotation] = string(data)
|
||||
annot[ContentAnnotation] = string(data)
|
||||
return nil
|
||||
}
|
||||
|
||||
// LoadFromAnnotation loads the Inventory date from the annotation map
|
||||
func (a *Inventory) LoadFromAnnotation(annot map[string]string) error {
|
||||
value, ok := annot[InventoryAnnotation]
|
||||
value, ok := annot[ContentAnnotation]
|
||||
if ok {
|
||||
return a.unMarshal([]byte(value))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user