Merge pull request #235 from joelsmith/kedamain

joelsmith · web-flow · commit 46329e6b269a · 2024-06-28T18:38:58.000-06:00
Prevent namespace creation/modification when installing via OLM
diff --git a/controllers/keda/kedacontroller_controller.go b/controllers/keda/kedacontroller_controller.go
@@ -263,10 +263,12 @@ func parseManifestsFromFile(manifest mf.Manifest, c client.Client) (manifestGene
 			}
 		case "Secret":
 			controllerResources = append(controllerResources, r)
-		case "Namespace", "ServiceAccount":
+		case "ServiceAccount":
 			generalResources = append(generalResources, r)
 		case "PodMonitor", "ServiceMonitor":
 			monitoringResources = append(monitoringResources, r)
+		case "Namespace":
+			// ignore. we don't need to create or label the namespace since it's a prereq for OLM install anyway
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -263,10 +263,12 @@ func parseManifestsFromFile(manifest mf.Manifest, c client.Client) (manifestGene`
`263`	`263`	`}`
`264`	`264`	`case "Secret":`
`265`	`265`	`controllerResources = append(controllerResources, r)`
`266`		`- case "Namespace", "ServiceAccount":`
	`266`	`+ case "ServiceAccount":`
`267`	`267`	`generalResources = append(generalResources, r)`
`268`	`268`	`case "PodMonitor", "ServiceMonitor":`
`269`	`269`	`monitoringResources = append(monitoringResources, r)`
	`270`	`+ case "Namespace":`
	`271`	`+ // ignore. we don't need to create or label the namespace since it's a prereq for OLM install anyway`
`270`	`272`	`}`
`271`	`273`	`}`
`272`	`274`