diff --git a/go.mod b/go.mod index d2dbe697..ec613238 100644 --- a/go.mod +++ b/go.mod @@ -32,7 +32,7 @@ require ( k8s.io/api v0.0.0-20220916032116-c98ebf18d366 k8s.io/apimachinery v0.0.0-20220919104142-612703ed13bf k8s.io/cli-runtime v0.0.0-20220909232940-d79a93cec812 - k8s.io/client-go v0.0.0-20220919105647-acfaa39399db + k8s.io/client-go v0.0.0-20220919184700-b6e72dce2814 k8s.io/component-base v0.0.0-20220919111118-ebe9a64d31a1 k8s.io/component-helpers v0.0.0-20220919111453-c3262473b8cd k8s.io/klog/v2 v2.80.1 @@ -96,7 +96,7 @@ replace ( k8s.io/api => k8s.io/api v0.0.0-20220916032116-c98ebf18d366 k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220919104142-612703ed13bf k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20220909232940-d79a93cec812 - k8s.io/client-go => k8s.io/client-go v0.0.0-20220919105647-acfaa39399db + k8s.io/client-go => k8s.io/client-go v0.0.0-20220919184700-b6e72dce2814 k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220919103714-b54a056c2b87 k8s.io/component-base => k8s.io/component-base v0.0.0-20220919111118-ebe9a64d31a1 k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220919111453-c3262473b8cd diff --git a/go.sum b/go.sum index d56c2b36..a6660a4e 100644 --- a/go.sum +++ b/go.sum @@ -549,8 +549,8 @@ k8s.io/apimachinery v0.0.0-20220919104142-612703ed13bf h1:DqaEXPQPvHjswRaBllqESF k8s.io/apimachinery v0.0.0-20220919104142-612703ed13bf/go.mod h1:cDOY42/LxGj6qgx5SDz+nj31Q2Thcdcq0BhBZAocaEY= k8s.io/cli-runtime v0.0.0-20220909232940-d79a93cec812 h1:mbNy/DNFTZhwURg5iq1SgGqcVJPtVCd5Ye8dnmP0WKg= k8s.io/cli-runtime v0.0.0-20220909232940-d79a93cec812/go.mod h1:VNSlkRvUTUdIfrZikvh+1F0uJyRlLclE7JwYraYvIMk= -k8s.io/client-go v0.0.0-20220919105647-acfaa39399db h1:/uqi3vpIjaXmVyNSNp1WXJ2DnQplK8frf17pShZuBVo= -k8s.io/client-go v0.0.0-20220919105647-acfaa39399db/go.mod h1:Hxvu1YDSNPtbVEc8cPWCqSI5g45QtT8f6Z+BSuJklvA= +k8s.io/client-go v0.0.0-20220919184700-b6e72dce2814 h1:0hiN1W5eOHXAd6HujAvCI5pKUV1O3dGkCobTxPQxxDk= +k8s.io/client-go v0.0.0-20220919184700-b6e72dce2814/go.mod h1:Hxvu1YDSNPtbVEc8cPWCqSI5g45QtT8f6Z+BSuJklvA= k8s.io/component-base v0.0.0-20220919111118-ebe9a64d31a1 h1:0WcjVTLbiRLFQOQD9ywMSpVuLX950S52U1VGGXdYeBY= k8s.io/component-base v0.0.0-20220919111118-ebe9a64d31a1/go.mod h1:0xsQ70gY+fwfAWX2I0nwD9sSSpMmDRTGhIDyKG6l+1E= k8s.io/component-helpers v0.0.0-20220919111453-c3262473b8cd h1:8EKCkeAlRDs4k01fW9bWKSSuSVgW+IU+V2DukqwTgHs= diff --git a/pkg/cmd/patch/patch.go b/pkg/cmd/patch/patch.go index fa417795..1ee8bede 100644 --- a/pkg/cmd/patch/patch.go +++ b/pkg/cmd/patch/patch.go @@ -80,7 +80,9 @@ var ( patchLong = templates.LongDesc(i18n.T(` Update fields of a resource using strategic merge patch, a JSON merge patch, or a JSON patch. - JSON and YAML formats are accepted.`)) + JSON and YAML formats are accepted. + + Note: Strategic merge patch is not supported for custom resources.`)) patchExample = templates.Examples(i18n.T(` # Partially update a node using a strategic merge patch, specifying the patch as JSON