From 165758e3a7140bd0dd0da3deb124c6c838826268 Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Wed, 23 Nov 2022 14:29:52 +0530 Subject: [PATCH] rebase: update the kube dependencies to v1.25.4 this commit update the kube dependencies to latest v1.25.4. Signed-off-by: Humble Chirammal --- go.mod | 64 ++++++++-------- go.sum | 54 ++++++------- .../pkg/apis/meta/v1/micro_time_proto.go | 10 ++- .../pkg/controller/controller_utils.go | 11 ++- .../k8s.io/kubernetes/pkg/volume/util/util.go | 29 ++++++- .../test/e2e/framework/nodes_util.go | 2 +- .../kubernetes/test/utils/image/manifest.go | 2 +- vendor/modules.txt | 76 +++++++++---------- 8 files changed, 140 insertions(+), 108 deletions(-) diff --git a/go.mod b/go.mod index ef63c8724..2e1928d9f 100644 --- a/go.mod +++ b/go.mod @@ -35,13 +35,13 @@ require ( k8s.io/api v0.25.4 k8s.io/apimachinery v0.25.4 k8s.io/client-go v12.0.0+incompatible - k8s.io/cloud-provider v0.25.3 + k8s.io/cloud-provider v0.25.4 k8s.io/klog/v2 v2.80.1 // // when updating k8s.io/kubernetes, make sure to update the replace section too // - k8s.io/kubernetes v1.25.3 - k8s.io/mount-utils v0.25.3 + k8s.io/kubernetes v1.25.4 + k8s.io/mount-utils v0.25.4 k8s.io/pod-security-admission v0.0.0 k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 sigs.k8s.io/controller-runtime v0.11.0-beta.0.0.20211208212546-f236f0345ad2 @@ -159,10 +159,10 @@ require ( gopkg.in/square/go-jose.v2 v2.5.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/apiextensions-apiserver v0.25.3 // indirect - k8s.io/apiserver v0.25.3 // indirect - k8s.io/component-base v0.25.3 // indirect - k8s.io/component-helpers v0.25.3 // indirect + k8s.io/apiextensions-apiserver v0.25.4 // indirect + k8s.io/apiserver v0.25.4 // indirect + k8s.io/component-base v0.25.4 // indirect + k8s.io/component-helpers v0.25.4 // indirect k8s.io/kube-openapi v0.0.0-20220803164354-a70c9af30aea // indirect k8s.io/kubectl v0.0.0 // indirect k8s.io/kubelet v0.0.0 // indirect @@ -180,31 +180,31 @@ replace ( // // k8s.io/kubernetes depends on these k8s.io packages, but unversioned // - k8s.io/api => k8s.io/api v0.25.3 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.3 - k8s.io/apimachinery => k8s.io/apimachinery v0.25.3 - k8s.io/apiserver => k8s.io/apiserver v0.25.3 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.3 - k8s.io/client-go => k8s.io/client-go v0.25.3 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.3 - k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.3 - k8s.io/code-generator => k8s.io/code-generator v0.25.3 - k8s.io/component-base => k8s.io/component-base v0.25.3 - k8s.io/component-helpers => k8s.io/component-helpers v0.25.3 - k8s.io/controller-manager => k8s.io/controller-manager v0.25.3 - k8s.io/cri-api => k8s.io/cri-api v0.25.3 - k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.3 - k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.3 - k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.3 - k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.3 - k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.3 - k8s.io/kubectl => k8s.io/kubectl v0.25.3 - k8s.io/kubelet => k8s.io/kubelet v0.25.3 - k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.3 - k8s.io/metrics => k8s.io/metrics v0.25.3 - k8s.io/mount-utils => k8s.io/mount-utils v0.25.3 - k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.3 - k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.3 + k8s.io/api => k8s.io/api v0.25.4 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.4 + k8s.io/apimachinery => k8s.io/apimachinery v0.25.4 + k8s.io/apiserver => k8s.io/apiserver v0.25.4 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.4 + k8s.io/client-go => k8s.io/client-go v0.25.4 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.4 + k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.4 + k8s.io/code-generator => k8s.io/code-generator v0.25.4 + k8s.io/component-base => k8s.io/component-base v0.25.4 + k8s.io/component-helpers => k8s.io/component-helpers v0.25.4 + k8s.io/controller-manager => k8s.io/controller-manager v0.25.4 + k8s.io/cri-api => k8s.io/cri-api v0.25.4 + k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.4 + k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.4 + k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.4 + k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.4 + k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.4 + k8s.io/kubectl => k8s.io/kubectl v0.25.4 + k8s.io/kubelet => k8s.io/kubelet v0.25.4 + k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.4 + k8s.io/metrics => k8s.io/metrics v0.25.4 + k8s.io/mount-utils => k8s.io/mount-utils v0.25.4 + k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.4 + k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.4 // layeh.com seems to be misbehaving layeh.com/radius => github.com/layeh/radius v0.0.0-20190322222518-890bc1058917 ) diff --git a/go.sum b/go.sum index e4a52bfec..0a747476a 100644 --- a/go.sum +++ b/go.sum @@ -1688,23 +1688,23 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh 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= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.25.3 h1:Q1v5UFfYe87vi5H7NU0p4RXC26PPMT8KOpr1TLQbCMQ= -k8s.io/api v0.25.3/go.mod h1:o42gKscFrEVjHdQnyRenACrMtbuJsVdP+WVjqejfzmI= -k8s.io/apiextensions-apiserver v0.25.3 h1:bfI4KS31w2f9WM1KLGwnwuVlW3RSRPuIsfNF/3HzR0k= -k8s.io/apiextensions-apiserver v0.25.3/go.mod h1:ZJqwpCkxIx9itilmZek7JgfUAM0dnTsA48I4krPqRmo= -k8s.io/apimachinery v0.25.3 h1:7o9ium4uyUOM76t6aunP0nZuex7gDf8VGwkR5RcJnQc= -k8s.io/apimachinery v0.25.3/go.mod h1:jaF9C/iPNM1FuLl7Zuy5b9v+n35HGSh6AQ4HYRkCqwo= -k8s.io/apiserver v0.25.3 h1:m7+xGuG5+KYAnEsqaFtDyWMkmMMEOFYlu+NlWv5qSBI= -k8s.io/apiserver v0.25.3/go.mod h1:9bT47iM2fzRuhICJpM/RcQR9sqDDfZ7Yw60h0p3JW08= -k8s.io/client-go v0.25.3 h1:oB4Dyl8d6UbfDHD8Bv8evKylzs3BXzzufLiO27xuPs0= -k8s.io/client-go v0.25.3/go.mod h1:t39LPczAIMwycjcXkVc+CB+PZV69jQuNx4um5ORDjQA= -k8s.io/cloud-provider v0.25.3 h1:1X1BKXm0fp8/ZkaQKNDyWqgh6t7m9O5MDSbO9OA4muk= -k8s.io/cloud-provider v0.25.3/go.mod h1:P7TjzjbkqW3C0NAT1bNEZrZRifNNBVhrTb+iHRjfFz0= -k8s.io/code-generator v0.25.3/go.mod h1:9F5fuVZOMWRme7MYj2YT3L9ropPWPokd9VRhVyD3+0w= -k8s.io/component-base v0.25.3 h1:UrsxciGdrCY03ULT1h/S/gXFCOPnLhUVwSyx+hM/zq4= -k8s.io/component-base v0.25.3/go.mod h1:WYoS8L+IlTZgU7rhAl5Ctpw0WdMxDfCC5dkxcEFa/TI= -k8s.io/component-helpers v0.25.3 h1:Ldwi2U50KohMVDKBcVT3zDpIOKFP4bPEy/4Dj4NsoYU= -k8s.io/component-helpers v0.25.3/go.mod h1:yu9zgPm9pf5jpmUzOZA9PMHY16Eu8ymt8AnSL0Xwbgw= +k8s.io/api v0.25.4 h1:3YO8J4RtmG7elEgaWMb4HgmpS2CfY1QlaOz9nwB+ZSs= +k8s.io/api v0.25.4/go.mod h1:IG2+RzyPQLllQxnhzD8KQNEu4c4YvyDTpSMztf4A0OQ= +k8s.io/apiextensions-apiserver v0.25.4 h1:7hu9pF+xikxQuQZ7/30z/qxIPZc2J1lFElPtr7f+B6U= +k8s.io/apiextensions-apiserver v0.25.4/go.mod h1:bkSGki5YBoZWdn5pWtNIdGvDrrsRWlmnvl9a+tAw5vQ= +k8s.io/apimachinery v0.25.4 h1:CtXsuaitMESSu339tfhVXhQrPET+EiWnIY1rcurKnAc= +k8s.io/apimachinery v0.25.4/go.mod h1:jaF9C/iPNM1FuLl7Zuy5b9v+n35HGSh6AQ4HYRkCqwo= +k8s.io/apiserver v0.25.4 h1:/3TwZcgLqX7wUxq7TtXOUqXeBTwXIblVMQdhR5XZ7yo= +k8s.io/apiserver v0.25.4/go.mod h1:rPcm567XxjOnnd7jedDUnGJGmDGAo+cT6H7QHAN+xV0= +k8s.io/client-go v0.25.4 h1:3RNRDffAkNU56M/a7gUfXaEzdhZlYhoW8dgViGy5fn8= +k8s.io/client-go v0.25.4/go.mod h1:8trHCAC83XKY0wsBIpbirZU4NTUpbuhc2JnI7OruGZw= +k8s.io/cloud-provider v0.25.4 h1:juIfru1jVX6BlDWcJ18sv6aWxMSMmcjWf2HNXUtnkiI= +k8s.io/cloud-provider v0.25.4/go.mod h1:L018fvnYxHrJP93UNSu8ODZYd/HCukliBzzNsV4TqC0= +k8s.io/code-generator v0.25.4/go.mod h1:9F5fuVZOMWRme7MYj2YT3L9ropPWPokd9VRhVyD3+0w= +k8s.io/component-base v0.25.4 h1:n1bjg9Yt+G1C0WnIDJmg2fo6wbEU1UGMRiQSjmj7hNQ= +k8s.io/component-base v0.25.4/go.mod h1:nnZJU8OP13PJEm6/p5V2ztgX2oyteIaAGKGMYb2L2cY= +k8s.io/component-helpers v0.25.4 h1:FIwp5ZzjaA7p0lekHQM28E7qTd9Aetx5O9e7r4n2Kqo= +k8s.io/component-helpers v0.25.4/go.mod h1:X4KJ8SsJ/onWcDQkRhcE2WRG/iNMufCl7RsNSYtguJg= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= @@ -1720,16 +1720,16 @@ k8s.io/kube-openapi v0.0.0-20180731170545-e3762e86a74c/go.mod h1:BXM9ceUBTj2QnfH k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU= k8s.io/kube-openapi v0.0.0-20220803164354-a70c9af30aea h1:3QOH5+2fGsY8e1qf+GIFpg+zw/JGNrgyZRQR7/m6uWg= k8s.io/kube-openapi v0.0.0-20220803164354-a70c9af30aea/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU= -k8s.io/kubectl v0.25.3 h1:HnWJziEtmsm4JaJiKT33kG0kadx68MXxUE8UEbXnN4U= -k8s.io/kubectl v0.25.3/go.mod h1:glU7PiVj/R6Ud4A9FJdTcJjyzOtCJyc0eO7Mrbh3jlI= -k8s.io/kubelet v0.25.3 h1:PjT3Xo0VL1BpRilBpZrRN8pSy6w5pGQ0YDQQeQWSHvQ= -k8s.io/kubelet v0.25.3/go.mod h1:YopVc6vLhveZb22I7AzcoWPap+t3/KJKqRZDa2MZmyE= -k8s.io/kubernetes v1.25.3 h1:Ljx/Ew9+dt7rN9ob3V+N/aoDy7nDSbmr35IbYGRTyqE= -k8s.io/kubernetes v1.25.3/go.mod h1:lvEY+3iJhh+sGIK1LorGkI56rW0eLGsfalnp68wQwYU= -k8s.io/mount-utils v0.25.3 h1:Eb4MDClmozX3Vrz4ZtoG0bQ/pGhT5gyo28p3f+0r9EE= -k8s.io/mount-utils v0.25.3/go.mod h1:odpFnGwJfFjN3SRnjfGS0902ubcj/W6hDOrNDmSSINo= -k8s.io/pod-security-admission v0.25.3 h1:2HnXWKUIDSez2sWtvxeGgGVUFvYnJJHutL4AI1MIuwk= -k8s.io/pod-security-admission v0.25.3/go.mod h1:xSaLkcMPD6cGKrZ//ZUrCNs0BewZzQdOEcC9LuXBGR4= +k8s.io/kubectl v0.25.4 h1:O3OA1z4V1ZyvxCvScjq0pxAP7ABgznr8UvnVObgI6Dc= +k8s.io/kubectl v0.25.4/go.mod h1:CKMrQ67Bn2YCP26tZStPQGq62zr9pvzEf65A0navm8k= +k8s.io/kubelet v0.25.4 h1:24MmTTQGBHr08UkMYFC/RaLjuiMREM53HfRgJKWRquI= +k8s.io/kubelet v0.25.4/go.mod h1:dWAxzvWR7B6LrSgE+6H6Dc7bOzNOzm+O+W6zLic9daA= +k8s.io/kubernetes v1.25.4 h1:M1+MR8IxE64zHhSSDn30twChLaOI+p0Kt77pvyQMKwU= +k8s.io/kubernetes v1.25.4/go.mod h1:lvEY+3iJhh+sGIK1LorGkI56rW0eLGsfalnp68wQwYU= +k8s.io/mount-utils v0.25.4 h1:+j1GBo6rH6sM1GvOI4jcu1IpjA5WssuwW7UEkQevaTU= +k8s.io/mount-utils v0.25.4/go.mod h1:odpFnGwJfFjN3SRnjfGS0902ubcj/W6hDOrNDmSSINo= +k8s.io/pod-security-admission v0.25.4 h1:jUjWkuYPnuZo7HNj0FkiPjcoj0ERULXGSTCMiDM91A8= +k8s.io/pod-security-admission v0.25.4/go.mod h1:0xthTisMu4TTzHrzM5SCeaRoFwqBjM54DqdHVcwk62k= k8s.io/utils v0.0.0-20190506122338-8fab8cb257d5/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= diff --git a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/micro_time_proto.go b/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/micro_time_proto.go index 6dd6d8999..ab68181e9 100644 --- a/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/micro_time_proto.go +++ b/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/micro_time_proto.go @@ -27,9 +27,12 @@ func (m *MicroTime) ProtoMicroTime() *Timestamp { if m == nil { return &Timestamp{} } + + // truncate precision to microseconds to match JSON marshaling/unmarshaling + truncatedNanoseconds := time.Duration(m.Time.Nanosecond()).Truncate(time.Microsecond) return &Timestamp{ Seconds: m.Time.Unix(), - Nanos: int32(m.Time.Nanosecond()), + Nanos: int32(truncatedNanoseconds), } } @@ -51,7 +54,10 @@ func (m *MicroTime) Unmarshal(data []byte) error { if err := p.Unmarshal(data); err != nil { return err } - m.Time = time.Unix(p.Seconds, int64(p.Nanos)).Local() + + // truncate precision to microseconds to match JSON marshaling/unmarshaling + truncatedNanoseconds := time.Duration(p.Nanos).Truncate(time.Microsecond) + m.Time = time.Unix(p.Seconds, int64(truncatedNanoseconds)).Local() return nil } diff --git a/vendor/k8s.io/kubernetes/pkg/controller/controller_utils.go b/vendor/k8s.io/kubernetes/pkg/controller/controller_utils.go index 241294cde..5c897da43 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/controller_utils.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/controller_utils.go @@ -1127,9 +1127,14 @@ func RemoveTaintOffNode(ctx context.Context, c clientset.Interface, nodeName str // PatchNodeTaints patches node's taints. func PatchNodeTaints(ctx context.Context, c clientset.Interface, nodeName string, oldNode *v1.Node, newNode *v1.Node) error { - oldData, err := json.Marshal(oldNode) + // Strip base diff node from RV to ensure that our Patch request will set RV to check for conflicts over .spec.taints. + // This is needed because .spec.taints does not specify patchMergeKey and patchStrategy and adding them is no longer an option for compatibility reasons. + // Using other Patch strategy works for adding new taints, however will not resolve problem with taint removal. + oldNodeNoRV := oldNode.DeepCopy() + oldNodeNoRV.ResourceVersion = "" + oldDataNoRV, err := json.Marshal(&oldNodeNoRV) if err != nil { - return fmt.Errorf("failed to marshal old node %#v for node %q: %v", oldNode, nodeName, err) + return fmt.Errorf("failed to marshal old node %#v for node %q: %v", oldNodeNoRV, nodeName, err) } newTaints := newNode.Spec.Taints @@ -1140,7 +1145,7 @@ func PatchNodeTaints(ctx context.Context, c clientset.Interface, nodeName string return fmt.Errorf("failed to marshal new node %#v for node %q: %v", newNodeClone, nodeName, err) } - patchBytes, err := strategicpatch.CreateTwoWayMergePatch(oldData, newData, v1.Node{}) + patchBytes, err := strategicpatch.CreateTwoWayMergePatch(oldDataNoRV, newData, v1.Node{}) if err != nil { return fmt.Errorf("failed to create patch for node %q: %v", nodeName, err) } diff --git a/vendor/k8s.io/kubernetes/pkg/volume/util/util.go b/vendor/k8s.io/kubernetes/pkg/volume/util/util.go index e7df9538f..f6f5a3f99 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/util/util.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/util/util.go @@ -75,6 +75,9 @@ const ( // VolumeDynamicallyCreatedByKey is the key of the annotation on PersistentVolume // object created dynamically VolumeDynamicallyCreatedByKey = "kubernetes.io/createdby" + + // kubernetesPluginPathPrefix is the prefix of kubernetes plugin mount paths. + kubernetesPluginPathPrefix = "/plugins/kubernetes.io/" ) // IsReady checks for the existence of a regular file @@ -635,12 +638,30 @@ func FsUserFrom(pod *v1.Pod) *int64 { // In GCI cluster, if gci mounter is used for mounting, the container started by mounter // script will cause additional mounts created in the container. Since these mounts are // irrelevant to the original mounts, they should be not considered when checking the -// mount references. Current solution is to filter out those mount paths that contain -// the string of original mount path. -// Plan to work on better approach to solve this issue. +// mount references. The current solution is to filter out those mount paths that contain +// the k8s plugin suffix of original mount path. func HasMountRefs(mountPath string, mountRefs []string) bool { + // A mountPath typically is like + // /var/lib/kubelet/plugins/kubernetes.io/some-plugin/mounts/volume-XXXX + // Mount refs can look like + // /home/somewhere/var/lib/kubelet/plugins/kubernetes.io/some-plugin/... + // but if /var/lib/kubelet is mounted to a different device a ref might be like + // /mnt/some-other-place/kubelet/plugins/kubernetes.io/some-plugin/... + // Neither of the above should be counted as a mount ref as those are handled + // by the kubelet. What we're concerned about is a path like + // /data/local/some/manual/mount + // As unmonting could interrupt usage from that mountpoint. + // + // So instead of looking for the entire /var/lib/... path, the plugins/kuberentes.io/ + // suffix is trimmed off and searched for. + // + // If there isn't a /plugins/... path, the whole mountPath is used instead. + pathToFind := mountPath + if i := strings.Index(mountPath, kubernetesPluginPathPrefix); i > -1 { + pathToFind = mountPath[i:] + } for _, ref := range mountRefs { - if !strings.Contains(ref, mountPath) { + if !strings.Contains(ref, pathToFind) { return true } } diff --git a/vendor/k8s.io/kubernetes/test/e2e/framework/nodes_util.go b/vendor/k8s.io/kubernetes/test/e2e/framework/nodes_util.go index afdfbc89c..c97b1fe15 100644 --- a/vendor/k8s.io/kubernetes/test/e2e/framework/nodes_util.go +++ b/vendor/k8s.io/kubernetes/test/e2e/framework/nodes_util.go @@ -34,7 +34,7 @@ import ( e2essh "k8s.io/kubernetes/test/e2e/framework/ssh" ) -const etcdImage = "3.5.4-0" +const etcdImage = "3.5.5-0" // EtcdUpgrade upgrades etcd on GCE. func EtcdUpgrade(targetStorage, targetVersion string) error { diff --git a/vendor/k8s.io/kubernetes/test/utils/image/manifest.go b/vendor/k8s.io/kubernetes/test/utils/image/manifest.go index 73e19f3dc..b0058557a 100644 --- a/vendor/k8s.io/kubernetes/test/utils/image/manifest.go +++ b/vendor/k8s.io/kubernetes/test/utils/image/manifest.go @@ -241,7 +241,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config configs[CudaVectorAdd] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "1.0"} configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.2"} configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.1.1"} - configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.4-0"} + configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.5-0"} configs[GlusterDynamicProvisioner] = Config{list.PromoterE2eRegistry, "glusterdynamic-provisioner", "v1.3"} configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-2"} configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-2"} diff --git a/vendor/modules.txt b/vendor/modules.txt index c106e03df..a9a1289cc 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -800,7 +800,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.25.4 => k8s.io/api v0.25.3 +# k8s.io/api v0.25.4 => k8s.io/api v0.25.4 ## explicit; go 1.19 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -850,11 +850,11 @@ k8s.io/api/scheduling/v1beta1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -# k8s.io/apiextensions-apiserver v0.25.3 => k8s.io/apiextensions-apiserver v0.25.3 +# k8s.io/apiextensions-apiserver v0.25.4 => k8s.io/apiextensions-apiserver v0.25.4 ## explicit; go 1.19 k8s.io/apiextensions-apiserver/pkg/apis/apiextensions k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1 -# k8s.io/apimachinery v0.25.4 => k8s.io/apimachinery v0.25.3 +# k8s.io/apimachinery v0.25.4 => k8s.io/apimachinery v0.25.4 ## explicit; go 1.19 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -910,7 +910,7 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.25.3 => k8s.io/apiserver v0.25.3 +# k8s.io/apiserver v0.25.4 => k8s.io/apiserver v0.25.4 ## explicit; go 1.19 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/configuration @@ -948,7 +948,7 @@ k8s.io/apiserver/pkg/util/feature k8s.io/apiserver/pkg/util/webhook k8s.io/apiserver/pkg/util/x509metrics k8s.io/apiserver/pkg/warning -# k8s.io/client-go v12.0.0+incompatible => k8s.io/client-go v0.25.3 +# k8s.io/client-go v12.0.0+incompatible => k8s.io/client-go v0.25.4 ## explicit; go 1.19 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1 @@ -1196,12 +1196,12 @@ k8s.io/client-go/util/homedir k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/workqueue -# k8s.io/cloud-provider v0.25.3 => k8s.io/cloud-provider v0.25.3 +# k8s.io/cloud-provider v0.25.4 => k8s.io/cloud-provider v0.25.4 ## explicit; go 1.19 k8s.io/cloud-provider k8s.io/cloud-provider/volume k8s.io/cloud-provider/volume/helpers -# k8s.io/component-base v0.25.3 => k8s.io/component-base v0.25.3 +# k8s.io/component-base v0.25.4 => k8s.io/component-base v0.25.4 ## explicit; go 1.19 k8s.io/component-base/cli/flag k8s.io/component-base/config @@ -1215,7 +1215,7 @@ k8s.io/component-base/metrics/testutil k8s.io/component-base/tracing k8s.io/component-base/tracing/api/v1 k8s.io/component-base/version -# k8s.io/component-helpers v0.25.3 => k8s.io/component-helpers v0.25.3 +# k8s.io/component-helpers v0.25.4 => k8s.io/component-helpers v0.25.4 ## explicit; go 1.19 k8s.io/component-helpers/node/util/sysctl k8s.io/component-helpers/scheduling/corev1 @@ -1241,14 +1241,14 @@ k8s.io/kube-openapi/pkg/schemamutation k8s.io/kube-openapi/pkg/spec3 k8s.io/kube-openapi/pkg/util/proto k8s.io/kube-openapi/pkg/validation/spec -# k8s.io/kubectl v0.0.0 => k8s.io/kubectl v0.25.3 +# k8s.io/kubectl v0.0.0 => k8s.io/kubectl v0.25.4 ## explicit; go 1.19 k8s.io/kubectl/pkg/scale k8s.io/kubectl/pkg/util/podutils -# k8s.io/kubelet v0.0.0 => k8s.io/kubelet v0.25.3 +# k8s.io/kubelet v0.0.0 => k8s.io/kubelet v0.25.4 ## explicit; go 1.19 k8s.io/kubelet/pkg/apis/stats/v1alpha1 -# k8s.io/kubernetes v1.25.3 +# k8s.io/kubernetes v1.25.4 ## explicit; go 1.19 k8s.io/kubernetes/pkg/api/legacyscheme k8s.io/kubernetes/pkg/api/service @@ -1311,10 +1311,10 @@ k8s.io/kubernetes/test/e2e/storage/utils k8s.io/kubernetes/test/e2e/testing-manifests k8s.io/kubernetes/test/utils k8s.io/kubernetes/test/utils/image -# k8s.io/mount-utils v0.25.3 => k8s.io/mount-utils v0.25.3 +# k8s.io/mount-utils v0.25.4 => k8s.io/mount-utils v0.25.4 ## explicit; go 1.19 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.0.0 => k8s.io/pod-security-admission v0.25.3 +# k8s.io/pod-security-admission v0.0.0 => k8s.io/pod-security-admission v0.25.4 ## explicit; go 1.19 k8s.io/pod-security-admission/api k8s.io/pod-security-admission/policy @@ -1395,29 +1395,29 @@ sigs.k8s.io/yaml # github.com/ceph/ceph-csi/api => ./api # github.com/portworx/sched-ops => github.com/portworx/sched-ops v0.20.4-openstorage-rc3 # gomodules.xyz/jsonpatch/v2 => github.com/gomodules/jsonpatch/v2 v2.2.0 -# k8s.io/api => k8s.io/api v0.25.3 -# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.3 -# k8s.io/apimachinery => k8s.io/apimachinery v0.25.3 -# k8s.io/apiserver => k8s.io/apiserver v0.25.3 -# k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.3 -# k8s.io/client-go => k8s.io/client-go v0.25.3 -# k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.3 -# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.3 -# k8s.io/code-generator => k8s.io/code-generator v0.25.3 -# k8s.io/component-base => k8s.io/component-base v0.25.3 -# k8s.io/component-helpers => k8s.io/component-helpers v0.25.3 -# k8s.io/controller-manager => k8s.io/controller-manager v0.25.3 -# k8s.io/cri-api => k8s.io/cri-api v0.25.3 -# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.3 -# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.3 -# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.3 -# k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.3 -# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.3 -# k8s.io/kubectl => k8s.io/kubectl v0.25.3 -# k8s.io/kubelet => k8s.io/kubelet v0.25.3 -# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.3 -# k8s.io/metrics => k8s.io/metrics v0.25.3 -# k8s.io/mount-utils => k8s.io/mount-utils v0.25.3 -# k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.3 -# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.3 +# k8s.io/api => k8s.io/api v0.25.4 +# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.4 +# k8s.io/apimachinery => k8s.io/apimachinery v0.25.4 +# k8s.io/apiserver => k8s.io/apiserver v0.25.4 +# k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.4 +# k8s.io/client-go => k8s.io/client-go v0.25.4 +# k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.4 +# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.4 +# k8s.io/code-generator => k8s.io/code-generator v0.25.4 +# k8s.io/component-base => k8s.io/component-base v0.25.4 +# k8s.io/component-helpers => k8s.io/component-helpers v0.25.4 +# k8s.io/controller-manager => k8s.io/controller-manager v0.25.4 +# k8s.io/cri-api => k8s.io/cri-api v0.25.4 +# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.4 +# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.4 +# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.4 +# k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.4 +# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.4 +# k8s.io/kubectl => k8s.io/kubectl v0.25.4 +# k8s.io/kubelet => k8s.io/kubelet v0.25.4 +# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.4 +# k8s.io/metrics => k8s.io/metrics v0.25.4 +# k8s.io/mount-utils => k8s.io/mount-utils v0.25.4 +# k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.4 +# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.4 # layeh.com/radius => github.com/layeh/radius v0.0.0-20190322222518-890bc1058917