diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-22 05:10:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-22 05:10:09 +0000 |
| commit | fedff96e86c2b5bb0b0cee8d319c5e003dab401b (patch) | |
| tree | 89e82dd9ec18e81ff982209670c511758bf99163 | |
| parent | 348af90567066aaed0e5eee1fcca7f4a987885dd (diff) | |
| parent | 5a530be776c4897523e3419e69d798de0dc1755c (diff) | |
| download | kolla-fedff96e86c2b5bb0b0cee8d319c5e003dab401b.tar.gz kolla-fedff96e86c2b5bb0b0cee8d319c5e003dab401b.zip | |
Merge "Kubernetes: Rename Images to allow use with native deployment tools"
| -rw-r--r-- | docker/kube/kube-apiserver-amd64/Dockerfile.j2 (renamed from docker/kube/kube-apiserver/Dockerfile.j2) | 0 | ||||
| -rw-r--r-- | docker/kube/kube-controller-manager-amd64/Dockerfile.j2 (renamed from docker/kube/kube-controller-manager/Dockerfile.j2) | 0 | ||||
| -rw-r--r-- | docker/kube/kube-discovery-amd64/Dockerfile.j2 (renamed from docker/kube/kube-discovery/Dockerfile.j2) | 0 | ||||
| -rw-r--r-- | docker/kube/kube-proxy-amd64/Dockerfile.j2 (renamed from docker/kube/kube-proxy/Dockerfile.j2) | 0 | ||||
| -rw-r--r-- | docker/kube/kube-scheduler-amd64/Dockerfile.j2 (renamed from docker/kube/kube-scheduler/Dockerfile.j2) | 0 |
5 files changed, 0 insertions, 0 deletions
diff --git a/docker/kube/kube-apiserver/Dockerfile.j2 b/docker/kube/kube-apiserver-amd64/Dockerfile.j2 index 9edd42a5e..9edd42a5e 100644 --- a/docker/kube/kube-apiserver/Dockerfile.j2 +++ b/docker/kube/kube-apiserver-amd64/Dockerfile.j2 diff --git a/docker/kube/kube-controller-manager/Dockerfile.j2 b/docker/kube/kube-controller-manager-amd64/Dockerfile.j2 index 713778c8e..713778c8e 100644 --- a/docker/kube/kube-controller-manager/Dockerfile.j2 +++ b/docker/kube/kube-controller-manager-amd64/Dockerfile.j2 diff --git a/docker/kube/kube-discovery/Dockerfile.j2 b/docker/kube/kube-discovery-amd64/Dockerfile.j2 index 37e5d14dc..37e5d14dc 100644 --- a/docker/kube/kube-discovery/Dockerfile.j2 +++ b/docker/kube/kube-discovery-amd64/Dockerfile.j2 diff --git a/docker/kube/kube-proxy/Dockerfile.j2 b/docker/kube/kube-proxy-amd64/Dockerfile.j2 index 7eafe8fcd..7eafe8fcd 100644 --- a/docker/kube/kube-proxy/Dockerfile.j2 +++ b/docker/kube/kube-proxy-amd64/Dockerfile.j2 diff --git a/docker/kube/kube-scheduler/Dockerfile.j2 b/docker/kube/kube-scheduler-amd64/Dockerfile.j2 index 7009b396f..7009b396f 100644 --- a/docker/kube/kube-scheduler/Dockerfile.j2 +++ b/docker/kube/kube-scheduler-amd64/Dockerfile.j2 |