Delete unused unstruct code.

This commit is contained in:
Jeffrey Regan
2018-10-05 12:39:45 -07:00
parent 73e28ca556
commit 3b86e64faf
2 changed files with 0 additions and 56 deletions

View File

@@ -18,7 +18,6 @@ limitations under the License.
package configmapandsecret
import (
"encoding/json"
"fmt"
"path"
"strings"
@@ -26,9 +25,6 @@ import (
"github.com/pkg/errors"
"k8s.io/api/core/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/validation"
"sigs.k8s.io/kustomize/pkg/fs"
"sigs.k8s.io/kustomize/pkg/loader"
@@ -47,28 +43,6 @@ func NewConfigMapFactory(
return &ConfigMapFactory{fSys: fSys, ldr: l}
}
// MakeUnstruct returns an configmap in unstructured representation.
func (f *ConfigMapFactory) MakeUnstruct(
args *types.ConfigMapArgs) (*unstructured.Unstructured, error) {
cm, err := f.MakeConfigMap(args)
if err != nil {
return nil, err
}
unstructuredCM, err := objectToUnstructured(cm)
return unstructuredCM, err
}
func objectToUnstructured(in runtime.Object) (*unstructured.Unstructured, error) {
marshaled, err := json.Marshal(in)
if err != nil {
return nil, err
}
var out unstructured.Unstructured
err = out.UnmarshalJSON(marshaled)
out.SetCreationTimestamp(metav1.Time{})
return &out, err
}
func (f *ConfigMapFactory) makeFreshConfigMap(
args *types.ConfigMapArgs) *corev1.ConfigMap {
cm := &corev1.ConfigMap{}

View File

@@ -148,33 +148,3 @@ func TestConstructConfigMap(t *testing.T) {
}
}
}
func TestObjectConvertToUnstructured(t *testing.T) {
type testCase struct {
description string
input *corev1.ConfigMap
expected *unstructured.Unstructured
}
testCases := []testCase{
{
description: "convert config map",
input: makeEnvConfigMap("envConfigMap"),
expected: makeUnstructuredEnvConfigMap("envConfigMap"),
},
{
description: "convert secret",
input: makeEnvConfigMap("envSecret"),
expected: makeUnstructuredEnvConfigMap("envSecret"),
},
}
for _, tc := range testCases {
actual, err := objectToUnstructured(tc.input)
if err != nil {
t.Fatalf("%s: unexpected error: %v", tc.description, err)
}
if !reflect.DeepEqual(actual, tc.expected) {
t.Fatalf("%s: %#v\ndoesn't match expected\n%#v\n", tc.description, actual, tc.expected)
}
}
}