Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove deprecated connection-timeout arg #59

Merged
merged 2 commits into from
Jan 10, 2020
Merged

remove deprecated connection-timeout arg #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dba4835
remove deprecated connection-timeout arg
msau42 Jan 9, 2020
062b2fe
update vendor
msau42 Jan 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,6 @@ spec:

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

#### Deprecated arguments

* `--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.

## Community, discussion, contribution, and support

Learn how to engage with the Kubernetes community on the [community page](http://kubernetes.io/community/).
Expand Down
3 changes: 0 additions & 3 deletions cmd/livenessprobe/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (
"k8s.io/klog"

connlib "github.com/kubernetes-csi/csi-lib-utils/connection"
"github.com/kubernetes-csi/csi-lib-utils/deprecatedflags"
"github.com/kubernetes-csi/csi-lib-utils/rpc"

"google.golang.org/grpc"
Expand All @@ -37,8 +36,6 @@ var (
probeTimeout = flag.Duration("probe-timeout", time.Second, "Probe timeout in seconds")
csiAddress = flag.String("csi-address", "/run/csi/socket", "Address of the CSI driver socket.")
healthzPort = flag.String("health-port", "9808", "TCP ports for listening healthz requests")

_ = deprecatedflags.Add("connection-timeout")
)

type healthProbe struct {
Expand Down
201 changes: 0 additions & 201 deletions deployment/kubernetes/hostpath-with-livenessprobe.yaml
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions deployment/kubernetes/livenessprobe-sidecar.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
- name: hostpath-driver
image: quay.io/k8scsi/hostpathplugin:v0.2.0
image: quay.io/k8scsi/hostpathplugin:canary
imagePullPolicy: Always
securityContext:
privileged: true
Expand Down Expand Up @@ -47,9 +47,8 @@
volumeMounts:
- mountPath: /csi
name: socket-dir
image: quay.io/k8scsi/livenessprobe:v0.2.0
image: quay.io/k8scsi/livenessprobe:canary
args:
- --v=5
- --csi-address=/csi/csi.sock
- --connection-timeout=3s
#
57 changes: 0 additions & 57 deletions vendor/github.com/kubernetes-csi/csi-lib-utils/deprecatedflags/deprecatedflags.go
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ github.com/golang/protobuf/ptypes/timestamp
github.com/golang/protobuf/ptypes/wrappers
# github.com/kubernetes-csi/csi-lib-utils v0.6.1
github.com/kubernetes-csi/csi-lib-utils/connection
github.com/kubernetes-csi/csi-lib-utils/deprecatedflags
github.com/kubernetes-csi/csi-lib-utils/protosanitizer
github.com/kubernetes-csi/csi-lib-utils/rpc
# github.com/kubernetes-csi/csi-test v2.0.0+incompatible
Expand Down