From d78a799c1c6b275bf235abc4a248b9ef30f00fb5 Mon Sep 17 00:00:00 2001 From: Di Xu <stephenhsu90@gmail.com> Date: Sun, 15 Aug 2021 15:56:19 +0800 Subject: [PATCH] update kubectl module to always use JSON merge patch --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c4d1748..dd0d58f 100644 --- a/go.mod +++ b/go.mod @@ -19,5 +19,5 @@ replace ( k8s.io/apimachinery => k8s.io/apimachinery v0.21.2 k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.2 k8s.io/client-go => k8s.io/client-go v0.21.2 - k8s.io/kubectl => k8s.io/kubectl v0.21.2 + k8s.io/kubectl => github.com/clusternet/kubectl v0.21.3-0.20210815075235-5d7a0cea019f ) diff --git a/go.sum b/go.sum index 3acaaf6..dc89190 100644 --- a/go.sum +++ b/go.sum @@ -110,6 +110,8 @@ github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/clusternet/clusternet v0.3.1-0.20210811115638-49b2e28e6735 h1:18IRsBM03yk02TcHWDdQ9HCC04OcAfiDFUV0kZVGz28= github.com/clusternet/clusternet v0.3.1-0.20210811115638-49b2e28e6735/go.mod h1:RKlpW2fO8gWwU33aOnZOo+17CsLFkDhYSOl0aUC3qRo= +github.com/clusternet/kubectl v0.21.3-0.20210815075235-5d7a0cea019f h1:u2UOyvvyDQdnDEasfEWcZgrbUkL00rtl5UtlgRCyExQ= +github.com/clusternet/kubectl v0.21.3-0.20210815075235-5d7a0cea019f/go.mod h1:PgeUclpG8VVmmQIl8zpLar3IQEpFc9mrmvlwY3CK1xo= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= @@ -1095,8 +1097,6 @@ k8s.io/klog/v2 v2.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts= k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 h1:vEx13qjvaZ4yfObSSXW7BrMc/KQBBT/Jyee8XtLf4x0= k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= -k8s.io/kubectl v0.21.2 h1:9XPCetvOMDqrIZZXb1Ei+g8t6KrIp9ENJaysQjUuLiE= -k8s.io/kubectl v0.21.2/go.mod h1:PgeUclpG8VVmmQIl8zpLar3IQEpFc9mrmvlwY3CK1xo= k8s.io/metrics v0.21.2/go.mod h1:wzlOINZMCtWq8dR9gHlyaOemmYlOpAoldEIXE82gAhI= k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=