Skip to content

Commit dc7c247

Browse files
author
Vaughn Dice
committed
ref(ci): remove manifests dir
1 parent af3f5c4 commit dc7c247

4 files changed

Lines changed: 10 additions & 91 deletions

File tree

Makefile

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ include includes.mk
44
DOCKER_HOST = $(shell echo $$DOCKER_HOST)
55
BUILD_TAG ?= git-$(shell git rev-parse --short HEAD)
66
SHORT_NAME ?= nsq
7+
DEPLOYMENT_NAME ?= nsqd
78
DEIS_REGISTRY ?= ${DEV_REGISTRY}
89
IMAGE_PREFIX ?= deis
910

@@ -14,9 +15,6 @@ include versioning.mk
1415

1516
build: docker-build
1617
push: docker-push
17-
install: kube-install
18-
uninstall: kube-delete
19-
upgrade: kube-update
2018

2119
docker-build:
2220
docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE} rootfs
@@ -30,20 +28,13 @@ test: test-style
3028
test-style: check-docker
3129
${TEST_ENV_PREFIX} shellcheck $(SHELL_SCRIPTS)
3230

33-
update-manifests:
34-
sed 's#\(image:\) .*#\1 $(IMAGE)#' manifests/deis-nsqd-rc.yaml > manifests/deis-nsqd-rc.tmp.yaml
31+
deploy: check-kubectl docker-build docker-push
32+
kubectl --namespace=deis patch deployment deis-${DEPLOYMENT_NAME} \
33+
--type='json' \
34+
-p='[ \
35+
{"op": "replace", "path": "/spec/strategy", "value":{"type":"Recreate"}}, \
36+
{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"$(IMAGE)"}, \
37+
{"op": "replace", "path": "/spec/template/spec/containers/0/imagePullPolicy", "value":"Always"} \
38+
]'
3539

36-
kube-install: update-manifests
37-
kubectl create -f manifests/deis-nsqd-svc.yaml
38-
kubectl create -f manifests/deis-nsqd-rc.yaml
39-
40-
kube-delete:
41-
kubectl delete -f manifests/deis-nsqd-svc.yaml
42-
kubectl delete -f manifests/deis-nsqd-rc.yaml
43-
44-
kube-update: update-manifests
45-
kubectl delete -f manifests/deis-nsqd-rc.tmp.yaml
46-
kubectl create -f manifests/deis-nsqd-rc.tmp.yaml
47-
48-
.PHONY: build push install uninstall upgrade docker-build clean test test-style \
49-
update-manifests kube-install kube-delete kube-update
40+
.PHONY: build push docker-build clean test test-style deploy

manifests/deis-nsqd-rc.yaml

Lines changed: 0 additions & 47 deletions
This file was deleted.

manifests/deis-nsqd-service-account.yaml

Lines changed: 0 additions & 7 deletions
This file was deleted.

manifests/deis-nsqd-svc.yaml

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)