From da9003d36489e88a70dd1bed44b7f990e6141d43 Mon Sep 17 00:00:00 2001 From: Michael Aspinwall Date: Mon, 11 Aug 2025 20:06:29 +0000 Subject: [PATCH] chore: update go mod to use rc instead of pinned to commit --- .github/workflows/e2e.yml | 8 ++++---- go.mod | 29 ++++++++++------------------ go.sum | 40 +++++++++++++++++++-------------------- 3 files changed, 34 insertions(+), 43 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index d0ae40c6..66c71992 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -25,7 +25,7 @@ on: env: GO_VERSION: "1.24" - K8S_VERSION: "v1.34.0-beta.0.542+f9ed14bf9b1119" + K8S_VERSION: "v1.34.0-rc.0" KIND_VERSION: "v0.28.0" IMAGE_NAME: ghcr.io/google/dranet KIND_CLUSTER_NAME: kind @@ -84,12 +84,12 @@ jobs: run: | TMP_DIR=$(mktemp -d) # Test binaries - curl -L https://dl.k8s.io/ci/fast/${{ env.K8S_VERSION }}/kubernetes-test-linux-amd64.tar.gz -o ${TMP_DIR}/kubernetes-test-linux-amd64.tar.gz + curl -L https://dl.k8s.io/${{ env.K8S_VERSION }}/kubernetes-test-linux-amd64.tar.gz -o ${TMP_DIR}/kubernetes-test-linux-amd64.tar.gz tar xvzf ${TMP_DIR}/kubernetes-test-linux-amd64.tar.gz \ --directory ${TMP_DIR} \ --strip-components=3 kubernetes/test/bin/ginkgo kubernetes/test/bin/e2e.test # kubectl - curl -L https://dl.k8s.io/ci/fast/${{ env.K8S_VERSION }}/bin/linux/amd64/kubectl -o ${TMP_DIR}/kubectl + curl -L https://dl.k8s.io/${{ env.K8S_VERSION }}/bin/linux/amd64/kubectl -o ${TMP_DIR}/kubectl # kind curl -Lo ${TMP_DIR}/kind https://kind.sigs.k8s.io/dl/${{ env.KIND_VERSION }}/kind-linux-amd64 # Install @@ -106,7 +106,7 @@ jobs: # output_dir mkdir -p _artifacts # build kind - kind_node_source="https://dl.k8s.io/ci/fast/${{ env.K8S_VERSION }}/kubernetes-server-linux-amd64.tar.gz" + kind_node_source="https://dl.k8s.io/${{ env.K8S_VERSION }}/kubernetes-server-linux-amd64.tar.gz" kind build node-image --image=dra/node:latest "${kind_node_source}" # create cluster kind create cluster --name ${{ env.KIND_CLUSTER_NAME}} --image dra/node:latest --config kind.yaml diff --git a/go.mod b/go.mod index 779ed695..c1644ca5 100644 --- a/go.mod +++ b/go.mod @@ -2,15 +2,6 @@ module github.com/google/dranet go 1.24.0 -replace ( - k8s.io/api => github.com/kubernetes/kubernetes/staging/src/k8s.io/api v0.0.0-20250724145648-d21da29c9ec4 - k8s.io/apimachinery => github.com/kubernetes/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250724145648-d21da29c9ec4 - k8s.io/client-go => github.com/kubernetes/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250724145648-d21da29c9ec4 - k8s.io/component-base => github.com/kubernetes/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250724145648-d21da29c9ec4 - k8s.io/dynamic-resource-allocation => github.com/kubernetes/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250724145648-d21da29c9ec4 - k8s.io/kubelet => github.com/kubernetes/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250724145648-d21da29c9ec4 -) - require ( cloud.google.com/go/compute v1.42.0 cloud.google.com/go/compute/metadata v0.8.0 @@ -32,12 +23,12 @@ require ( golang.org/x/time v0.12.0 google.golang.org/api v0.246.0 google.golang.org/protobuf v1.36.7 - k8s.io/api v0.34.0-beta.0 - k8s.io/apimachinery v0.34.0-beta.0 - k8s.io/client-go v0.34.0-beta.0 + k8s.io/api v0.34.0-rc.0 + k8s.io/apimachinery v0.34.0-rc.0 + k8s.io/client-go v0.34.0-rc.0 k8s.io/cloud-provider-gcp v0.0.0-20250326051131-7056e3facd39 - k8s.io/component-helpers v0.34.0-beta.0 - k8s.io/dynamic-resource-allocation v0.0.0 + k8s.io/component-helpers v0.34.0-rc.0 + k8s.io/dynamic-resource-allocation v0.34.0-rc.0 k8s.io/klog/v2 v2.130.1 k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 @@ -55,7 +46,7 @@ require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/emicklei/go-restful/v3 v3.12.2 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect - github.com/fxamacker/cbor/v2 v2.8.0 // indirect + github.com/fxamacker/cbor/v2 v2.9.0 // indirect github.com/go-logr/logr v1.4.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-openapi/jsonpointer v0.21.1 // indirect @@ -91,7 +82,7 @@ require ( github.com/tetratelabs/wazero v1.9.0 // indirect github.com/u-root/uio v0.0.0-20240224005618-d2acac8f3701 // indirect github.com/x448/float16 v0.8.4 // indirect - go.etcd.io/etcd/client/pkg/v3 v3.6.1 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect @@ -116,10 +107,10 @@ require ( gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/cri-api v0.34.0-beta.0 // indirect + k8s.io/cri-api v0.34.0-rc.0 // indirect k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect - k8s.io/kubelet v0.33.3 // indirect + k8s.io/kubelet v0.34.0-rc.0 // indirect sigs.k8s.io/randfill v1.0.0 // indirect sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect - sigs.k8s.io/yaml v1.5.0 // indirect + sigs.k8s.io/yaml v1.6.0 // indirect ) diff --git a/go.sum b/go.sum index d409aafc..0fced6e5 100644 --- a/go.sum +++ b/go.sum @@ -37,8 +37,8 @@ github.com/emicklei/go-restful/v3 v3.12.2 h1:DhwDP0vY3k8ZzE0RunuJy8GhNpPL6zqLkDf github.com/emicklei/go-restful/v3 v3.12.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/fxamacker/cbor/v2 v2.8.0 h1:fFtUGXUzXPHTIUdne5+zzMPTfffl3RD5qYnkY40vtxU= -github.com/fxamacker/cbor/v2 v2.8.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ= +github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM= +github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= @@ -100,16 +100,6 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kubernetes/kubernetes/staging/src/k8s.io/api v0.0.0-20250724145648-d21da29c9ec4 h1:BGQvnslv9Gf3N0OmPbByiz/vnXLX8krdRGZG35gtbFc= -github.com/kubernetes/kubernetes/staging/src/k8s.io/api v0.0.0-20250724145648-d21da29c9ec4/go.mod h1:oAbiREintv4AjIOJp24Y0D6c/S0VsL2wSL8/KURHyLg= -github.com/kubernetes/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250724145648-d21da29c9ec4 h1:SuZr2OP5j4ucAtwFuG3eopVq5zQa9rFc72F06Ys3LyM= -github.com/kubernetes/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250724145648-d21da29c9ec4/go.mod h1:v1p1Jsze3IHLy5gU17yVqR2qLO7jgYeX6mw3HZy2AEU= -github.com/kubernetes/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250724145648-d21da29c9ec4 h1:CY5Om06nF60Ml0GgQRvnwRvKJrxQi2VEzs/h6APBiSs= -github.com/kubernetes/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250724145648-d21da29c9ec4/go.mod h1:8D4lk3MNioSJsWCThKJdKnMBLOkSBnI++8BV8LkI3yg= -github.com/kubernetes/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250724145648-d21da29c9ec4 h1:WoDNAQXGufvcq9ukr9n3S009d2G7LlVH8mJhGqSShO8= -github.com/kubernetes/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250724145648-d21da29c9ec4/go.mod h1:GKBfW4kFyslWq9aNU4SX+5+8xGusVxHmZ1Ulkxvk3MU= -github.com/kubernetes/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250724145648-d21da29c9ec4 h1:V71jGHQ86uDxuuuRGuzFeC7hfZoeUgNM3wIhoAhVk5I= -github.com/kubernetes/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250724145648-d21da29c9ec4/go.mod h1:GdHNOq3qgD1wFDv3sp/fw+bzEr/PDst+AM7HBOcZcn8= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4= @@ -189,8 +179,8 @@ github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.etcd.io/etcd/client/pkg/v3 v3.6.1 h1:CxDVv8ggphmamrXM4Of8aCC8QHzDM4tGcVr9p2BSoGk= -go.etcd.io/etcd/client/pkg/v3 v3.6.1/go.mod h1:aTkCp+6ixcVTZmrJGa7/Mc5nMNs59PEgBbq+HCmWyMc= +go.etcd.io/etcd/client/pkg/v3 v3.6.4 h1:9HBYrjppeOfFjBjaMTRxT3R7xT0GLK8EJMVC4xg6ok0= +go.etcd.io/etcd/client/pkg/v3 v3.6.4/go.mod h1:sbdzr2cl3HzVmxNw//PH7aLGVtY4QySjQFuaCgcRFAI= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 h1:q4XOmH/0opmeuJtPsbFNivyl7bCt7yRBbeEm2sC/XtQ= @@ -288,16 +278,26 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +k8s.io/api v0.34.0-rc.0 h1:0jrCG9TkH250E5wTqchpijMoMxmQ6FEl9xNum25FFSk= +k8s.io/api v0.34.0-rc.0/go.mod h1:H2VCZSAruVExfN0k+jj42LXFGQOvRhZDVbY1JlHGtHE= +k8s.io/apimachinery v0.34.0-rc.0 h1:PjXj9Fp/f53PN7JMtGnR7AldAbdztqNqT3SjABe99D8= +k8s.io/apimachinery v0.34.0-rc.0/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw= +k8s.io/client-go v0.34.0-rc.0 h1:x5GuVy31GD3UJwKrM5Zo/Y0yRD/iJmgRahYvExVW72c= +k8s.io/client-go v0.34.0-rc.0/go.mod h1:3ze7gaPrEhj27r19dZFMl7f6vHcHx6MGhVyPVr0i0xw= k8s.io/cloud-provider-gcp v0.0.0-20250326051131-7056e3facd39 h1:2m5DoDX46TPMmpcLRzrOWdBqouWChgbp4F/qlf/lIGc= k8s.io/cloud-provider-gcp v0.0.0-20250326051131-7056e3facd39/go.mod h1:NZrMafedcWXEFDubORCpHuWMp8cUS1TItObinH7vpwg= -k8s.io/component-helpers v0.34.0-beta.0 h1:VtrSd4nRzYbHSr6hryNvIojiDOjf5MbjAWjyjGBjFjY= -k8s.io/component-helpers v0.34.0-beta.0/go.mod h1:H+zgzhEnCsKoOzb9PwRw5Ef1cv+cesDucZdjllYeVeM= -k8s.io/cri-api v0.34.0-beta.0 h1:m40PvwDyITXFK7T/sGb5VwWVc2hc8uuUOYU/KCkUzk8= -k8s.io/cri-api v0.34.0-beta.0/go.mod h1:4qVUjidMg7/Z9YGZpqIDygbkPWkg3mkS1PvOx/kpHTE= +k8s.io/component-helpers v0.34.0-rc.0 h1:jAhYXVt89gjpQqva+U4W2cXngB6ry4ByLjZvTwcPJ2M= +k8s.io/component-helpers v0.34.0-rc.0/go.mod h1:zY2NY9VnM5OuhfJoVWuxiYnUijkCTzHrCwb3lE6R4b4= +k8s.io/cri-api v0.34.0-rc.0 h1:l6PKBlzg2CTURwWAqOxk4zXsHFXUIpmrUsNmvDum6j4= +k8s.io/cri-api v0.34.0-rc.0/go.mod h1:4qVUjidMg7/Z9YGZpqIDygbkPWkg3mkS1PvOx/kpHTE= +k8s.io/dynamic-resource-allocation v0.34.0-rc.0 h1:QGlgUJ1LnDL0bl1+2Znj1ReRU/OaIma7fnINEcLssac= +k8s.io/dynamic-resource-allocation v0.34.0-rc.0/go.mod h1:FaVYUaqpZmOhpnsNcRJCja1+tH+nVXCjiY0bDAIBdHA= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b h1:MloQ9/bdJyIu9lb1PzujOPolHyvO06MXG5TUIj2mNAA= k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b/go.mod h1:UZ2yyWbFTpuhSbFhv24aGNOdoRdJZgsIObGBUaYVsts= +k8s.io/kubelet v0.34.0-rc.0 h1:WuP08sc1XwFP+gi+R4Wan11TUPGycDlwD+/LA5MZNGw= +k8s.io/kubelet v0.34.0-rc.0/go.mod h1:JFRoqbpR3n/mscB3RsEoLD5BKrmHiZNapdQY1lfnkKI= k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y= k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE= @@ -306,5 +306,5 @@ sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU= sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY= sigs.k8s.io/structured-merge-diff/v6 v6.3.0 h1:jTijUJbW353oVOd9oTlifJqOGEkUw2jB/fXCbTiQEco= sigs.k8s.io/structured-merge-diff/v6 v6.3.0/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE= -sigs.k8s.io/yaml v1.5.0 h1:M10b2U7aEUY6hRtU870n2VTPgR5RZiL/I6Lcc2F4NUQ= -sigs.k8s.io/yaml v1.5.0/go.mod h1:wZs27Rbxoai4C0f8/9urLZtZtF3avA3gKvGyPdDqTO4= +sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs= +sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=