go.mod: bump client-go and api machinerie
I had to run `make generate`. Some API functions got additional parameters `Options` and `Context`. I used empty options and `context.TODO()` for now. Signed-off-by: leonnicolas <leonloechner@gmx.de>
This commit is contained in:
		
							
								
								
									
										6
									
								
								vendor/k8s.io/apimachinery/pkg/util/strategicpatch/patch.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								vendor/k8s.io/apimachinery/pkg/util/strategicpatch/patch.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -1014,7 +1014,7 @@ func validatePatchWithSetOrderList(patchList, setOrderList interface{}, mergeKey | ||||
| 		setOrderIndex++ | ||||
| 	} | ||||
| 	// If patchIndex is inbound but setOrderIndex if out of bound mean there are items mismatching between the patch list and setElementOrder list. | ||||
| 	// the second check is is a sanity check, and should always be true if the first is true. | ||||
| 	// the second check is a sanity check, and should always be true if the first is true. | ||||
| 	if patchIndex < len(nonDeleteList) && setOrderIndex >= len(typedSetOrderList) { | ||||
| 		return fmt.Errorf("The order in patch list:\n%v\n doesn't match %s list:\n%v\n", typedPatchList, setElementOrderDirectivePrefix, setOrderList) | ||||
| 	} | ||||
| @@ -1321,9 +1321,7 @@ func mergeMap(original, patch map[string]interface{}, schema LookupPatchMeta, me | ||||
| 		// Preserving the null value is useful when we want to send an explicit | ||||
| 		// delete to the API server. | ||||
| 		if patchV == nil { | ||||
| 			if _, ok := original[k]; ok { | ||||
| 				delete(original, k) | ||||
| 			} | ||||
| 			delete(original, k) | ||||
| 			if mergeOptions.IgnoreUnmatchedNulls { | ||||
| 				continue | ||||
| 			} | ||||
|   | ||||
		Reference in New Issue
	
	Block a user