diff --git a/cmd/csi-node-driver-registrar/main.go b/cmd/csi-node-driver-registrar/main.go index e5ce50c2..c877e82f 100644 --- a/cmd/csi-node-driver-registrar/main.go +++ b/cmd/csi-node-driver-registrar/main.go @@ -38,15 +38,6 @@ import ( registerapi "k8s.io/kubelet/pkg/apis/pluginregistration/v1" ) -const ( - // Name of node annotation that contains JSON map of driver names to node - // names - annotationKey = "csi.volume.kubernetes.io/nodeid" - - // Verify (and update, if needed) the node ID at this frequency. - sleepDuration = 2 * time.Minute -) - const ( // ModeKubeletRegistrationProbe makes node-driver-registrar act as an exec probe // that checks if the kubelet plugin registration succeeded. @@ -169,10 +160,6 @@ func main() { logger.Info("--connection-timeout is deprecated and will have no effect") } - // Once https://github.com/container-storage-interface/spec/issues/159 is - // resolved, if plugin does not support PUBLISH_UNPUBLISH_VOLUME, then we - // can skip adding mapping to "csi.volume.kubernetes.io/nodeid" annotation. - logger.V(1).Info("Attempting to open a gRPC connection", "csiAddress", *csiAddress) ctx := klog.NewContext(context.Background(), logger) csiConn, err := connection.ConnectWithoutMetrics(ctx, *csiAddress) diff --git a/go.mod b/go.mod index e819740b..d6333fb3 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/kubernetes-csi/node-driver-registrar go 1.24.0 -toolchain go1.24.6 +toolchain go1.24.11 require ( github.com/kubernetes-csi/csi-lib-utils v0.22.0 diff --git a/release-tools/KUBERNETES_CSI_OWNERS_ALIASES b/release-tools/KUBERNETES_CSI_OWNERS_ALIASES index f7bc7018..4b7ed015 100644 --- a/release-tools/KUBERNETES_CSI_OWNERS_ALIASES +++ b/release-tools/KUBERNETES_CSI_OWNERS_ALIASES @@ -8,6 +8,7 @@ aliases: - jsafrane - msau42 - saad-ali + - gnufied - xing-yang # Reviewers are automatically assigned to new PRs. The following diff --git a/release-tools/prow.sh b/release-tools/prow.sh index f63ff82c..3a64548b 100755 --- a/release-tools/prow.sh +++ b/release-tools/prow.sh @@ -86,7 +86,7 @@ configvar CSI_PROW_BUILD_PLATFORMS "linux amd64 amd64; linux ppc64le ppc64le -pp # which is disabled with GOFLAGS=-mod=vendor). configvar GOFLAGS_VENDOR "$( [ -d vendor ] && echo '-mod=vendor' )" "Go flags for using the vendor directory" -configvar CSI_PROW_GO_VERSION_BUILD "1.24.9" "Go version for building the component" # depends on component's source code +configvar CSI_PROW_GO_VERSION_BUILD "1.24.11" "Go version for building the component" # depends on component's source code configvar CSI_PROW_GO_VERSION_E2E "" "override Go version for building the Kubernetes E2E test suite" # normally doesn't need to be set, see install_e2e configvar CSI_PROW_GO_VERSION_SANITY "${CSI_PROW_GO_VERSION_BUILD}" "Go version for building the csi-sanity test suite" # depends on CSI_PROW_SANITY settings below configvar CSI_PROW_GO_VERSION_KIND "${CSI_PROW_GO_VERSION_BUILD}" "Go version for building 'kind'" # depends on CSI_PROW_KIND_VERSION below @@ -124,7 +124,7 @@ configvar CSI_PROW_BUILD_JOB true "building code in repo enabled" # use the same settings as for "latest" Kubernetes. This works # as long as there are no breaking changes in Kubernetes, like # deprecating or changing the implementation of an alpha feature. -configvar CSI_PROW_KUBERNETES_VERSION 1.22.0 "Kubernetes" +configvar CSI_PROW_KUBERNETES_VERSION 1.34.0 "Kubernetes" # CSI_PROW_KUBERNETES_VERSION reduced to first two version numbers and # with underscore (1_13 instead of 1.13.3) and in uppercase (LATEST @@ -144,7 +144,7 @@ kind_version_default () { latest|master) echo main;; *) - echo v0.25.0;; + echo v0.30.0;; esac } @@ -155,13 +155,10 @@ configvar CSI_PROW_KIND_VERSION "$(kind_version_default)" "kind" # kind images to use. Must match the kind version. # The release notes of each kind release list the supported images. -configvar CSI_PROW_KIND_IMAGES "kindest/node:v1.32.0@sha256:2458b423d635d7b01637cac2d6de7e1c1dca1148a2ba2e90975e214ca849e7cb -kindest/node:v1.31.2@sha256:18fbefc20a7113353c7b75b5c869d7145a6abd6269154825872dc59c1329912e -kindest/node:v1.30.6@sha256:b6d08db72079ba5ae1f4a88a09025c0a904af3b52387643c285442afb05ab994 -kindest/node:v1.29.10@sha256:3b2d8c31753e6c8069d4fc4517264cd20e86fd36220671fb7d0a5855103aa84b -kindest/node:v1.28.15@sha256:a7c05c7ae043a0b8c818f5a06188bc2c4098f6cb59ca7d1856df00375d839251 -kindest/node:v1.27.16@sha256:2d21a61643eafc439905e18705b8186f3296384750a835ad7a005dceb9546d20 -kindest/node:v1.26.15@sha256:c79602a44b4056d7e48dc20f7504350f1e87530fe953428b792def00bc1076dd" "kind images" +configvar CSI_PROW_KIND_IMAGES "kindest/node:v1.34.0@sha256:7416a61b42b1662ca6ca89f02028ac133a309a2a30ba309614e8ec94d976dc5a +kindest/node:v1.33.4@sha256:25a6018e48dfcaee478f4a59af81157a437f15e6e140bf103f85a2e7cd0cbbf2 +kindest/node:v1.32.8@sha256:abd489f042d2b644e2d033f5c2d900bc707798d075e8186cb65e3f1367a9d5a1 +kindest/node:v1.31.12@sha256:0f5cc49c5e73c0c2bb6e2df56e7df189240d83cf94edfa30946482eb08ec57d2" "kind images" # By default, this script tests sidecars with the CSI hostpath driver, # using the install_csi_driver function. That function depends on