mirror of https://github.com/kubernetes/kops.git
Fix default make target
Adding the e2e.mk file changed the default target for `make` This reverts the behavior back to the original `kops-install`
This commit is contained in:
parent
9057e13288
commit
9c6814fb81
4
Makefile
4
Makefile
|
@ -12,8 +12,6 @@
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
include tests/e2e/e2e.mk
|
|
||||||
|
|
||||||
# kops source root directory (without trailing /)
|
# kops source root directory (without trailing /)
|
||||||
KOPS_ROOT?=$(patsubst %/,%,$(abspath $(dir $(firstword $(MAKEFILE_LIST)))))
|
KOPS_ROOT?=$(patsubst %/,%,$(abspath $(dir $(firstword $(MAKEFILE_LIST)))))
|
||||||
DOCKER_REGISTRY?=gcr.io/must-override
|
DOCKER_REGISTRY?=gcr.io/must-override
|
||||||
|
@ -110,6 +108,8 @@ all-install: all kops-install channels-install
|
||||||
.PHONY: all
|
.PHONY: all
|
||||||
all: ${KOPS} ${PROTOKUBE} ${NODEUP} ${CHANNELS}
|
all: ${KOPS} ${PROTOKUBE} ${NODEUP} ${CHANNELS}
|
||||||
|
|
||||||
|
include tests/e2e/e2e.mk
|
||||||
|
|
||||||
.PHONY: help
|
.PHONY: help
|
||||||
help: # Show this help
|
help: # Show this help
|
||||||
@{ \
|
@{ \
|
||||||
|
|
Loading…
Reference in New Issue