Merge pull request #3397 from monopole/towards3304

Drop another difference between kyaml and apimachinery
This commit is contained in:
Jeff Regan
2020-12-26 10:32:50 -08:00
committed by GitHub

View File

@@ -11,7 +11,6 @@ import (
"testing" "testing"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"sigs.k8s.io/kustomize/api/konfig"
"sigs.k8s.io/kustomize/api/provider" "sigs.k8s.io/kustomize/api/provider"
"sigs.k8s.io/kustomize/api/resid" "sigs.k8s.io/kustomize/api/resid"
. "sigs.k8s.io/kustomize/api/resmap" . "sigs.k8s.io/kustomize/api/resmap"
@@ -694,10 +693,6 @@ func TestAbsorbAll(t *testing.T) {
metadata := map[string]interface{}{ metadata := map[string]interface{}{
"name": "cmap", "name": "cmap",
} }
if !konfig.FlagEnableKyamlDefaultValue {
metadata["annotations"] = map[string]interface{}{}
metadata["labels"] = map[string]interface{}{}
}
expected := rmF.FromResource(rf.FromMapAndOption( expected := rmF.FromResource(rf.FromMapAndOption(
map[string]interface{}{ map[string]interface{}{
"apiVersion": "apps/v1", "apiVersion": "apps/v1",