camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acosent...@apache.org
Subject [camel-k] 01/01: Added make install-minishift command to build
Date Mon, 17 Sep 2018 10:26:07 GMT
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch minishift-install
in repository https://gitbox.apache.org/repos/asf/camel-k.git

commit 6f35fa624f5cbe432b72dee3ec986ab7e65337ad
Author: Andrea Cosentino <ancosen@gmail.com>
AuthorDate: Mon Sep 17 12:25:26 2018 +0200

    Added make install-minishift command to build
---
 README.md                   | 12 ++++--------
 build/Makefile              |  5 ++++-
 build/install_minishift.sh  | 11 +++++++++++
 build/minishift_add_role.sh |  7 -------
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 77ec083..528e2ff 100644
--- a/README.md
+++ b/README.md
@@ -177,14 +177,10 @@ make test-integration
 
 ### Running
 
-If you want to install everything you have in your source code and see it running on Kubernetes,
you need to follow these steps:
-- `make`: to build the project.
-- `eval $(minishift docker-env)`: to connect to your Minishift Docker daemon.
-- `make images`: to build the operator docker image.
-- `./kamel install`: to install Camel K into the namespace.
-- `oc delete pod -l name=camel-k-operator`: to ensure the operator is using latest image
(delete the pod to let Openshift recreate it).
-
-**Note for contributors:** why don't you embed all those steps in a `make install-minishift`
command?
+If you want to install everything you have in your source code and see it running on Kubernetes,
you need to run the following command:
+- `make install-minishift`: to build the project and run it on Minishift
+
+This command assumes you have an already running Minishift instance.
 
 Now you can play with Camel K:
 
diff --git a/build/Makefile b/build/Makefile
index 57cb693..172ccd5 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -52,6 +52,9 @@ images-build:
 images-push:
 	./build/images_push.sh
 
+install-minishift:
+	./build/install_minishift.sh
+
 test: check
 check:
 	go test ./...
@@ -62,4 +65,4 @@ check-integration:
 
 
 
-.PHONY: build build-operator build-kamel build-embed-resources build-runtime dep codegen
images images-build images-push test check test-integration check-integration clean release
prepare-release cross-compile new-version git-tag increment-snapshot
+.PHONY: build build-operator build-kamel build-embed-resources build-runtime dep codegen
images images-build images-push test check test-integration check-integration clean release
prepare-release cross-compile new-version git-tag increment-snapshot install-minishift
diff --git a/build/install_minishift.sh b/build/install_minishift.sh
new file mode 100755
index 0000000..5414771
--- /dev/null
+++ b/build/install_minishift.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+oc login -u system:admin
+make
+eval $(minishift docker-env)
+make images
+./kamel install --cluster-setup
+oc delete pod -l name=camel-k-operator
+oc login -u developer
+./kamel install
+
diff --git a/build/minishift_add_role.sh b/build/minishift_add_role.sh
deleted file mode 100755
index 4d69ca4..0000000
--- a/build/minishift_add_role.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-user=$(oc whoami)
-
-oc login -u system:admin
-oc policy add-role-to-user --role-namespace=$(oc project -q) camel-k $user
-oc login -u $user


Mime
View raw message