Skip to content

Commit 9d28031

Browse files
author
Matthew Fisher
committed
ref(postgres): remove kubernetes manifests
1 parent 2d8e5c2 commit 9d28031

4 files changed

Lines changed: 2 additions & 68 deletions

File tree

Makefile

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ DEIS_REGISTRY ?= ${DEV_REGISTRY}
1313

1414
IMAGE_PREFIX ?= deis
1515

16-
# Kubernetes-specific information for RC, Service, and Image.
17-
RC := contrib/kubernetes/manifests/${SHORT_NAME}-rc.tmp.yaml
18-
SVC := contrib/kubernetes/manifests/${SHORT_NAME}-service.yaml
16+
# Canonical docker image name
1917
IMAGE := ${DEIS_REGISTRY}${IMAGE_PREFIX}/${SHORT_NAME}:${VERSION}
2018

2119
all:
@@ -33,26 +31,7 @@ docker-build: check-docker
3331
docker-push: check-docker check-registry
3432
docker push ${IMAGE}
3533

36-
# Deploy is a Kubernetes-oriented target
37-
deploy: kube-service kube-rc
38-
39-
# Some things, like services, have to be deployed before pods. This is an
40-
# example target. Others could perhaps include kube-secret, kube-volume, etc.
41-
kube-service: check-kubectl
42-
kubectl create -f ${SVC}
43-
44-
# When possible, we deploy with RCs.
45-
kube-rc: check-kubectl
46-
kubectl create -f ${RC}
47-
48-
kube-clean: check-kubectl
49-
kubectl delete rc ${SHORT_NAME}
50-
5134
test: check-docker
5235
contrib/ci/test.sh ${IMAGE}
5336

54-
update-manifests:
55-
sed 's#\(image:\) .*#\1 $(IMAGE)#' contrib/kubernetes/manifests/${SHORT_NAME}-rc.yaml \
56-
> ${RC}
57-
58-
.PHONY: all build kube-up kube-down deploy
37+
.PHONY: all build deploy

contrib/kubernetes/manifests/postgres-rc.yaml

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

contrib/kubernetes/manifests/postgres-service.yaml

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

includes.mk

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@ check-docker:
44
exit 2; \
55
fi
66

7-
check-kubectl:
8-
@if [ -z $$(which kubectl) ]; then \
9-
echo "Missing \`kubectl\` client which is required for development"; \
10-
exit 2; \
11-
fi
12-
137
check-registry:
148
@if [ -z "$$DEIS_REGISTRY" ] && [ -z "$$DEV_REGISTRY" ]; then \
159
echo "DEIS_REGISTRY is not exported"; \

0 commit comments

Comments
 (0)