Skip to content

Commit

Permalink
bots: Move openshift.kubeconfig to bots/images/
Browse files Browse the repository at this point in the history
That file is specific to test images and not being used in tests any
more, so it is also more suitable in bots/.  Also, the image refresh
task only considers changes in bots/images/, so image refreshes from the
bots were previously missing the update of that file.

Reviewed-by: Stef Walter <stefw@redhat.com>
  • Loading branch information
martinpitt authored and stefwalter committed Jul 20, 2017
1 parent 6e54b18 commit 439f6a6
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion bots/image-create
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ class MachineBuilder:

if self.machine.image == 'openshift':
# update our local openshift kube config file to match the new image
self.machine.download("/root/.kube/config", "../test/verify/files/openshift.kubeconfig")
self.machine.download("/root/.kube/config", "images/files/openshift.kubeconfig")

except subprocess.CalledProcessError, ex:
if args.sit:
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/kubernetes/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ To then access that it run the following in another terminal:

$ sudo yum install kubernetes-client
$ mkdir -p ~/.kube
$ cp test/verify/files/openshift.kubeconfig ~/.kube/config
$ cp bots/images/files/openshift.kubeconfig ~/.kube/config

You should now be able to use the kubectl command to access the cluster:

Expand Down
2 changes: 1 addition & 1 deletion test/vm-run
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ try:
kubeconfig = os.path.join(os.path.expanduser("~"), ".kube", "config")
if not os.path.lexists(kubeconfig):
d = os.path.dirname(kubeconfig)
src = os.path.abspath(os.path.join(TEST, "verify", "files", "openshift.kubeconfig"))
src = os.path.abspath(os.path.join(BOTS, "images", "files", "openshift.kubeconfig"))
if not os.path.exists(d):
os.makedirs(d)
sys.stderr.write("image-run: linking kubeconfig into ~/.kube/config\n")
Expand Down

0 comments on commit 439f6a6

Please sign in to comment.