Merge pull request kubernetes#14344 from alvaroaleman/move-config-to-config

Move prow/{plugins,config}.yaml to config/

Author: k8s-ci-robot

config/BUILD.bazel

@@ -4,12 +4,12 @@ sh_binary(
     name = "mkpj",
     srcs = ["mkpj_binary"],
     args = [
-        "--config-path=$(location //prow:config.yaml)",
+        "--config-path=$(location //config/prow:config.yaml)",
         "--job-config-path=config/jobs",
     ],
     data = [
         ":prowjobs",
-        "//prow:config.yaml",
+        "//config/prow:config.yaml",
     ],
 )
 
@@ -49,6 +49,7 @@ filegroup(
     srcs = [
         ":package-srcs",
         "//config/jobs/kubernetes-security:all-srcs",
+        "//config/prow:all-srcs",
         "//config/tests/jobs:all-srcs",
         "//config/tests/testgrids:all-srcs",
     ],

config/jobs/README.md

@@ -54,7 +54,7 @@ eg:
 
 Prow supports [Presets](/prow/jobs.md#presets) to define and patch in common
 env vars and volumes used for credentials or common job config. Some are
-defined centrally in [`prow/config.yaml`], while others can be defined in
+defined centrally in [`config/prow/config.yaml`], while others can be defined in
 files here. eg:
 
 - [`preset-service-account: "true"`] ensures the prowjob has a GCP service

config/jobs/kubernetes-security/genjobs.go

@@ -19,7 +19,7 @@ genjobs automatically generates the security repo presubmits from the
 kubernetes presubmits
 
 NOTE: this makes a few assumptions
-- $PWD/../../prow/config.yaml is where the config lives (unless you supply --config=)
+- $PWD/../../config/prow/config.yaml is where the config lives (unless you supply --config=)
 - $PWD/.. is where the job configs live (unless you supply --jobs=)
 - the output is job configs ($PWD/..) + /kubernetes-security/generated-security-jobs.yaml (unless you supply --output)
 */
@@ -47,7 +47,7 @@ import (
 	"k8s.io/test-infra/prow/config"
 )
 
-var configPath = flag.String("config", "", "path to prow/config.yaml, defaults to $PWD/../../prow/config.yaml")
+var configPath = flag.String("config", "", "path to config/prow/config.yaml, defaults to $PWD/../../config/prow/config.yaml")
 var jobsPath = flag.String("jobs", "", "path to prowjobs, defaults to $PWD/../")
 var outputPath = flag.String("output", "", "path to output the generated jobs to, defaults to $PWD/generated-security-jobs.yaml")
 
@@ -315,13 +315,13 @@ func copyFile(srcPath, destPath string) error {
 
 func main() {
 	flag.Parse()
-	// default to $PWD/prow/config.yaml
+	// default to $PWD/config/prow/config.yaml
 	pwd, err := os.Getwd()
 	if err != nil {
 		log.Fatalf("Failed to get $PWD: %v", err)
 	}
 	if *configPath == "" {
-		*configPath = pwd + "/../../prow/config.yaml"
+		*configPath = pwd + "/../../config/prow/config.yaml"
 	}
 	if *jobsPath == "" {
 		*jobsPath = pwd + "/../"

config/jobs/kubernetes/test-infra/janitors.yaml

@@ -17,7 +17,7 @@ periodics:
       - go
       - run
       - experiment/ci-janitor/main.go
-      - --config-path=prow/config.yaml
+      - --config-path=config/prow/config.yaml
       - --job-config-path=config/jobs
       - --janitor-path=boskos/janitor/gcp_janitor.py
       image: gcr.io/k8s-testimages/kubekins-e2e:v20190917-d7c7545-master

config/jobs/kubernetes/test-infra/test-infra-presubmits.yaml

@@ -63,7 +63,7 @@ presubmits:
   - name: pull-test-infra-gubernator
     branches:
     - master
-    run_if_changed: 'gubernator|prow/config.yaml'
+    run_if_changed: 'gubernator|config/prow/config.yaml'
     decorate: true
     labels:
       preset-service-account: "true"

config/jobs/kubernetes/test-infra/test-infra-trusted.yaml

@@ -1043,7 +1043,7 @@ periodics:
       command:
       - /app/prow/cmd/branchprotector/app.binary
       args:
-      - --config-path=prow/config.yaml
+      - --config-path=config/prow/config.yaml
       - --job-config-path=config/jobs
       - --github-token-path=/etc/github/oauth
       - --confirm

config/pj-on-kind.sh

@@ -20,7 +20,7 @@ set -o nounset
 set -o pipefail
 
 root="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd -P)"
-export CONFIG_PATH="${root}/prow/config.yaml"
+export CONFIG_PATH="${root}/config/prow/config.yaml"
 export JOB_CONFIG_PATH="${root}/config/jobs"
 
 "${root}/prow/pj-on-kind.sh" "$@"

config/prow/BUILD.bazel

@@ -0,0 +1,20 @@
+package(default_visibility = ["//visibility:public"])
+
+filegroup(
+    name = "configs",
+    srcs = glob(["*.yaml"]),
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [":package-srcs"],
+    tags = ["automanaged"],
+    visibility = ["//visibility:public"],
+)