1. Add OpenShift's recycler templates to Kubernetes controller config (commit: f1e6a45) (details)
  2. UPSTREAM: revert: bc8249cc6f35fabffff5ccf4e13978ff9a6a2e32: "UPSTREAM: (commit: d2d3175) (details)
  3. Fix image layers order (commit: 6afac89) (details)
Commit f1e6a4588ecad6c07963b8050d2d7f9d46489875 by jsafrane
Add OpenShift's recycler templates to Kubernetes controller config
When user did not specify any recycler template files, create OpenShift
one and let Kubernetes use it.
The template file is created in /tmp and is deleted after controller
initialization (which is safe).
(commit: f1e6a45)
The file was modifiedpkg/cmd/server/start/start_kube_controller_manager.go (diff)
Commit d2d3175ca377b8f499627a71f24e835109a00529 by jsafrane
UPSTREAM: revert: bc8249cc6f35fabffff5ccf4e13978ff9a6a2e32: "UPSTREAM:
<carry>: allow PV controller recycler template override"
This reverts bc8249cc6f35fabffff5ccf4e13978ff9a6a2e32
(commit: d2d3175)
The file was modifiedvendor/ (diff)
The file was removedvendor/
Commit 6afac89584364fc735782d188770655955b8eb47 by Alexey Gladkov
Fix image layers order
Signed-off-by: Gladkov Alexey <>
(commit: 6afac89)
The file was modifiedpkg/image/apis/image/helper.go (diff)
The file was modifiedpkg/image/apis/image/helper_test.go (diff)
The file was modifiedpkg/image/apis/image/types.go (diff)