Skip to content

Commit

Permalink
Remove etcd deployment (replaced by storing state in TPR)
Browse files Browse the repository at this point in the history
Also update the poolmgr commandline, and use an env var for the
fetcher image URL.
  • Loading branch information
soamvasani committed Jul 26, 2017
1 parent a764fbe commit c6c5831
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 77 deletions.
42 changes: 4 additions & 38 deletions fission-rbac.yaml
Expand Up @@ -62,7 +62,7 @@ spec:
- name: controller
image: fission/fission-bundle
command: ["/fission-bundle"]
args: ["--controllerPort", "8888", "--filepath", "/filestore"]
args: ["--controllerPort", "8888"]
serviceAccountName: fission-svc
---
apiVersion: extensions/v1beta1
Expand Down Expand Up @@ -115,6 +115,9 @@ spec:
image: fission/fission-bundle
command: ["/fission-bundle"]
args: ["--poolmgrPort", "8888"]
env:
- name: FETCHER_IMAGE
value: fission/fetcher:v2
serviceAccountName: fission-svc
---
apiVersion: extensions/v1beta1
Expand All @@ -135,40 +138,3 @@ spec:
command: ["/fission-bundle"]
args: ["--kubewatcher"]
serviceAccountName: fission-svc
---
apiVersion: v1
kind: Service
metadata:
name: etcd
namespace: fission
labels:
svc: etcd
spec:
ports:
- port: 2379
targetPort: 2379
selector:
svc: etcd
---
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: etcd
namespace: fission
spec:
replicas: 1
template:
metadata:
labels:
svc: etcd
spec:
containers:
- name: etcd
image: quay.io/coreos/etcd
imagePullPolicy: IfNotPresent
env:
- name: ETCD_LISTEN_CLIENT_URLS
value: http://0.0.0.0:2379
- name: ETCD_ADVERTISE_CLIENT_URLS
value: http://etcd:2379
serviceAccountName: fission-svc
43 changes: 4 additions & 39 deletions fission.yaml
Expand Up @@ -30,7 +30,7 @@ spec:
- name: controller
image: fission/fission-bundle
command: ["/fission-bundle"]
args: ["--controllerPort", "8888", "--filepath", "/filestore"]
args: ["--controllerPort", "8888"]

---
apiVersion: extensions/v1beta1
Expand Down Expand Up @@ -84,6 +84,9 @@ spec:
image: fission/fission-bundle
command: ["/fission-bundle"]
args: ["--poolmgrPort", "8888"]
env:
- name: FETCHER_IMAGE
value: fission/fetcher:v2

---
apiVersion: extensions/v1beta1
Expand Down Expand Up @@ -122,41 +125,3 @@ spec:
image: fission/fission-bundle
command: ["/fission-bundle"]
args: ["--timer"]

---
apiVersion: v1
kind: Service
metadata:
name: etcd
namespace: fission
labels:
svc: etcd
spec:
ports:
- port: 2379
targetPort: 2379
selector:
svc: etcd

---
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: etcd
namespace: fission
spec:
replicas: 1
template:
metadata:
labels:
svc: etcd
spec:
containers:
- name: etcd
image: quay.io/coreos/etcd
imagePullPolicy: IfNotPresent
env:
- name: ETCD_LISTEN_CLIENT_URLS
value: http://0.0.0.0:2379
- name: ETCD_ADVERTISE_CLIENT_URLS
value: http://etcd:2379

0 comments on commit c6c5831

Please sign in to comment.