@@ -102,25 +102,26 @@ def updateTektonDefinitions(namespace: str, yamlFile: str) -> None:
102102 logger .debug (line )
103103
104104
105- def preparePipelinesNamespace (dynClient : DynamicClient , instanceId : str = None , storageClass : str = None , accessMode : str = None , waitForBind : bool = True ):
106- templateDir = path .join (path .abspath (path .dirname (__file__ )), "templates" )
107- env = Environment (
108- loader = FileSystemLoader (searchpath = templateDir )
109- )
105+ def preparePipelinesNamespace (dynClient : DynamicClient , instanceId : str = None , storageClass : str = None , accessMode : str = None , waitForBind : bool = True , configureRBAC : bool = True ):
106+ if configureRBAC :
107+ templateDir = path .join (path .abspath (path .dirname (__file__ )), "templates" )
108+ env = Environment (
109+ loader = FileSystemLoader (searchpath = templateDir )
110+ )
110111
111- if instanceId is None :
112- namespace = "mas-pipelines"
113- template = env .get_template ("pipelines-rbac-cluster.yml.j2" )
114- else :
115- namespace = f"mas-{ instanceId } -pipelines"
116- template = env .get_template ("pipelines-rbac.yml.j2" )
112+ if instanceId is None :
113+ namespace = "mas-pipelines"
114+ template = env .get_template ("pipelines-rbac-cluster.yml.j2" )
115+ else :
116+ namespace = f"mas-{ instanceId } -pipelines"
117+ template = env .get_template ("pipelines-rbac.yml.j2" )
117118
118- # Create RBAC
119- renderedTemplate = template .render (mas_instance_id = instanceId )
120- logger .debug (renderedTemplate )
121- crb = yaml .safe_load (renderedTemplate )
122- clusterRoleBindingAPI = dynClient .resources .get (api_version = "rbac.authorization.k8s.io/v1" , kind = "ClusterRoleBinding" )
123- clusterRoleBindingAPI .apply (body = crb , namespace = namespace )
119+ # Create RBAC
120+ renderedTemplate = template .render (mas_instance_id = instanceId )
121+ logger .debug (renderedTemplate )
122+ crb = yaml .safe_load (renderedTemplate )
123+ clusterRoleBindingAPI = dynClient .resources .get (api_version = "rbac.authorization.k8s.io/v1" , kind = "ClusterRoleBinding" )
124+ clusterRoleBindingAPI .apply (body = crb , namespace = namespace )
124125
125126 # Create PVC (instanceId namespace only)
126127 if instanceId is not None :
0 commit comments