Update kubernetes/org prow and job configs post default-branch-rename

kubernetes · Jan 29, 2021 · 940fede · 940fede
1 parent 4ddcfd3
commit 940fede
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/config/jobs/kubernetes/test-infra/test-infra-trusted.yaml b/config/jobs/kubernetes/test-infra/test-infra-trusted.yaml
@@ -5,7 +5,6 @@ postsubmits:
     decorate: true
     branches:
     - ^main$
-    - ^master$
     max_concurrency: 1
     spec:
       containers:
@@ -785,7 +784,7 @@ periodics:
   extra_refs:
   - org: kubernetes
     repo: org
-    base_ref: master
+    base_ref: main
   spec:
     containers:
     - image: launcher.gcr.io/google/bazel:0.29.1

diff --git a/config/prow/plugins.yaml b/config/prow/plugins.yaml
@@ -328,7 +328,7 @@ milestone_applier:
     release-1.18: v1.18
     release-1.17: v1.17
   kubernetes/org:
-    master: v1.21
+    main: v1.21
   kubernetes/release:
     master: v1.21
   kubernetes/sig-release: