Skip to content

Commit

Permalink
Merge pull request #1210 from jsafrane/bump-1.30
Browse files Browse the repository at this point in the history 
Bump to Kubernetes 1.30
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot committed May 13, 2024
2 parents 9a8acae + 080650e commit dd20b66
Show file tree
Hide file tree
Showing 540 changed files with 50,783 additions and 12,834 deletions.
65 changes: 34 additions & 31 deletions cmd/csi-provisioner/csi-provisioner.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ import (
_ "k8s.io/component-base/metrics/prometheus/clientgo/leaderelection" // register leader election in the default legacy registry
_ "k8s.io/component-base/metrics/prometheus/workqueue" // register work queues in the default legacy registry
csitrans "k8s.io/csi-translation-lib"
"k8s.io/klog/v2"
"sigs.k8s.io/sig-storage-lib-external-provisioner/v9/controller"
libmetrics "sigs.k8s.io/sig-storage-lib-external-provisioner/v9/controller/metrics"
klog "k8s.io/klog/v2"
"sigs.k8s.io/sig-storage-lib-external-provisioner/v10/controller"
libmetrics "sigs.k8s.io/sig-storage-lib-external-provisioner/v10/controller/metrics"

"github.com/kubernetes-csi/csi-lib-utils/leaderelection"
"github.com/kubernetes-csi/csi-lib-utils/metrics"
Expand Down Expand Up @@ -210,13 +210,13 @@ func main() {
metrics.WithSubsystem(metrics.SubsystemSidecar),
)

grpcClient, err := ctrl.Connect(*csiEndpoint, metricsManager)
grpcClient, err := ctrl.Connect(ctx, *csiEndpoint, metricsManager)
if err != nil {
klog.Error(err.Error())
os.Exit(1)
}

err = ctrl.Probe(grpcClient, *operationTimeout)
err = ctrl.Probe(ctx, grpcClient, *operationTimeout)
if err != nil {
klog.Error(err.Error())
os.Exit(1)
Expand Down Expand Up @@ -244,15 +244,15 @@ func main() {
// Will be provided via default gatherer.
metrics.WithProcessStartTime(false),
metrics.WithMigration())
migratedGrpcClient, err := ctrl.Connect(*csiEndpoint, metricsManager)
migratedGrpcClient, err := ctrl.Connect(ctx, *csiEndpoint, metricsManager)
if err != nil {
klog.Error(err.Error())
os.Exit(1)
}
grpcClient.Close()
grpcClient = migratedGrpcClient

err = ctrl.Probe(grpcClient, *operationTimeout)
err = ctrl.Probe(ctx, grpcClient, *operationTimeout)
if err != nil {
klog.Error(err.Error())
os.Exit(1)
Expand Down Expand Up @@ -553,34 +553,20 @@ func main() {
csiProvisioner = capacity.NewProvisionWrapper(csiProvisioner, capacityController)
}

provisionController = controller.NewProvisionController(
clientset,
provisionerName,
csiProvisioner,
provisionerOptions...,
)

csiClaimController := ctrl.NewCloningProtectionController(
clientset,
claimLister,
claimInformer,
claimQueue,
controllerCapabilities,
)

// Start HTTP server, regardless whether we are the leader or not.
if addr != "" {
// To collect metrics data from the metric handler itself, we
// let it register itself and then collect from that registry.
// Start HTTP server, regardless whether we are the leader or not.
// Register provisioner metrics manually to be able to add multiplexer in front of it
m := libmetrics.New("controller")
reg := prometheus.NewRegistry()
reg.MustRegister([]prometheus.Collector{
libmetrics.PersistentVolumeClaimProvisionTotal,
libmetrics.PersistentVolumeClaimProvisionFailedTotal,
libmetrics.PersistentVolumeClaimProvisionDurationSeconds,
libmetrics.PersistentVolumeDeleteTotal,
libmetrics.PersistentVolumeDeleteFailedTotal,
libmetrics.PersistentVolumeDeleteDurationSeconds,
m.PersistentVolumeClaimProvisionTotal,
m.PersistentVolumeClaimProvisionFailedTotal,
m.PersistentVolumeClaimProvisionDurationSeconds,
m.PersistentVolumeDeleteTotal,
m.PersistentVolumeDeleteFailedTotal,
m.PersistentVolumeDeleteDurationSeconds,
}...)
provisionerOptions = append(provisionerOptions, controller.MetricsInstance(m))
gatherers = append(gatherers, reg)

// This is similar to k8s.io/component-base/metrics HandlerWithReset
Expand Down Expand Up @@ -611,6 +597,23 @@ func main() {
}()
}

logger := klog.FromContext(ctx)
provisionController = controller.NewProvisionController(
logger,
clientset,
provisionerName,
csiProvisioner,
provisionerOptions...,
)

csiClaimController := ctrl.NewCloningProtectionController(
clientset,
claimLister,
claimInformer,
claimQueue,
controllerCapabilities,
)

run := func(ctx context.Context) {
factory.Start(ctx.Done())
if factoryForNamespace != nil {
Expand Down
86 changes: 43 additions & 43 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
module github.com/kubernetes-csi/external-provisioner

go 1.21
go 1.22.3

require (
github.com/container-storage-interface/spec v1.9.0
github.com/golang/mock v1.6.0
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/kubernetes-csi/csi-lib-utils v0.17.0
github.com/kubernetes-csi/csi-lib-utils v0.18.0
github.com/kubernetes-csi/csi-test/v5 v5.2.0
github.com/kubernetes-csi/external-snapshotter/client/v6 v6.3.0
github.com/miekg/dns v1.1.59 // indirect
Expand All @@ -17,23 +17,23 @@ require (
github.com/stretchr/testify v1.9.0
google.golang.org/grpc v1.63.2
google.golang.org/protobuf v1.34.1
k8s.io/api v0.29.2
k8s.io/apimachinery v0.29.2
k8s.io/apiserver v0.29.2
k8s.io/api v0.30.0
k8s.io/apimachinery v0.30.0
k8s.io/apiserver v0.30.0
k8s.io/client-go v1.5.2
k8s.io/component-base v0.29.2
k8s.io/component-helpers v0.29.0
k8s.io/component-base v0.30.0
k8s.io/component-helpers v0.30.0
k8s.io/csi-translation-lib v0.29.0
k8s.io/klog/v2 v2.120.1
sigs.k8s.io/controller-runtime v0.17.3
sigs.k8s.io/gateway-api v1.0.0
sigs.k8s.io/sig-storage-lib-external-provisioner/v9 v9.1.0-rc.0
sigs.k8s.io/sig-storage-lib-external-provisioner/v10 v10.0.0
)

require (
github.com/onsi/ginkgo/v2 v2.17.3
github.com/onsi/gomega v1.33.1
k8s.io/kubernetes v1.29.2
k8s.io/kubernetes v1.30.0
)

require (
Expand Down Expand Up @@ -62,7 +62,7 @@ require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/cel-go v0.17.7 // indirect
github.com/google/cel-go v0.17.8 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
Expand Down Expand Up @@ -120,11 +120,11 @@ require (
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.29.2 // indirect
k8s.io/cloud-provider v0.29.0-rc.1 // indirect
k8s.io/controller-manager v0.29.0 // indirect
k8s.io/kms v0.29.0 // indirect
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
k8s.io/apiextensions-apiserver v0.30.0 // indirect
k8s.io/cloud-provider v0.30.0 // indirect
k8s.io/controller-manager v0.30.0 // indirect
k8s.io/kms v0.30.0 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/kubectl v0.27.0 // indirect
k8s.io/kubelet v0.27.0 // indirect
k8s.io/mount-utils v0.27.0 // indirect
Expand All @@ -136,58 +136,58 @@ require (
sigs.k8s.io/yaml v1.4.0 // indirect
)

replace k8s.io/api => k8s.io/api v0.29.0
replace k8s.io/api => k8s.io/api v0.30.0

replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.0
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.0

replace k8s.io/apimachinery => k8s.io/apimachinery v0.29.0
replace k8s.io/apimachinery => k8s.io/apimachinery v0.30.0

replace k8s.io/apiserver => k8s.io/apiserver v0.29.0
replace k8s.io/apiserver => k8s.io/apiserver v0.30.0

replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.0
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.0

replace k8s.io/client-go => k8s.io/client-go v0.29.0
replace k8s.io/client-go => k8s.io/client-go v0.30.0

replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.0
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.0

replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.0
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.0

replace k8s.io/code-generator => k8s.io/code-generator v0.29.0
replace k8s.io/code-generator => k8s.io/code-generator v0.30.0

replace k8s.io/component-base => k8s.io/component-base v0.29.0
replace k8s.io/component-base => k8s.io/component-base v0.30.0

replace k8s.io/component-helpers => k8s.io/component-helpers v0.29.0
replace k8s.io/component-helpers => k8s.io/component-helpers v0.30.0

replace k8s.io/controller-manager => k8s.io/controller-manager v0.29.0
replace k8s.io/controller-manager => k8s.io/controller-manager v0.30.0

replace k8s.io/cri-api => k8s.io/cri-api v0.29.0
replace k8s.io/cri-api => k8s.io/cri-api v0.30.0

replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.0
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.0

replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.0
replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.0

replace k8s.io/endpointslice => k8s.io/endpointslice v0.29.0
replace k8s.io/endpointslice => k8s.io/endpointslice v0.30.0

replace k8s.io/kms => k8s.io/kms v0.29.0
replace k8s.io/kms => k8s.io/kms v0.30.0

replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.0
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.0

replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.0
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.0

replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.0
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.0

replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.0
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.0

replace k8s.io/kubectl => k8s.io/kubectl v0.29.0
replace k8s.io/kubectl => k8s.io/kubectl v0.30.0

replace k8s.io/kubelet => k8s.io/kubelet v0.29.0
replace k8s.io/kubelet => k8s.io/kubelet v0.30.0

replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.0
replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.0

replace k8s.io/metrics => k8s.io/metrics v0.29.0
replace k8s.io/metrics => k8s.io/metrics v0.30.0

replace k8s.io/mount-utils => k8s.io/mount-utils v0.29.0
replace k8s.io/mount-utils => k8s.io/mount-utils v0.30.0

replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.0
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.0

replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.0
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.0

0 comments on commit dd20b66

Please sign in to comment.