From 9599deb9c02538f7bd149326d8bcd7c3fe2abfd9 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Thu, 11 Mar 2021 00:18:36 -0800 Subject: [PATCH] Merge pull request #99759 from jpbetz/apply-extract Add Extract support to client-go apply builders Kubernetes-commit: eb0c118a9d7a15801ec0389448a5e1bffdaa5e72 --- Godeps/Godeps.json | 10 +++++----- go.mod | 17 ++++++++--------- go.sum | 4 ++++ 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index cfcacff8..a16f54b4 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -476,19 +476,19 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "a61f0c601351" + "Rev": "937dc44c61ed" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "79c4f8795d25" + "Rev": "ae8b5f5092d3" }, { "ImportPath": "k8s.io/client-go", - "Rev": "57d5462f1c4c" + "Rev": "a5722b416f4b" }, { "ImportPath": "k8s.io/code-generator", - "Rev": "24be182ad6d3" + "Rev": "e0b5c433e941" }, { "ImportPath": "k8s.io/gengo", @@ -520,7 +520,7 @@ }, { "ImportPath": "sigs.k8s.io/structured-merge-diff/v4", - "Rev": "v4.0.3" + "Rev": "v4.1.0" }, { "ImportPath": "sigs.k8s.io/yaml", diff --git a/go.mod b/go.mod index 3388ee45..46eb2085 100644 --- a/go.mod +++ b/go.mod @@ -5,17 +5,16 @@ module k8s.io/sample-controller go 1.16 require ( - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 - k8s.io/client-go v0.0.0 - k8s.io/code-generator v0.0.0 + k8s.io/api v0.0.0-20210311104205-937dc44c61ed + k8s.io/apimachinery v0.0.0-20210311104009-ae8b5f5092d3 + k8s.io/client-go v0.0.0-20210311104446-a5722b416f4b + k8s.io/code-generator v0.0.0-20210311103818-e0b5c433e941 k8s.io/klog/v2 v2.5.0 ) replace ( - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery - k8s.io/client-go => ../client-go - k8s.io/code-generator => ../code-generator - k8s.io/sample-controller => ../sample-controller + k8s.io/api => k8s.io/api v0.0.0-20210311104205-937dc44c61ed + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210311104009-ae8b5f5092d3 + k8s.io/client-go => k8s.io/client-go v0.0.0-20210311104446-a5722b416f4b + k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210311103818-e0b5c433e941 ) diff --git a/go.sum b/go.sum index e6da5dc6..d8bcdbb8 100644 --- a/go.sum +++ b/go.sum @@ -435,6 +435,10 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +k8s.io/api v0.0.0-20210311104205-937dc44c61ed/go.mod h1:fBm3nnQpHs9bXI2wLxPEGrgE+lhrp177vcMQZ1Zb8oM= +k8s.io/apimachinery v0.0.0-20210311104009-ae8b5f5092d3/go.mod h1:T3Fbijal+WETuz3BPSk16GRvUbbkYt4EQFBM0fChi9E= +k8s.io/client-go v0.0.0-20210311104446-a5722b416f4b/go.mod h1:Rsco1mHlzJQhaMEtEVwRSmYUn1oFuLX2++I/opKKTbY= +k8s.io/code-generator v0.0.0-20210311103818-e0b5c433e941/go.mod h1:H4R6Xh45BkkO6F8FT/h5o9XWZaxQw5JI0NovBmftTA4= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 h1:Uusb3oh8XcdzDF/ndlI4ToKTYVlkCSJP39SRY2mfRAw= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=