Merge pull request #20358 from gnufied/backport-flexvolume-containers

UPSTREAM: 65549: Fix flexvolume in containerized kubelets
openshift · Aug 17, 2018 · 4b8fef9 · 4b8fef9
2 parents 04a664b + 088576f
commit 4b8fef9
Show file tree

Hide file tree

Showing 13 changed files with 166 additions and 15 deletions.
diff --git a/vendor/k8s.io/kubernetes/cluster/get-kube-local.sh b/vendor/k8s.io/kubernetes/cluster/get-kube-local.sh
diff --git a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/BUILD b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/BUILD
diff --git a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/plugins.go b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/plugins.go
diff --git a/vendor/k8s.io/kubernetes/cmd/kubelet/app/plugins.go b/vendor/k8s.io/kubernetes/cmd/kubelet/app/plugins.go
diff --git a/vendor/k8s.io/kubernetes/cmd/kubelet/app/server.go b/vendor/k8s.io/kubernetes/cmd/kubelet/app/server.go
diff --git a/vendor/k8s.io/kubernetes/hack/local-up-cluster.sh b/vendor/k8s.io/kubernetes/hack/local-up-cluster.sh
diff --git a/vendor/k8s.io/kubernetes/pkg/util/nsenter/BUILD b/vendor/k8s.io/kubernetes/pkg/util/nsenter/BUILD
diff --git a/vendor/k8s.io/kubernetes/pkg/util/nsenter/exec.go b/vendor/k8s.io/kubernetes/pkg/util/nsenter/exec.go
diff --git a/vendor/k8s.io/kubernetes/pkg/util/nsenter/exec_unsupported.go b/vendor/k8s.io/kubernetes/pkg/util/nsenter/exec_unsupported.go
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/flexvolume/flexvolume_test.go b/vendor/k8s.io/kubernetes/pkg/volume/flexvolume/flexvolume_test.go
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/flexvolume/plugin.go b/vendor/k8s.io/kubernetes/pkg/volume/flexvolume/plugin.go
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/flexvolume/probe.go b/vendor/k8s.io/kubernetes/pkg/volume/flexvolume/probe.go
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/flexvolume/probe_test.go b/vendor/k8s.io/kubernetes/pkg/volume/flexvolume/probe_test.go