Skip to content

Commit

Permalink
Merge pull request #7792 from Behnam-Shobiri/update-ma-b
Browse files Browse the repository at this point in the history 
Update libs in main branch
  • Loading branch information
@mgleung
mgleung authored Jun 15, 2023
2 parents 069ec7d + 36b0e05 commit 3980e3e
Show file tree
Hide file tree
Showing 8 changed files with 109 additions and 98 deletions.
5 changes: 5 additions & 0 deletions apiserver/pkg/storage/calico/resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package calico
import (
"bytes"
"fmt"
"math"
"os"
"reflect"
"strconv"
Expand Down Expand Up @@ -430,6 +431,10 @@ func (rs *resourceStore) GuaranteedUpdate(
revInt, _ := strconv.Atoi(accessor.GetResourceVersion())
updatedRes := updatedObj.(resourceObject)
if !shouldCreateOnUpdate() {
if curState.rev < math.MinInt || curState.rev > math.MaxInt {
klog.Errorf("revision number %d overflows", curState.rev)
return fmt.Errorf("Revision is outside the range of an int32: %d", curState.rev)
}
if updatedRes.GetObjectMeta().GetResourceVersion() == "" || revInt < int(curState.rev) {
updatedRes.(resourceObject).GetObjectMeta().SetResourceVersion(strconv.FormatInt(curState.rev, 10))
}
Expand Down
2 changes: 1 addition & 1 deletion cni-plugin/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ WINFV_SRCFILES=$(shell find win_tests -name '*.go')
CURL=curl -C - -sSf

# Use forked CNI plugin URL and corresponding tagged artifacts.
CNI_VERSION=v1.1.1-calico+go-1.20.4
CNI_VERSION=v1.1.1-calico+go-1.20.5
CNI_ARTIFACTS_URL=https://github.com/projectcalico/containernetworking-plugins/releases/download
FLANNEL_VERSION=v1.1.2

Expand Down
5 changes: 5 additions & 0 deletions felix/bpf/bpf.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1268,6 +1268,11 @@ func CidrToHex(cidr string) ([]string, error) {
return nil, fmt.Errorf("IP %q is not IPv4", ip)
}

// Check bounds on the mask since the mask will be in CIDR notation and should range between 0 and 32
if mask > 32 || mask < 0 {
return nil, fmt.Errorf("mask %d should be between 0 and 32", mask)
}

maskBytes := make([]byte, 4)
binary.LittleEndian.PutUint32(maskBytes, uint32(mask))

Expand Down
2 changes: 1 addition & 1 deletion felix/config/param_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ type IntParam struct {
}

func (p *IntParam) Parse(raw string) (interface{}, error) {
value, err := strconv.ParseInt(raw, 0, 64)
value, err := strconv.ParseInt(raw, 0, 32)
if err != nil {
err = p.parseFailed(raw, "invalid int")
return nil, err
Expand Down
86 changes: 43 additions & 43 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,16 +85,16 @@ require (
gopkg.in/go-playground/validator.v9 v9.27.0
gopkg.in/natefinch/lumberjack.v2 v2.0.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.26.3
k8s.io/apiextensions-apiserver v0.26.3
k8s.io/apimachinery v0.26.3
k8s.io/apiserver v0.26.3
k8s.io/client-go v0.26.3
k8s.io/code-generator v0.26.3
k8s.io/component-base v0.26.3
k8s.io/api v0.26.5
k8s.io/apiextensions-apiserver v0.26.5
k8s.io/apimachinery v0.26.5
k8s.io/apiserver v0.26.5
k8s.io/client-go v0.26.5
k8s.io/code-generator v0.26.5
k8s.io/component-base v0.26.5
k8s.io/klog/v2 v2.80.1
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d
k8s.io/kubernetes v1.26.3
k8s.io/kubernetes v1.26.5
k8s.io/utils v0.0.0-20230313181309-38a27ef9d749
modernc.org/memory v1.5.0
sigs.k8s.io/kind v0.11.1
Expand Down Expand Up @@ -213,7 +213,7 @@ require (
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/runc v1.1.4 // indirect
github.com/opencontainers/runc v1.1.6 // indirect
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect
github.com/opencontainers/selinux v1.10.0 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
Expand Down Expand Up @@ -269,21 +269,21 @@ require (
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/warnings.v0 v0.1.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/cloud-provider v0.26.3 // indirect
k8s.io/component-helpers v0.26.3 // indirect
k8s.io/cloud-provider v0.26.5 // indirect
k8s.io/component-helpers v0.26.5 // indirect
k8s.io/cri-api v0.0.0 // indirect
k8s.io/csi-translation-lib v0.26.3 // indirect
k8s.io/dynamic-resource-allocation v0.26.3 // indirect
k8s.io/csi-translation-lib v0.26.5 // indirect
k8s.io/dynamic-resource-allocation v0.26.5 // indirect
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
k8s.io/kms v0.26.3 // indirect
k8s.io/kms v0.26.5 // indirect
k8s.io/kube-proxy v0.0.0 // indirect
k8s.io/kube-scheduler v0.0.0 // indirect
k8s.io/kubectl v0.0.0 // indirect
k8s.io/kubelet v0.26.3 // indirect
k8s.io/kubelet v0.26.5 // indirect
k8s.io/legacy-cloud-providers v0.0.0 // indirect
k8s.io/mount-utils v0.26.3 // indirect
k8s.io/mount-utils v0.26.5 // indirect
k8s.io/pod-security-admission v0.0.0 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.36 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.37 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
)
Expand All @@ -298,34 +298,34 @@ replace (

github.com/projectcalico/api => ./api

k8s.io/api => k8s.io/api v0.26.3
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.3
k8s.io/apimachinery => k8s.io/apimachinery v0.26.3
k8s.io/apiserver => k8s.io/apiserver v0.26.3
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.3
k8s.io/client-go => k8s.io/client-go v0.26.3
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.3
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.3
k8s.io/code-generator => k8s.io/code-generator v0.26.3
k8s.io/component-base => k8s.io/component-base v0.26.3
k8s.io/component-helpers => k8s.io/component-helpers v0.26.3
k8s.io/controller-manager => k8s.io/controller-manager v0.26.3
k8s.io/cri-api => k8s.io/cri-api v0.26.3
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.3
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.3
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.3
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.3
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.3
k8s.io/kubectl => k8s.io/kubectl v0.26.3
k8s.io/kubelet => k8s.io/kubelet v0.26.3
k8s.io/api => k8s.io/api v0.26.5
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.5
k8s.io/apimachinery => k8s.io/apimachinery v0.26.5
k8s.io/apiserver => k8s.io/apiserver v0.26.5
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.5
k8s.io/client-go => k8s.io/client-go v0.26.5
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.5
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.5
k8s.io/code-generator => k8s.io/code-generator v0.26.5
k8s.io/component-base => k8s.io/component-base v0.26.5
k8s.io/component-helpers => k8s.io/component-helpers v0.26.5
k8s.io/controller-manager => k8s.io/controller-manager v0.26.5
k8s.io/cri-api => k8s.io/cri-api v0.26.5
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.5
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.5
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.5
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.5
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.5
k8s.io/kubectl => k8s.io/kubectl v0.26.5
k8s.io/kubelet => k8s.io/kubelet v0.26.5

// Need replacements for all the k8s subsidiary projects that are pulled in indirectly because
// the kubernets repo pulls them in via a replacement to its own vendored copies, which doesn't work for
// transient imports.
k8s.io/kubernetes => k8s.io/kubernetes v1.26.3
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.3
k8s.io/metrics => k8s.io/metrics v0.26.3
k8s.io/mount-utils => k8s.io/mount-utils v0.26.3
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.3
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.3
k8s.io/kubernetes => k8s.io/kubernetes v1.26.5
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.5
k8s.io/metrics => k8s.io/metrics v0.26.5
k8s.io/mount-utils => k8s.io/mount-utils v0.26.5
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.5
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.5
)
103 changes: 52 additions & 51 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -718,8 +718,9 @@ github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3I
github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM=
github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
github.com/opencontainers/runc v1.1.4 h1:nRCz/8sKg6K6jgYAFLDlXzPeITBZJyX28DBVhWD+5dg=
github.com/opencontainers/runc v1.1.4/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg=
github.com/opencontainers/runc v1.1.6 h1:XbhB8IfG/EsnhNvZtNdLB0GBw92GYEFvKlhaJk9jUgA=
github.com/opencontainers/runc v1.1.6/go.mod h1:CbUumNnWCuTGFukNXahoo/RFBZvDAgRh/smNYNOhA50=
github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 h1:3snG66yBm59tKhhSPQrQ/0bCrv1LQbKt40LnUPiUxdc=
Expand Down Expand Up @@ -1070,7 +1071,7 @@ golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
Expand Down Expand Up @@ -1511,32 +1512,32 @@ 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.26.3 h1:emf74GIQMTik01Aum9dPP0gAypL8JTLl/lHa4V9RFSU=
k8s.io/api v0.26.3/go.mod h1:PXsqwPMXBSBcL1lJ9CYDKy7kIReUydukS5JiRlxC3qE=
k8s.io/apiextensions-apiserver v0.26.3 h1:5PGMm3oEzdB1W/FTMgGIDmm100vn7IaUP5er36dB+YE=
k8s.io/apiextensions-apiserver v0.26.3/go.mod h1:jdA5MdjNWGP+njw1EKMZc64xAT5fIhN6VJrElV3sfpQ=
k8s.io/apimachinery v0.26.3 h1:dQx6PNETJ7nODU3XPtrwkfuubs6w7sX0M8n61zHIV/k=
k8s.io/apimachinery v0.26.3/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I=
k8s.io/apiserver v0.26.3 h1:blBpv+yOiozkPH2aqClhJmJY+rp53Tgfac4SKPDJnU4=
k8s.io/apiserver v0.26.3/go.mod h1:CJe/VoQNcXdhm67EvaVjYXxR3QyfwpceKPuPaeLibTA=
k8s.io/cli-runtime v0.26.3 h1:3ULe0oI28xmgeLMVXIstB+ZL5CTGvWSMVMLeHxitIuc=
k8s.io/client-go v0.26.3 h1:k1UY+KXfkxV2ScEL3gilKcF7761xkYsSD6BC9szIu8s=
k8s.io/client-go v0.26.3/go.mod h1:ZPNu9lm8/dbRIPAgteN30RSXea6vrCpFvq+MateTUuQ=
k8s.io/cloud-provider v0.26.3 h1:qN4f0+PvgOZyKIIct+90eedYj8/S4EKPpSD9S+3RCFE=
k8s.io/cloud-provider v0.26.3/go.mod h1:Hfxu0mvz426xlvz2tziw0m3ubr+sk05KKD4HPy2kwdY=
k8s.io/cluster-bootstrap v0.26.3 h1:x+yLUle2BaGoAfHbqyzCabGLHR0caZ+9Cvr9BlExR7w=
k8s.io/code-generator v0.26.3 h1:DNYPsWoeFwmg4qFg97Z1cHSSv7KSG10mAEIFoZGTQM8=
k8s.io/code-generator v0.26.3/go.mod h1:ryaiIKwfxEJEaywEzx3dhWOydpVctKYbqLajJf0O8dI=
k8s.io/component-base v0.26.3 h1:oC0WMK/ggcbGDTkdcqefI4wIZRYdK3JySx9/HADpV0g=
k8s.io/component-base v0.26.3/go.mod h1:5kj1kZYwSC6ZstHJN7oHBqcJC6yyn41eR+Sqa/mQc8E=
k8s.io/component-helpers v0.26.3 h1:eQ682yg1GiIGAsde+l2xL0P2yMYJOvypWsz6h6FtkZo=
k8s.io/component-helpers v0.26.3/go.mod h1:feC+CaxJXULs5TSD3lG8K5ecftOkF8eY0pHQgd7koEI=
k8s.io/cri-api v0.26.3 h1:sVkvI3DjVwS4sV7XZZiuxRvBsCWfifZPE8ddusIlJLU=
k8s.io/cri-api v0.26.3/go.mod h1:Oo8O7MKFPNDxfDf2LmrF/3Hf30q1C6iliGuv3la3tIA=
k8s.io/csi-translation-lib v0.26.3 h1:XpC3yeBSz+qls9zk3Tqg6r2sZxFePGe1fIlSlmds5XA=
k8s.io/csi-translation-lib v0.26.3/go.mod h1:i++hspfN3AZsA5cYQ1QFnflIQhirsoc/8bOLkaVJG/g=
k8s.io/dynamic-resource-allocation v0.26.3 h1:WBI4xDoMySaH5VJe0y514O3rC4gyiJppC0EkDo6mHq0=
k8s.io/dynamic-resource-allocation v0.26.3/go.mod h1:8nUg20y2DgAv8v+Yuv7O5+rLZa7jbjsU3KvDcBiv2b8=
k8s.io/api v0.26.5 h1:Npao/+sMSng6nkEcNydgH3BNo4s5YoBg7iw35HM7Hcw=
k8s.io/api v0.26.5/go.mod h1:O7ICW7lj6+ZQQQ3cxekgCoW+fnGo5kWT0nTHkLZ5grc=
k8s.io/apiextensions-apiserver v0.26.5 h1:VJ946z9RjyCPn3qiz4Kus/UYjCRrdn1xUvEsJFvN5Yo=
k8s.io/apiextensions-apiserver v0.26.5/go.mod h1:Olsde7ZNWnyz9rsL13iXYXmL1h7kWujtKeC3yWVCDPo=
k8s.io/apimachinery v0.26.5 h1:hTQVhJao2piX7vSgCn4Lwd6E0o/+TJIH4NqRf+q4EmE=
k8s.io/apimachinery v0.26.5/go.mod h1:HUvk6wrOP4v22AIYqeCGSQ6xWCHo41J9d6psb3temAg=
k8s.io/apiserver v0.26.5 h1:SBzyDpIXXPR4v+mpSU44p9fQerBMkpOH6lmSPCD1wmo=
k8s.io/apiserver v0.26.5/go.mod h1:OSbw98Y1bDSbA2izYIKqhi10vb4KWP9b4siiCRFkBVE=
k8s.io/cli-runtime v0.26.5 h1:1YTQt6cWaiyA+6NptNMVqkGkh+BFN9cG+PESgz24//U=
k8s.io/client-go v0.26.5 h1:e8Z44pafL/c6ayF/6qYEypbJoDSakaFxhJ9lqULEJEo=
k8s.io/client-go v0.26.5/go.mod h1:/CYyNt+ZLMvWqMF8h1SvkUXz2ujFWQLwdDrdiQlZ5X0=
k8s.io/cloud-provider v0.26.5 h1:dDiCey75cPQhRy96AmE1Vqo1DJakuHHfnn5DJiwdkTQ=
k8s.io/cloud-provider v0.26.5/go.mod h1:tZZTVChlO3isBV/Y6xO4/j0MI+I9/vRkplc8cY8kVvo=
k8s.io/cluster-bootstrap v0.26.5 h1:cEfrGtNb2h0C02/jGz7jShUJfANpuTtWHITN0OZZfYg=
k8s.io/code-generator v0.26.5 h1:0p350mqxkbs29h8/yF4AMilApLVUhnRx3EAfhTWR5fY=
k8s.io/code-generator v0.26.5/go.mod h1:iWTVFxfBX+RYe0bXjKqSM83KJF8eimor/izQInvq/60=
k8s.io/component-base v0.26.5 h1:nHAzDvXQ4whYpOqrQGWrDIYI/GIeXkuxzqC/iVICfZo=
k8s.io/component-base v0.26.5/go.mod h1:wvfNAS05EtKdPeUxFceo8WNh8bGPcFY8QfPhv5MYjA4=
k8s.io/component-helpers v0.26.5 h1:JwpcrVqrxU7eLlO+p1TLjdf01O+d3G7eOJgQCm1bMm0=
k8s.io/component-helpers v0.26.5/go.mod h1:08oMmyYzepG6KoZzPnx4R7lcrqyBESWx2EKq7mWvx/g=
k8s.io/cri-api v0.26.5 h1:xNg8uDvBoPitLQl+gkDNLfckkuDUUHwFOG4RJ7CRpHI=
k8s.io/cri-api v0.26.5/go.mod h1:xhhEy2sS6zO8oieIwGBorQLneLMLHXATFUv8+0tsFMo=
k8s.io/csi-translation-lib v0.26.5 h1:9nuy6rFh7LAqhuVGOY6KnPLZkzWJ0SqM6+6p4YiASKQ=
k8s.io/csi-translation-lib v0.26.5/go.mod h1:BaS2V6Dw+qrj9wM59csELaBzfE5iaUMgiRnienfoAsE=
k8s.io/dynamic-resource-allocation v0.26.5 h1:GKT0mjTPcp6SqkcPF+t7DVCwfw2ogf1lM5zuxYXqM0E=
k8s.io/dynamic-resource-allocation v0.26.5/go.mod h1:v27WrIpB/ulANYqXY30HPks+9J22ISPLfSkILcdRbjc=
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08=
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
Expand All @@ -1545,30 +1546,30 @@ k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=
k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/kms v0.26.3 h1:+rC4BMeMBkH5hrfZt9WFMRrs2m3vY2rXymisNactcTY=
k8s.io/kms v0.26.3/go.mod h1:69qGnf1NsFOQP07fBYqNLZklqEHSJF024JqYCaeVxHg=
k8s.io/kube-aggregator v0.26.3 h1:nc4H5ymGkWPU3c9U9UM468JcmNENY/s/mDYVW3t3uRo=
k8s.io/kms v0.26.5 h1:Yjgvlxc3KBTAUWuxOIkMUB6YEmqR+rKBkRquBioP8YY=
k8s.io/kms v0.26.5/go.mod h1:AYuV9ZebRhr6cb1eT9L6kZVxvgIUxmE1Fe6kPhqYvuc=
k8s.io/kube-aggregator v0.26.5 h1:rGDFSMN/wkqWDeRBFBFQXpOw/f5CmjpNEbBA/BTTDi4=
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4=
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d h1:VcFq5n7wCJB2FQMCIHfC+f+jNcGgNMar1uKd6rVlifU=
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
k8s.io/kube-proxy v0.26.3 h1:xKYTgH/HcmuLuIw/Ip2AVus70I9VwaFEQ5O7vGAveW8=
k8s.io/kube-proxy v0.26.3/go.mod h1:995p2WbS0zgatqXcB81/4vdhdOrP1cq6jqmPtDmaPhc=
k8s.io/kube-scheduler v0.26.3 h1:IOMIG5dUILnJIMnCbTUQokTb37Sd28vexquBSeajk6c=
k8s.io/kube-scheduler v0.26.3/go.mod h1:mbym95ZdWOaftRMmdLRcAam9MCNf7iUjnPfZTl8uHTA=
k8s.io/kubectl v0.26.3 h1:bZ5SgFyeEXw6XTc1Qji0iNdtqAC76lmeIIQULg2wNXM=
k8s.io/kubectl v0.26.3/go.mod h1:02+gv7Qn4dupzN3fi/9OvqqdW+uG/4Zi56vc4Zmsp1g=
k8s.io/kubelet v0.26.3 h1:6WT2dX/39cvc3q25xkFmMIT2EoV+gS/8gxZmUiDvG4U=
k8s.io/kubelet v0.26.3/go.mod h1:yd5GJNMOFLMKxP1rmZhg6etbYAbdTimF87fBIBtRimA=
k8s.io/kubernetes v1.26.3 h1:LtjNGNNpCTRyrWhDJMwTWDX+4h+GLwfULS8pu0xzSdk=
k8s.io/kubernetes v1.26.3/go.mod h1:NxzR7U7mS+OGa3J/qweI86Pek//mlfHqDgt6NNGdz8g=
k8s.io/legacy-cloud-providers v0.26.3 h1:gUDw7vFFKMM/vV/3MQNbw+H9fZOaH8z2/oK8/O7PCT0=
k8s.io/legacy-cloud-providers v0.26.3/go.mod h1:Scn0CIcptay5seel6MhAzLtoBseK+fL46uJSP84cnPo=
k8s.io/metrics v0.26.3 h1:pHI8XtmBbGGdh7bL0s2C3v93fJfxyktHPAFsnRYnDTo=
k8s.io/mount-utils v0.26.3 h1:FxMDiPLCkrYgonfSaKHWltLNkyTg3Q/Xrwn94uwhd8k=
k8s.io/mount-utils v0.26.3/go.mod h1:95yx9K6N37y8YZ0/lUh9U6ITosMODNaW0/v4wvaa0Xw=
k8s.io/pod-security-admission v0.26.3 h1:MvPlB/cZW4x64VgZ3WbgnfPWpgtZY4w6ZllIMWmEy9Y=
k8s.io/pod-security-admission v0.26.3/go.mod h1:9I+AV3O26WYsn4jpCD8WvdJy3xvqBWYz43kz0jwco1k=
k8s.io/sample-apiserver v0.26.3 h1:aB2EdWA94fgztb1ey7vLZ/6t9PN4LVYZHF4PRJmlcZU=
k8s.io/kube-proxy v0.26.5 h1:F5EXG0L6x+IoDR2Yvp/xQir/JVo+esWr6UsOFsO9ytc=
k8s.io/kube-proxy v0.26.5/go.mod h1:ZgJJnYy3NXc5Xoc/Jl8a5ZxwHcxq9yqZtyrAwSRUFWQ=
k8s.io/kube-scheduler v0.26.5 h1:EeAfK31f9rW46wSTGcc29Qj3Okyuqy5ikVqU5gmen6Q=
k8s.io/kube-scheduler v0.26.5/go.mod h1:/49cw70efcgczBHSkOrdIfuR+t3J0xCQVcwOxfGEpZM=
k8s.io/kubectl v0.26.5 h1:xBqkZIycZIIG6X2ly4OkX2VL15xxnEpZAU9lfoTb0QE=
k8s.io/kubectl v0.26.5/go.mod h1:04QUnpBp9xe0wc84IdRcrFMkuUWQwsg9+ZMHtM4lbNM=
k8s.io/kubelet v0.26.5 h1:rTWWcO5oozrjLCmeebqQKtzPGrsLmYZRHo+sSN/XXqc=
k8s.io/kubelet v0.26.5/go.mod h1:g5du2eFxRkcVnjpuRT3VX+Pv96v5kDcVZXQ58sgO26E=
k8s.io/kubernetes v1.26.5 h1:hc/lcQCK7J2Q3fOqtU3cD8qJOKpi6oySEHPP39q/R7o=
k8s.io/kubernetes v1.26.5/go.mod h1:nARWq2FQXUzRa+DQfF6hEp0dgZXu61MnjX+aiQaC8lk=
k8s.io/legacy-cloud-providers v0.26.5 h1:24bwj3gDSZCn6SCu19GJ1iueNjHB+3bP9xOi9yXU9SY=
k8s.io/legacy-cloud-providers v0.26.5/go.mod h1:RmReppNYcUZYJdpTfnMO9pHMlLwHxHyAtiFR7IY+3mc=
k8s.io/metrics v0.26.5 h1:J2vPw1u49iA1rAByeAObffn60WvcxZwTCmMTB3+LWAM=
k8s.io/mount-utils v0.26.5 h1:OYqtkQgtu3hCOYEv09rLdJu/YowXvrM0H6JiPGX6PWI=
k8s.io/mount-utils v0.26.5/go.mod h1:S+09/ujdtdKRo3bzSQXonHpIEKc+svPe8SNgBUJBj8E=
k8s.io/pod-security-admission v0.26.5 h1:Q9kQx1oS8RvHVwQmind+SmsQ3244Ha7Wmm9v7DlZQu0=
k8s.io/pod-security-admission v0.26.5/go.mod h1:IXv1XIvTDOv6U6hyJ+jCCzrDl6jEo1Rhwm7kQtoaY/8=
k8s.io/sample-apiserver v0.26.5 h1:RVqCAkUfiqHOvIlP/ZO+02Nm9MPjkskA4CZMcw/ziKU=
k8s.io/utils v0.0.0-20200410111917-5770800c2500/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-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
Expand All @@ -1581,8 +1582,8 @@ modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.36 h1:PUuX1qIFv309AT8hF/CdPKDmsG/hn/L8zRX7VvISM3A=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.36/go.mod h1:WxjusMwXlKzfAs4p9km6XJRndVt2FROgMVCE4cdohFo=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.37 h1:fAPTNEpzQMOLMGwOHNbUkR2xXTQwMJOZYNx+/mLlOh0=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.37/go.mod h1:vfnxT4FXNT8eGvO+xi/DsyC/qHmdujqwrUa1WSspCsk=
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
Expand Down
2 changes: 1 addition & 1 deletion metadata.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ GO_BUILD_VER = v0.85
# Version of Kubernetes to use for tests.
K8S_VERSION = v1.24.7
# This is used for bitnami/kubectl and kubectl binary release.
KUBECTL_VERSION = v1.24.8
KUBECTL_VERSION = v1.24.14

# Version of various tools used in the build and tests.
COREDNS_VERSION=1.5.2
Expand Down
Loading

0 comments on commit 3980e3e

Please sign in to comment.