Skip to content

Commit a93a83b

Browse files
authored
Merge pull request #59 from msau42/deprecate
remove deprecated connection-timeout arg
2 parents 59330b5 + 062b2fe commit a93a83b

File tree

6 files changed

+2
-269
lines changed

6 files changed

+2
-269
lines changed

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,6 @@ spec:
7777

7878
* All glog / klog arguments are supported, such as `-v <log level>` or `-alsologtostderr`.
7979

80-
#### Deprecated arguments
81-
82-
* `--connection-timeout <duration>`: This option was used to limit establishing connection to CSI driver. Currently, the option does not have any effect and the external-provisioner tries to connect to CSI driver socket indefinitely. It is recommended to run ReadinessProbe on the driver to ensure that the driver comes up in reasonable time.
83-
8480
## Community, discussion, contribution, and support
8581

8682
Learn how to engage with the Kubernetes community on the [community page](http://kubernetes.io/community/).

cmd/livenessprobe/main.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626
"k8s.io/klog"
2727

2828
connlib "github.com/kubernetes-csi/csi-lib-utils/connection"
29-
"github.com/kubernetes-csi/csi-lib-utils/deprecatedflags"
3029
"github.com/kubernetes-csi/csi-lib-utils/rpc"
3130

3231
"google.golang.org/grpc"
@@ -37,8 +36,6 @@ var (
3736
probeTimeout = flag.Duration("probe-timeout", time.Second, "Probe timeout in seconds")
3837
csiAddress = flag.String("csi-address", "/run/csi/socket", "Address of the CSI driver socket.")
3938
healthzPort = flag.String("health-port", "9808", "TCP ports for listening healthz requests")
40-
41-
_ = deprecatedflags.Add("connection-timeout")
4239
)
4340

4441
type healthProbe struct {

deployment/kubernetes/hostpath-with-livenessprobe.yaml

Lines changed: 0 additions & 201 deletions
This file was deleted.

deployment/kubernetes/livenessprobe-sidecar.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
- name: hostpath-driver
2-
image: quay.io/k8scsi/hostpathplugin:v0.2.0
2+
image: quay.io/k8scsi/hostpathplugin:canary
33
imagePullPolicy: Always
44
securityContext:
55
privileged: true
@@ -47,9 +47,8 @@
4747
volumeMounts:
4848
- mountPath: /csi
4949
name: socket-dir
50-
image: quay.io/k8scsi/livenessprobe:v0.2.0
50+
image: quay.io/k8scsi/livenessprobe:canary
5151
args:
5252
- --v=5
5353
- --csi-address=/csi/csi.sock
54-
- --connection-timeout=3s
5554
#

vendor/github.com/kubernetes-csi/csi-lib-utils/deprecatedflags/deprecatedflags.go

Lines changed: 0 additions & 57 deletions
This file was deleted.

vendor/modules.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ github.com/golang/protobuf/ptypes/timestamp
1313
github.com/golang/protobuf/ptypes/wrappers
1414
# github.com/kubernetes-csi/csi-lib-utils v0.6.1
1515
github.com/kubernetes-csi/csi-lib-utils/connection
16-
github.com/kubernetes-csi/csi-lib-utils/deprecatedflags
1716
github.com/kubernetes-csi/csi-lib-utils/protosanitizer
1817
github.com/kubernetes-csi/csi-lib-utils/rpc
1918
# github.com/kubernetes-csi/csi-test v2.0.0+incompatible

0 commit comments

Comments
 (0)