kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-12 01:14:22 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

decouple configmapandsecret and hash packages

Browse Source
This commit is contained in:
Jingfang Liu
2018-10-04 16:17:23 -07:00
parent 51ece9412e
commit a9cf1975ca
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/commands/edit/add/configmap.go
View File

@@ -115,7 +115,7 @@ func addConfigMap(
return err return err
} }
// Validate by trying to create corev1.configmap. // Validate by trying to create corev1.configmap.
_, _, err = factory.MakeUnstructAndGenerateName(cmArgs) _, err = factory.MakeConfigMap(cmArgs)
if err != nil { if err != nil {
return err return err
} }

16
pkg/configmapandsecret/configmapfactory.go
View File

@@ -31,7 +31,6 @@ import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation"
"sigs.k8s.io/kustomize/pkg/fs" "sigs.k8s.io/kustomize/pkg/fs"
"sigs.k8s.io/kustomize/pkg/hash"
"sigs.k8s.io/kustomize/pkg/loader" "sigs.k8s.io/kustomize/pkg/loader"
"sigs.k8s.io/kustomize/pkg/types" "sigs.k8s.io/kustomize/pkg/types"
) )
@@ -48,20 +47,15 @@ func NewConfigMapFactory(
return &ConfigMapFactory{fSys: fSys, ldr: l} return &ConfigMapFactory{fSys: fSys, ldr: l}
} }
// MakeUnstructAndGenerateName returns an configmap and the name appended with a hash. // MakeUnstruct returns an configmap in unstructured representation.
func (f *ConfigMapFactory) MakeUnstructAndGenerateName( func (f *ConfigMapFactory) MakeUnstruct(
args *types.ConfigMapArgs) (*unstructured.Unstructured, string, error) { args *types.ConfigMapArgs) (*unstructured.Unstructured, error) {
cm, err := f.MakeConfigMap(args) cm, err := f.MakeConfigMap(args)
if err != nil { if err != nil {
return nil, "", err return nil, err
} }
h, err := hash.ConfigMapHash(cm)
if err != nil {
return nil, "", err
}
nameWithHash := fmt.Sprintf("%s-%s", cm.GetName(), h)
unstructuredCM, err := objectToUnstructured(cm) unstructuredCM, err := objectToUnstructured(cm)
return unstructuredCM, nameWithHash, err return unstructuredCM, err
} }
func objectToUnstructured(in runtime.Object) (*unstructured.Unstructured, error) { func objectToUnstructured(in runtime.Object) (*unstructured.Unstructured, error) {