modified: modules/transcoder/main.tf

	modified:   userdata/scheduler/new_job.py
	modified:   userdata/templates/configmap.yaml.template
	modified:   userdata/templates/scheduler.yaml.template

Author: mprestin77

modules/transcoder/main.tf

@@ -227,6 +227,7 @@ data "template_file" "new_job" {
     db_name = var.db_name
     db_user = var.db_user
     db_password = var.db_password
+    namespace = var.namespace
   }
 }
 

userdata/scheduler/new_job.py

@@ -48,13 +48,13 @@ def create_job(api_instance, job):
     # Create job
     api_response = api_instance.create_namespaced_job(
         body=job,
-        namespace="transcode")
+        namespace="${namespace}")
     print("Job created. status='%s'" % str(api_response.status), flush=True)
 
 def delete_job(api_instance, job_name):
     api_response = api_instance.delete_namespaced_job(
         name=job_name,
-        namespace="transcode",
+        namespace="${namespace}",
         body=client.V1DeleteOptions(
             propagation_policy='Foreground',
             grace_period_seconds=5))

userdata/templates/configmap.yaml.template

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: "${project_name}"
-  namespace: transcode
+  namespace: ${namespace}
 data:
   TC_STREAM_ENDPOINT: "${stream_endpoint}"  
   TC_STREAM_OCID: "${stream_ocid}" 

userdata/templates/scheduler.yaml.template

@@ -3,13 +3,13 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: transcoder
-  namespace: transcode
+  namespace: ${namespace}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: transcoder-role
-  namespace: transcode
+  namespace: ${namespace}
 rules:
   - apiGroups: ["batch", "extensions"]
     resources: ["jobs"]
@@ -34,7 +34,7 @@ kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: transcoder-rolebinding
-  namespace: transcode
+  namespace: ${namespace}
 subjects:
   - kind: ServiceAccount
     name: transcoder
@@ -47,7 +47,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: job-scheduler
-  namespace: transcode
+  namespace: ${namespace}
   labels:
     app: job-scheduler
 spec: