diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index e20ee817e..27a6f57e0 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -988,7 +988,7 @@ }, { "ImportPath": "k8s.io/client-go", - "Rev": "caa2ddeb897a" + "Rev": "09dbda0b387f" }, { "ImportPath": "k8s.io/code-generator", diff --git a/go.mod b/go.mod index ea76edeaf..906f1744c 100644 --- a/go.mod +++ b/go.mod @@ -34,7 +34,7 @@ require ( k8s.io/api v0.0.0-20210601194609-0b55fc9ab6bb k8s.io/apimachinery v0.0.0-20210601194424-1e82f3b632c6 k8s.io/cli-runtime v0.0.0-20210601200804-6ac34f0f28df - k8s.io/client-go v0.0.0-20210601194840-caa2ddeb897a + k8s.io/client-go v0.0.0-20210602034813-09dbda0b387f k8s.io/component-base v0.0.0-20210601195404-4ceecfef9988 k8s.io/component-helpers v0.0.0-20210601195503-8f7f89d23351 k8s.io/klog/v2 v2.9.0 @@ -50,7 +50,7 @@ replace ( k8s.io/api => k8s.io/api v0.0.0-20210601194609-0b55fc9ab6bb k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210601194424-1e82f3b632c6 k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20210601200804-6ac34f0f28df - k8s.io/client-go => k8s.io/client-go v0.0.0-20210601194840-caa2ddeb897a + k8s.io/client-go => k8s.io/client-go v0.0.0-20210602034813-09dbda0b387f k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210601194243-9c11f9272960 k8s.io/component-base => k8s.io/component-base v0.0.0-20210601195404-4ceecfef9988 k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20210601195503-8f7f89d23351 diff --git a/go.sum b/go.sum index 8ef947855..dd9860b4f 100644 --- a/go.sum +++ b/go.sum @@ -676,8 +676,8 @@ k8s.io/apimachinery v0.0.0-20210601194424-1e82f3b632c6 h1:35RqwIXLWAA4pK39d4FVRK k8s.io/apimachinery v0.0.0-20210601194424-1e82f3b632c6/go.mod h1:+4qqXWg4CfY9knLAQ+WV7EjNplTpQ0Ima2Q27TU3u+c= k8s.io/cli-runtime v0.0.0-20210601200804-6ac34f0f28df h1:d52h4t6UGvYe771mDXTY6kNyobftsZ5fxHOf5CMKJ1c= k8s.io/cli-runtime v0.0.0-20210601200804-6ac34f0f28df/go.mod h1:WcGYV6H5AtLROMf6coQd0dmxdWJUitmPUdAevW2L8CU= -k8s.io/client-go v0.0.0-20210601194840-caa2ddeb897a h1:8aaHpDqqqU8qVysm/l4kcAP83SPFW30cZj6acYkn0RE= -k8s.io/client-go v0.0.0-20210601194840-caa2ddeb897a/go.mod h1:bUYhQAQPUTfTS7ozpIcUUF1OTXYj5DKVSOnL19dWl10= +k8s.io/client-go v0.0.0-20210602034813-09dbda0b387f h1:EMw9ViGOUCZwbQJ0I0rA+zZ3Eg4c30nbxV+HmrLH+No= +k8s.io/client-go v0.0.0-20210602034813-09dbda0b387f/go.mod h1:bUYhQAQPUTfTS7ozpIcUUF1OTXYj5DKVSOnL19dWl10= k8s.io/code-generator v0.0.0-20210601194243-9c11f9272960/go.mod h1:FSpIt1knsWe0QNfwrAq7+M1/AhwWXHWKjsbbfeeW+N4= k8s.io/component-base v0.0.0-20210601195404-4ceecfef9988 h1:KJ6MfMyZ9VqEhcLiFKVyBjNPY9QgcjYI6ZRdvm/Ek6s= k8s.io/component-base v0.0.0-20210601195404-4ceecfef9988/go.mod h1:2WZUc89fIx0SVZdEMOAk/C4nCWsz60y9ttdZpgxuEfU= diff --git a/pkg/scheme/sparse_test.go b/pkg/scheme/sparse_test.go index b0d4201ec..0ebca6f90 100644 --- a/pkg/scheme/sparse_test.go +++ b/pkg/scheme/sparse_test.go @@ -20,7 +20,6 @@ import ( "testing" "k8s.io/api/batch/v1" - "k8s.io/api/batch/v1beta1" "k8s.io/apimachinery/pkg/api/equality" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -28,9 +27,9 @@ import ( ) func TestCronJob(t *testing.T) { - src := &v1beta1.CronJob{ObjectMeta: metav1.ObjectMeta{Name: "foo"}} + src := &v1.CronJob{ObjectMeta: metav1.ObjectMeta{Name: "foo"}} - encoder := Codecs.LegacyCodec(v1.SchemeGroupVersion, v1beta1.SchemeGroupVersion) + encoder := Codecs.LegacyCodec(v1.SchemeGroupVersion) cronjobBytes, err := runtime.Encode(encoder, src) if err != nil { t.Fatal(err) @@ -46,7 +45,7 @@ func TestCronJob(t *testing.T) { } // clear typemeta - uncastDst.(*v1beta1.CronJob).TypeMeta = metav1.TypeMeta{} + uncastDst.(*v1.CronJob).TypeMeta = metav1.TypeMeta{} if !equality.Semantic.DeepEqual(src, uncastDst) { t.Fatal(diff.ObjectDiff(src, uncastDst))