File tree Expand file tree Collapse file tree 1 file changed +33
-3
lines changed
api/filters/patchstrategicmerge Expand file tree Collapse file tree 1 file changed +33
-3
lines changed Original file line number Diff line number Diff line change @@ -852,7 +852,7 @@ metadata:
852
852
name: blabla
853
853
namespace: blabla-ns
854
854
data:
855
- "6443": "key-double-quoted "
855
+ "6443": "foobar "
856
856
` ,
857
857
patch : yaml .MustParse (`
858
858
apiVersion: v1
@@ -861,7 +861,7 @@ metadata:
861
861
name: blabla
862
862
namespace: blabla-ns
863
863
data:
864
- 6443: "key as int "
864
+ " 6443" : "barfoo "
865
865
'9110': "foo-foo"
866
866
` ),
867
867
expected : `
@@ -871,8 +871,38 @@ metadata:
871
871
name: blabla
872
872
namespace: blabla-ns
873
873
data:
874
- "6443": "key as int "
874
+ "6443": "barfoo "
875
875
'9110': "foo-foo"
876
+ ` ,
877
+ },
878
+
879
+ "different key types" : {
880
+ input : `
881
+ apiVersion: v1
882
+ kind: ConfigMap
883
+ metadata:
884
+ name: blabla
885
+ namespace: blabla-ns
886
+ data:
887
+ "6443": "key-string-double-quoted"
888
+ ` ,
889
+ patch : yaml .MustParse (`
890
+ apiVersion: v1
891
+ kind: ConfigMap
892
+ metadata:
893
+ name: blabla
894
+ namespace: blabla-ns
895
+ data:
896
+ 6443: "key-int"
897
+ ` ),
898
+ expected : `
899
+ apiVersion: v1
900
+ kind: ConfigMap
901
+ metadata:
902
+ name: blabla
903
+ namespace: blabla-ns
904
+ data:
905
+ "6443": "key-int"
876
906
` ,
877
907
},
878
908
}
You can’t perform that action at this time.
0 commit comments