From 9c2299f470e617f12a2ce434699939175aa82568 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Fri, 23 Feb 2018 12:54:16 +0100
Subject: some more refactoring

---
 src/flufigut.py                                              | 3 ++-
 templates/default/kubernetes/flumotion-manager-cm.yml.j2     | 2 +-
 templates/default/kubernetes/flumotion-manager-deploy.yml.j2 | 2 +-
 templates/default/kubernetes/flumotion-manager-secret.yml.j2 | 2 +-
 templates/default/kubernetes/flumotion-manager-svc.yml.j2    | 2 +-
 templates/default/kubernetes/flumotion-worker-deploy.yml.j2  | 2 +-
 templates/default/kubernetes/flumotion-worker-secret.yml.j2  | 2 +-
 templates/default/kubernetes/flumotion-worker-svc.yml.j2     | 2 +-
 templates/default/kubernetes/nginx-streamer-cm.yml.j2        | 2 +-
 templates/default/kubernetes/nginx-streamer-deploy.yml.j2    | 2 +-
 templates/default/kubernetes/nginx-streamer-svc.yml.j2       | 2 +-
 templates/default/kubernetes/onion-service-role.yml.j2       | 2 +-
 templates/default/kubernetes/onionbalance-deploy.yml.j2      | 2 +-
 templates/default/kubernetes/onionbalance-role.yml.j2        | 2 +-
 templates/default/kubernetes/onionbalance-rolebinding.yml.j2 | 4 ++--
 templates/default/kubernetes/onionbalance-sa.yml.j2          | 2 +-
 templates/default/kubernetes/onionbalance-secret.yml.j2      | 2 +-
 templates/default/kubernetes/sfive-cm.yml.j2                 | 2 +-
 templates/default/kubernetes/sfive-deploy.yml.j2             | 2 +-
 templates/default/kubernetes/sfive-onion-rolebinding.yml.j2  | 4 ++--
 templates/default/kubernetes/sfive-sa.yml.j2                 | 2 +-
 21 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/flufigut.py b/src/flufigut.py
index c8c073b..f13c5b4 100755
--- a/src/flufigut.py
+++ b/src/flufigut.py
@@ -695,7 +695,8 @@ class K8sDeployment:
 
     def __generate_object(self, tmpl_env, template_file, deploy={}):
         tmpl = tmpl_env.get_template(template_file + '.j2')
-        object_yaml = tmpl.render(namespace=self._namespace, desc=self._desc, planet=self._planet, deploy=deploy)
+        deploy['namespace'] = self._namespace
+        object_yaml = tmpl.render(desc=self._desc, planet=self._planet, deploy=deploy)
         return yaml.load(object_yaml)
 
     def _deploy_flumotion_manager(self, template_dir, tmpl_env, v1, appsV1):
diff --git a/templates/default/kubernetes/flumotion-manager-cm.yml.j2 b/templates/default/kubernetes/flumotion-manager-cm.yml.j2
index d29cff6..1346d5f 100644
--- a/templates/default/kubernetes/flumotion-manager-cm.yml.j2
+++ b/templates/default/kubernetes/flumotion-manager-cm.yml.j2
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ namespace }}
+  namespace: {{ deploy.namespace }}
   name: flumotion-manager
   labels:
     app: flumotion
diff --git a/templates/default/kubernetes/flumotion-manager-deploy.yml.j2 b/templates/default/kubernetes/flumotion-manager-deploy.yml.j2
index 7263341..e676f28 100644
--- a/templates/default/kubernetes/flumotion-manager-deploy.yml.j2
+++ b/templates/default/kubernetes/flumotion-manager-deploy.yml.j2
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  namespace: {{ namespace }}
+  namespace: {{ deploy.namespace }}
   name: flumotion-manager
   labels:
     app: flumotion
diff --git a/templates/default/kubernetes/flumotion-manager-secret.yml.j2 b/templates/default/kubernetes/flumotion-manager-secret.yml.j2
index 0b64372..d1083e3 100644
--- a/templates/default/kubernetes/flumotion-manager-secret.yml.j2
+++ b/templates/default/kubernetes/flumotion-manager-secret.yml.j2
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  namespace: {{ namespace }}
+  namespace: {{ deploy.namespace }}
   name: flumotion-manager
   labels:
     app: flumotion
diff --git a/templates/default/kubernetes/flumotion-manager-svc.yml.j2 b/templates/default/kubernetes/flumotion-manager-svc.yml.j2
index e7787bf..5ba9724 100644
--- a/templates/default/kubernetes/flumotion-manager-svc.yml.j2
+++ b/templates/default/kubernetes/flumotion-manager-svc.yml.j2
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  namespace: {{ namespace }}
+  namespace: {{ deploy.namespace }}
   name: flumotion-manager
   labels:
     app: flumotion
diff --git a/templates/default/kubernetes/flumotion-worker-deploy.yml.j2 b/templates/default/kubernetes/flumotion-worker-deploy.yml.j2
index 2ae001f..f7be807 100644
--- a/templates/default/kubernetes/flumotion-worker-deploy.yml.j2
+++ b/templates/default/kubernetes/flumotion-worker-deploy.yml.j2
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  namespace: {{ namespace }}
+  namespace: {{ deploy.namespace }}
   name: flumotion-worker-{{ deploy.worker.name }}
   labels:
     app: flumotion
diff --git a/templates/default/kubernetes/flumotion-worker-secret.yml.j2 b/templates/default/kubernetes/flumotion-worker-secret.yml.j2
index 3b5f446..9c9de65 100644
--- a/templates/default/kubernetes/flumotion-worker-secret.yml.j2
+++ b/templates/default/kubernetes/flumotion-worker-secret.yml.j2
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  namespace: {{ namespace }}
+  namespace: {{ deploy.namespace }}
   name: flumotion-worker-{{ deploy.worker.name }}
   labels:
     app: flumotion
diff --git a/templates/default/kubernetes/flumotion-worker-svc.yml.j2 b/templates/default/kubernetes/flumotion-worker-svc.yml.j2
index db66be3..5d66b8f 100644
--- a/templates/default/kubernetes/flumotion-worker-svc.yml.j2
+++ b/templates/default/kubernetes/flumotion-worker-svc.yml.j2
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  namespace: {{ namespace }}
+  namespace: {{ deploy.namespace }}
   name: flumotion-worker-{{ deploy.worker.name }}
   labels:
     app: flumotion
diff --git a/templates/default/kubernetes/nginx-streamer-cm.yml.j2 b/templates/default/kubernetes/nginx-streamer-cm.yml.j2
index c97bd63..72cc461 100644
--- a/templates/default/kubernetes/nginx-streamer-cm.yml.j2
+++ b/templates/default/kubernetes/nginx-streamer-cm.yml.j2
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ namespace }}
+  namespace: {{ deploy.namespace }}
   name: nginx-streamer-{{ deploy.worker.name }}
   labels:
     app: nginx
diff --git a/templates/default/kubernetes/nginx-streamer-deploy.yml.j2 b/templates/default/kubernetes/nginx-streamer-deploy.yml.j2
index a1bfd3e..6083cd3 100644
--- a/templates/default/kubernetes/nginx-streamer-deploy.yml.j2
+++ b/templates/default/kubernetes/nginx-streamer-deploy.yml.j2
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  namespace: {{ namespace }}
+  namespace: {{ deploy.namespace }}
   name: nginx-streamer-{{ deploy.worker.name }}
   labels:
     app: nginx
diff --git a/templates/default/kubernetes/nginx-streamer-svc.yml.j2 b/templates/default/kubernetes/nginx-streamer-svc.yml.j2
index 1da952f..5346215 100644
--- a/templates/default/kubernetes/nginx-streamer-svc.yml.j2
+++ b/templates/default/kubernetes/nginx-streamer-svc.yml.j2
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  namespace: {{ namespace }}
+  namespace: {{ deploy.namespace }}
   name: nginx-streamer-{{ deploy.worker.name }}
   labels:
     app: nginx
diff --git a/templates/default/kubernetes/onion-service-role.yml.j2 b/templates/default/kubernetes/onion-service-role.yml.j2
index eb7a6ca..4d1ad85 100644
--- a/templates/default/kubernetes/onion-service-role.yml.j2
+++ b/templates/default/kubernetes/onion-service-role.yml.j2
@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  namespace: {{ namespace }}
+  namespace: {{ deploy.namespace }}
   name: onion-service
 rules:
 - apiGroups:
diff --git a/templates/default/kubernetes/onionbalance-deploy.yml.j2 b/templates/default/kubernetes/onionbalance-deploy.yml.j2
index 7511b4b..0ec8151 100644
--- a/templates/default/kubernetes/onionbalance-deploy.yml.j2
+++ b/templates/default/kubernetes/onionbalance-deploy.yml.j2
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  namespace: {{ namespace }}
+  namespace: {{ deploy.namespace }}
   name: onionbalance
   labels:
     app: onionbalance
diff --git a/templates/default/kubernetes/onionbalance-role.yml.j2 b/templates/default/kubernetes/onionbalance-role.yml.j2
index bd4f743..8aa4673 100644
--- a/templates/default/kubernetes/onionbalance-role.yml.j2
+++ b/templates/default/kubernetes/onionbalance-role.yml.j2
@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  namespace: {{ namespace }}
+  namespace: {{ deploy.namespace }}
   name: onionbalance
 rules:
 - apiGroups:
diff --git a/templates/default/kubernetes/onionbalance-rolebinding.yml.j2 b/templates/default/kubernetes/onionbalance-rolebinding.yml.j2
index 6623d6c..299d8d8 100644
--- a/templates/default/kubernetes/onionbalance-rolebinding.yml.j2
+++ b/templates/default/kubernetes/onionbalance-rolebinding.yml.j2
@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  namespace: {{ namespace }}
+  namespace: {{ deploy.namespace }}
   name: onionbalance
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -10,4 +10,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: onionbalance
-  namespace: {{ namespace }}
+  namespace: {{ deploy.namespace }}
diff --git a/templates/default/kubernetes/onionbalance-sa.yml.j2 b/templates/default/kubernetes/onionbalance-sa.yml.j2
index d92b374..c55d075 100644
--- a/templates/default/kubernetes/onionbalance-sa.yml.j2
+++ b/templates/default/kubernetes/onionbalance-sa.yml.j2
@@ -1,5 +1,5 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  namespace: {{ namespace }}
+  namespace: {{ deploy.namespace }}
   name: onionbalance
diff --git a/templates/default/kubernetes/onionbalance-secret.yml.j2 b/templates/default/kubernetes/onionbalance-secret.yml.j2
index acbd110..84b6068 100644
--- a/templates/default/kubernetes/onionbalance-secret.yml.j2
+++ b/templates/default/kubernetes/onionbalance-secret.yml.j2
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  namespace: {{ namespace }}
+  namespace: {{ deploy.namespace }}
   name: onionbalance
   labels:
     app: onionbalance
diff --git a/templates/default/kubernetes/sfive-cm.yml.j2 b/templates/default/kubernetes/sfive-cm.yml.j2
index cdd6a13..0a18cf4 100644
--- a/templates/default/kubernetes/sfive-cm.yml.j2
+++ b/templates/default/kubernetes/sfive-cm.yml.j2
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: {{ namespace }}
+  namespace: {{ deploy.namespace }}
   name: sfive-{{ deploy.worker.name }}
   labels:
     app: sfive
diff --git a/templates/default/kubernetes/sfive-deploy.yml.j2 b/templates/default/kubernetes/sfive-deploy.yml.j2
index 6cd271b..fe9766b 100644
--- a/templates/default/kubernetes/sfive-deploy.yml.j2
+++ b/templates/default/kubernetes/sfive-deploy.yml.j2
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  namespace: {{ namespace }}
+  namespace: {{ deploy.namespace }}
   name: sfive-{{ deploy.worker.name }}
   labels:
     app: sfive
diff --git a/templates/default/kubernetes/sfive-onion-rolebinding.yml.j2 b/templates/default/kubernetes/sfive-onion-rolebinding.yml.j2
index f3e0489..eaae3ee 100644
--- a/templates/default/kubernetes/sfive-onion-rolebinding.yml.j2
+++ b/templates/default/kubernetes/sfive-onion-rolebinding.yml.j2
@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  namespace: {{ namespace }}
+  namespace: {{ deploy.namespace }}
   name: sfive-onion
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -10,4 +10,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: sfive
-  namespace: {{ namespace }}
+  namespace: {{ deploy.namespace }}
diff --git a/templates/default/kubernetes/sfive-sa.yml.j2 b/templates/default/kubernetes/sfive-sa.yml.j2
index c25f644..72bef0f 100644
--- a/templates/default/kubernetes/sfive-sa.yml.j2
+++ b/templates/default/kubernetes/sfive-sa.yml.j2
@@ -1,5 +1,5 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  namespace: {{ namespace }}
+  namespace: {{ deploy.namespace }}
   name: sfive
-- 
cgit v1.2.3