mirror of
				https://github.com/k3s-io/kubernetes.git
				synced 2025-10-31 05:40:42 +00:00 
			
		
		
		
	- Add DetectConflictor interface on Element level. Implemented it for particular elements. - If Options.FailOnConflict is enabled, Merge will detect conflict by invoking doConflictDecect for particular element, returning ConflictError with details. - Add tests, including use case examples and illustration. For example: list, map, and complicated combination.
		
			
				
	
	
		
			37 lines
		
	
	
		
			825 B
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			37 lines
		
	
	
		
			825 B
		
	
	
	
		
			Python
		
	
	
	
	
	
| load("@io_bazel_rules_go//go:def.bzl", "go_library")
 | |
| 
 | |
| go_library(
 | |
|     name = "go_default_library",
 | |
|     srcs = [
 | |
|         "doc.go",
 | |
|         "element.go",
 | |
|         "empty_element.go",
 | |
|         "error.go",
 | |
|         "list_element.go",
 | |
|         "map_element.go",
 | |
|         "primitive_element.go",
 | |
|         "type_element.go",
 | |
|         "visitor.go",
 | |
|     ],
 | |
|     importpath = "k8s.io/kubernetes/pkg/kubectl/apply",
 | |
|     visibility = ["//visibility:public"],
 | |
| )
 | |
| 
 | |
| filegroup(
 | |
|     name = "package-srcs",
 | |
|     srcs = glob(["**"]),
 | |
|     tags = ["automanaged"],
 | |
|     visibility = ["//visibility:private"],
 | |
| )
 | |
| 
 | |
| filegroup(
 | |
|     name = "all-srcs",
 | |
|     srcs = [
 | |
|         ":package-srcs",
 | |
|         "//pkg/kubectl/apply/parse:all-srcs",
 | |
|         "//pkg/kubectl/apply/strategy:all-srcs",
 | |
|     ],
 | |
|     tags = ["automanaged"],
 | |
|     visibility = ["//visibility:public"],
 | |
| )
 |