Skip to content

Commit

Permalink
Merge pull request #18766 from joelsmith/nested
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue.

UPSTREAM: 60342: Fix nested volume mounts for read-only API data volumes

**What this PR does / why we need it**:
Since the runtime may try to create mount points within the sandbox, it will fail if the mount point is within a read-only API data volume, like a secret or configMap volume.

Create any needed mount points during volume setup.

xref kubernetes/kubernetes#60342

**Which issue(s) this PR fixes**:
None

**Special notes for your reviewer**:

**Release note**:
No release notes because we haven't released anything (yet) that has this bug.
```release-note
NONE

```
  • Loading branch information
openshift-merge-robot authored Mar 1, 2018
2 parents 47ae0e5 + 87384b1 commit 90a3588
Show file tree
Hide file tree
Showing 7 changed files with 347 additions and 0 deletions.
3 changes: 3 additions & 0 deletions vendor/k8s.io/kubernetes/pkg/volume/configmap/configmap.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions vendor/k8s.io/kubernetes/pkg/volume/projected/projected.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions vendor/k8s.io/kubernetes/pkg/volume/secret/secret.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions vendor/k8s.io/kubernetes/pkg/volume/util/BUILD

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

99 changes: 99 additions & 0 deletions vendor/k8s.io/kubernetes/pkg/volume/util/nested_volumes.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

233 changes: 233 additions & 0 deletions vendor/k8s.io/kubernetes/pkg/volume/util/nested_volumes_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 90a3588

Please sign in to comment.