Grafana controllers: Add generic disable setting (#112250)

pkg/tests/apis/provisioning/job_conflict_test.go

@@ -21,7 +21,7 @@ func TestIntegrationProvisioning_JobConflict(t *testing.T) {
 
 	// disable the controllers so the jobs don't get auto-processed
 	helper := runGrafana(t, func(opts *testinfra.GrafanaOpts) {
-		opts.DisableProvisioningControllers = true
+		opts.DisableControllers = true
 	})
 	ctx := context.Background()
 

pkg/tests/testinfra/testinfra.go

@@ -545,10 +545,10 @@ func CreateGrafDir(t *testing.T, opts GrafanaOpts) (string, string) {
 		require.NoError(t, err)
 	}
 
-	if opts.DisableProvisioningControllers {
-		provisioningSection, err := getOrCreateSection("provisioning")
+	if opts.DisableControllers {
+		apiserverSection, err := getOrCreateSection("grafana-apiserver")
 		require.NoError(t, err)
-		_, err = provisioningSection.NewKey("disable_controllers", "true")
+		_, err = apiserverSection.NewKey("disable_controllers", "true")
 		require.NoError(t, err)
 	}
 
@@ -622,7 +622,7 @@ type GrafanaOpts struct {
 	EnableRecordingRules                  bool
 	EnableSCIM                            bool
 	APIServerRuntimeConfig                string
-	DisableProvisioningControllers        bool
+	DisableControllers                    bool
 
 	// When "unified-grpc" is selected it will also start the grpc server
 	APIServerStorageType options.StorageType