Skip to content

Commit

Permalink
deploy improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
miguelgarcia committed Mar 21, 2019
1 parent 7d1096b commit da9a3f2
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 18 deletions.
11 changes: 8 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,25 @@ docker-build:
crds:
kubectl apply -f config/crds

namespace:
kubectl apply -f config/namespace.yaml

permissions:
kubectl apply -f config/rbac

run: crds
python3 src/main.py --kubeconfig ~/.kube/config

install: crds permissions
install: namespace crds permissions

# Deploy controller in the configured Kubernetes cluster in ~/.kube/config
deploy: install
kubectl apply -f config/default --namespace=system
kubectl apply -f config/default --namespace=immortalcontainers-operator

# Remove controller in the configured Kubernetes cluster in ~/.kube/config
undeploy:
kubectl delete -f config/default --namespace=system
kubectl delete -f config/default --namespace=immortalcontainers-operator
kubectl delete -f config/crds || true
kubectl delete -f config/rbac || true
kubectl delete -f config/namespace.yaml || true

14 changes: 7 additions & 7 deletions config/default/default.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: exampleoperatorpy-controller
name: immortalcontainers-controller
labels:
app: exampleoperatorpy-controller
app: immortalcontainers-controller
spec:
replicas: 1
selector:
matchLabels:
app: exampleoperatorpy-controller
app: immortalcontainers-controller
template:
metadata:
labels:
app: exampleoperatorpy-controller
app: immortalcontainers-controller
spec:
serviceAccountName: immortalcontainer-operator
serviceAccountName: immortalcontainers-operator
containers:
- image: flugelit/immortalcontainer-operator-py
name: exampleoperatorpy-controller
- image: flugelit/immortalcontainer-operator-py:dev
name: immortalcontainers-controller
4 changes: 2 additions & 2 deletions config/namespace.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
kind: Namespace
metadata:
name: system
name: immortalcontainers-operator
labels:
name: system
name: immortalcontainers-operator
2 changes: 1 addition & 1 deletion config/rbac/rbac_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
creationTimestamp: null
name: immortalcontainer-operator
name: immortalcontainers-operator
rules:
- apiGroups:
- ""
Expand Down
8 changes: 4 additions & 4 deletions config/rbac/rbac_role_binding.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: immortalcontainer-operator-role-binding
name: immortalcontainers-operator-role-binding
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: immortalcontainer-operator
name: immortalcontainers-operator
subjects:
- kind: ServiceAccount
name: immortalcontainer-operator
namespace: system
name: immortalcontainers-operator
namespace: immortalcontainers-operator
3 changes: 2 additions & 1 deletion config/rbac/service_account.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: immortalcontainer-operator
name: immortalcontainers-operator
namespace: immortalcontainers-operator

0 comments on commit da9a3f2

Please sign in to comment.