Merge pull request #81287 from nikhita/publishing-bot-16-branches

publishing: add rules for 1.16 and remove for 1.12
2025-09-13 13:14:05 +00:00 · 2019-08-14 00:40:25 -07:00
parent a520302fb4 4cff618ec2
commit e258fd741e
2 changed files with 299 additions and 196 deletions
--- a/staging/publishing/rules-godeps.yaml
+++ b/staging/publishing/rules-godeps.yaml
@@ -7,11 +7,6 @@ recursive-delete-patterns:
 rules:
 - destination: code-generator
  branches:
-  - source:
-      branch: release-1.12
-      dir: staging/src/k8s.io/code-generator
-    name: release-1.12
-    go: 1.10.8
  - source:
      branch: release-1.13
      dir: staging/src/k8s.io/code-generator
@@ -25,11 +20,6 @@ rules:
 - destination: apimachinery
  library: true
  branches:
-  - source:
-      branch: release-1.12
-      dir: staging/src/k8s.io/apimachinery
-    name: release-1.12
-    go: 1.10.8
  - source:
      branch: release-1.13
      dir: staging/src/k8s.io/apimachinery
@@ -43,14 +33,6 @@ rules:
 - destination: api
  library: true
  branches:
-  - source:
-      branch: release-1.12
-      dir: staging/src/k8s.io/api
-    name: release-1.12
-    go: 1.10.8
-    dependencies:
-    - repository: apimachinery
-      branch: release-1.12
  - source:
      branch: release-1.13
      dir: staging/src/k8s.io/api
@@ -70,16 +52,6 @@ rules:
 - destination: client-go
  library: true
  branches:
-  - source:
-      branch: release-1.12
-      dir: staging/src/k8s.io/client-go
-    name: release-9.0
-    go: 1.10.2
-    dependencies:
-    - repository: apimachinery
-      branch: release-1.12
-    - repository: api
-      branch: release-1.12
  - source:
      branch: release-1.13
      dir: staging/src/k8s.io/client-go
@@ -118,18 +90,6 @@ rules:
 - destination: apiserver
  library: true
  branches:
-  - source:
-      branch: release-1.12
-      dir: staging/src/k8s.io/apiserver
-    name: release-1.12
-    go: 1.10.8
-    dependencies:
-    - repository: apimachinery
-      branch: release-1.12
-    - repository: api
-      branch: release-1.12
-    - repository: client-go
-      branch: release-9.0
  - source:
      branch: release-1.13
      dir: staging/src/k8s.io/apiserver
@@ -158,20 +118,6 @@ rules:
        branch: release-1.14
 - destination: kube-aggregator
  branches:
-  - source:
-      branch: release-1.12
-      dir: staging/src/k8s.io/kube-aggregator
-    name: release-1.12
-    go: 1.10.8
-    dependencies:
-    - repository: apimachinery
-      branch: release-1.12
-    - repository: api
-      branch: release-1.12
-    - repository: client-go
-      branch: release-9.0
-    - repository: apiserver
-      branch: release-1.12
  - source:
      branch: release-1.13
      dir: staging/src/k8s.io/kube-aggregator
@@ -204,24 +150,6 @@ rules:
        branch: release-1.14
 - destination: sample-apiserver
  branches:
-  - source:
-      branch: release-1.12
-      dir: staging/src/k8s.io/sample-apiserver
-    name: release-1.12
-    go: 1.10.8
-    dependencies:
-    - repository: apimachinery
-      branch: release-1.12
-    - repository: api
-      branch: release-1.12
-    - repository: client-go
-      branch: release-9.0
-    - repository: apiserver
-      branch: release-1.12
-    - repository: code-generator
-      branch: release-1.12
-    required-packages:
-    - k8s.io/code-generator
  - source:
      branch: release-1.13
      dir: staging/src/k8s.io/sample-apiserver
@@ -270,22 +198,6 @@ rules:
    go build .
 - destination: sample-controller
  branches:
-  - source:
-      branch: release-1.12
-      dir: staging/src/k8s.io/sample-controller
-    name: release-1.12
-    go: 1.10.8
-    dependencies:
-    - repository: apimachinery
-      branch: release-1.12
-    - repository: api
-      branch: release-1.12
-    - repository: client-go
-      branch: release-9.0
-    - repository: code-generator
-      branch: release-1.12
-    required-packages:
-    - k8s.io/code-generator
  - source:
      branch: release-1.13
      dir: staging/src/k8s.io/sample-controller
@@ -331,24 +243,6 @@ rules:
    go build .
 - destination: apiextensions-apiserver
  branches:
-  - source:
-      branch: release-1.12
-      dir: staging/src/k8s.io/apiextensions-apiserver
-    name: release-1.12
-    go: 1.10.8
-    dependencies:
-    - repository: apimachinery
-      branch: release-1.12
-    - repository: api
-      branch: release-1.12
-    - repository: client-go
-      branch: release-9.0
-    - repository: apiserver
-      branch: release-1.12
-    - repository: code-generator
-      branch: release-1.12
-    required-packages:
-    - k8s.io/code-generator
  - source:
      branch: release-1.13
      dir: staging/src/k8s.io/apiextensions-apiserver
@@ -390,18 +284,6 @@ rules:
 - destination: metrics
  library: true
  branches:
-  - source:
-      branch: release-1.12
-      dir: staging/src/k8s.io/metrics
-    name: release-1.12
-    go: 1.10.8
-    dependencies:
-    - repository: apimachinery
-      branch: release-1.12
-    - repository: api
-      branch: release-1.12
-    - repository: client-go
-      branch: release-9.0
  - source:
      branch: release-1.13
      dir: staging/src/k8s.io/metrics
@@ -429,20 +311,6 @@ rules:
 - destination: csi-api
  library: true
  branches:
-  - source:
-      branch: release-1.12
-      dir: staging/src/k8s.io/csi-api
-    name: release-1.12
-    go: 1.10.8
-    dependencies:
-    - repository: apimachinery
-      branch: release-1.12
-    - repository: api
-      branch: release-1.12
-    - repository: client-go
-      branch: release-9.0
-    - repository: apiextensions-apiserver
-      branch: release-1.12
  - source:
      branch: release-1.13
      dir: staging/src/k8s.io/csi-api
@@ -474,18 +342,6 @@ rules:
 - destination: cli-runtime
  library: true
  branches:
-  - source:
-      branch: release-1.12
-      dir: staging/src/k8s.io/cli-runtime
-    name: release-1.12
-    go: 1.10.8
-    dependencies:
-    - repository: api
-      branch: release-1.12
-    - repository: apimachinery
-      branch: release-1.12
-    - repository: client-go
-      branch: release-9.0
  - source:
      branch: release-1.13
      dir: staging/src/k8s.io/cli-runtime
@@ -513,20 +369,6 @@ rules:
 - destination: sample-cli-plugin
  library: false
  branches:
-  - source:
-      branch: release-1.12
-      dir: staging/src/k8s.io/sample-cli-plugin
-    name: release-1.12
-    go: 1.10.8
-    dependencies:
-    - repository: api
-      branch: release-1.12
-    - repository: apimachinery
-      branch: release-1.12
-    - repository: cli-runtime
-      branch: release-1.12
-    - repository: client-go
-      branch: release-9.0
  - source:
      branch: release-1.13
      dir: staging/src/k8s.io/sample-cli-plugin
@@ -560,14 +402,6 @@ rules:
 - destination: kube-proxy
  library: true
  branches:
-  - source:
-      branch: release-1.12
-      dir: staging/src/k8s.io/kube-proxy
-    name: release-1.12
-    go: 1.10.8
-    dependencies:
-    - repository: apimachinery
-      branch: release-1.12
  - source:
      branch: release-1.13
      dir: staging/src/k8s.io/kube-proxy
@@ -589,16 +423,6 @@ rules:
 - destination: kubelet
  library: true
  branches:
-  - source:
-      branch: release-1.12
-      dir: staging/src/k8s.io/kubelet
-    name: release-1.12
-    go: 1.10.8
-    dependencies:
-    - repository: apimachinery
-      branch: release-1.12
-    - repository: api
-      branch: release-1.12
  - source:
      branch: release-1.13
      dir: staging/src/k8s.io/kubelet
@@ -624,16 +448,6 @@ rules:
 - destination: kube-scheduler
  library: true
  branches:
-  - source:
-      branch: release-1.12
-      dir: staging/src/k8s.io/kube-scheduler
-    name: release-1.12
-    go: 1.10.8
-    dependencies:
-    - repository: apimachinery
-      branch: release-1.12
-    - repository: apiserver
-      branch: release-1.12
  - source:
      branch: release-1.13
      dir: staging/src/k8s.io/kube-scheduler
@@ -659,16 +473,6 @@ rules:
 - destination: kube-controller-manager
  library: true
  branches:
-  - source:
-      branch: release-1.12
-      dir: staging/src/k8s.io/kube-controller-manager
-    name: release-1.12
-    go: 1.10.8
-    dependencies:
-    - repository: apimachinery
-      branch: release-1.12
-    - repository: apiserver
-      branch: release-1.12
  - source:
      branch: release-1.13
      dir: staging/src/k8s.io/kube-controller-manager
--- a/staging/publishing/rules.yaml
+++ b/staging/publishing/rules.yaml
@@ -16,6 +16,11 @@ rules:
      dir: staging/src/k8s.io/code-generator
    name: release-1.15
    go: 1.12.5
+  - source:
+      branch: release-1.16
+      dir: staging/src/k8s.io/code-generator
+    name: release-1.16
+    go: 1.12.7
 - destination: apimachinery
  library: true
  branches:
@@ -28,6 +33,11 @@ rules:
      dir: staging/src/k8s.io/apimachinery
    name: release-1.15
    go: 1.12.5
+  - source:
+      branch: release-1.16
+      dir: staging/src/k8s.io/apimachinery
+    name: release-1.16
+    go: 1.12.7
 - destination: api
  library: true
  branches:
@@ -46,6 +56,14 @@ rules:
    dependencies:
      - repository: apimachinery
        branch: release-1.15
+  - source:
+      branch: release-1.16
+      dir: staging/src/k8s.io/api
+    name: release-1.16
+    go: 1.12.7
+    dependencies:
+      - repository: apimachinery
+        branch: release-1.16
 - destination: client-go
  library: true
  branches:
@@ -68,6 +86,16 @@ rules:
        branch: release-1.15
      - repository: api
        branch: release-1.15
+  - source:
+      branch: release-1.16
+      dir: staging/src/k8s.io/client-go
+    name: release-13.0
+    go: 1.12.7
+    dependencies:
+      - repository: apimachinery
+        branch: release-1.16
+      - repository: api
+        branch: release-1.16
  smoke-test: |
    # assumes GO111MODULE=on
    go build ./...
@@ -90,6 +118,14 @@ rules:
    dependencies:
    - repository: apimachinery
      branch: release-1.15
+  - source:
+      branch: release-1.16
+      dir: staging/src/k8s.io/component-base
+    name: release-1.16
+    go: 1.12.7
+    dependencies:
+    - repository: apimachinery
+      branch: release-1.16
 - destination: apiserver
  library: true
  branches:
@@ -120,6 +156,20 @@ rules:
      branch: release-12.0
    - repository: component-base
      branch: release-1.15
+  - source:
+      branch: release-1.16
+      dir: staging/src/k8s.io/apiserver
+    name: release-1.16
+    go: 1.12.7
+    dependencies:
+    - repository: apimachinery
+      branch: release-1.16
+    - repository: api
+      branch: release-1.16
+    - repository: client-go
+      branch: release-13.0
+    - repository: component-base
+      branch: release-1.16
 - destination: kube-aggregator
  branches:
  - source:
@@ -157,6 +207,24 @@ rules:
      branch: release-1.15
    - repository: code-generator
      branch: release-1.15
+  - source:
+      branch: release-1.16
+      dir: staging/src/k8s.io/kube-aggregator
+    name: release-1.16
+    go: 1.12.7
+    dependencies:
+    - repository: apimachinery
+      branch: release-1.16
+    - repository: api
+      branch: release-1.16
+    - repository: client-go
+      branch: release-13.0
+    - repository: apiserver
+      branch: release-1.16
+    - repository: component-base
+      branch: release-1.16
+    - repository: code-generator
+      branch: release-1.16
 - destination: sample-apiserver
  branches:
  - source:
@@ -198,6 +266,26 @@ rules:
      branch: release-1.15
    required-packages:
    - k8s.io/code-generator
+  - source:
+      branch: release-1.16
+      dir: staging/src/k8s.io/sample-apiserver
+    name: release-1.16
+    go: 1.12.7
+    dependencies:
+    - repository: apimachinery
+      branch: release-1.16
+    - repository: api
+      branch: release-1.16
+    - repository: client-go
+      branch: release-13.0
+    - repository: apiserver
+      branch: release-1.16
+    - repository: code-generator
+      branch: release-1.16
+    - repository: component-base
+      branch: release-1.16
+    required-packages:
+    - k8s.io/code-generator
  smoke-test: |
    # assumes GO111MODULE=on
    go build .
@@ -234,6 +322,22 @@ rules:
      branch: release-1.15
    required-packages:
    - k8s.io/code-generator
+  - source:
+      branch: release-1.16
+      dir: staging/src/k8s.io/sample-controller
+    name: release-1.16
+    go: 1.12.7
+    dependencies:
+    - repository: apimachinery
+      branch: release-1.16
+    - repository: api
+      branch: release-1.16
+    - repository: client-go
+      branch: release-13.0
+    - repository: code-generator
+      branch: release-1.16
+    required-packages:
+    - k8s.io/code-generator
  smoke-test: |
    # assumes GO111MODULE=on
    go build .
@@ -278,6 +382,26 @@ rules:
      branch: release-1.15
    required-packages:
    - k8s.io/code-generator
+  - source:
+      branch: release-1.16
+      dir: staging/src/k8s.io/apiextensions-apiserver
+    name: release-1.16
+    go: 1.12.7
+    dependencies:
+    - repository: apimachinery
+      branch: release-1.16
+    - repository: api
+      branch: release-1.16
+    - repository: client-go
+      branch: release-13.0
+    - repository: apiserver
+      branch: release-1.16
+    - repository: code-generator
+      branch: release-1.16
+    - repository: component-base
+      branch: release-1.16
+    required-packages:
+    - k8s.io/code-generator
 - destination: metrics
  library: true
  branches:
@@ -308,6 +432,20 @@ rules:
      branch: release-12.0
    - repository: code-generator
      branch: release-1.15
+  - source:
+      branch: release-1.16
+      dir: staging/src/k8s.io/metrics
+    name: release-1.16
+    go: 1.12.7
+    dependencies:
+    - repository: apimachinery
+      branch: release-1.16
+    - repository: api
+      branch: release-1.16
+    - repository: client-go
+      branch: release-13.0
+    - repository: code-generator
+      branch: release-1.16
 - destination: cli-runtime
  library: true
  branches:
@@ -334,6 +472,18 @@ rules:
      branch: release-1.15
    - repository: client-go
      branch: release-12.0
+  - source:
+      branch: release-1.16
+      dir: staging/src/k8s.io/cli-runtime
+    name: release-1.16
+    go: 1.12.7
+    dependencies:
+    - repository: api
+      branch: release-1.16
+    - repository: apimachinery
+      branch: release-1.16
+    - repository: client-go
+      branch: release-13.0
 - destination: sample-cli-plugin
  library: false
  branches:
@@ -364,6 +514,20 @@ rules:
      branch: release-1.15
    - repository: client-go
      branch: release-12.0
+  - source:
+      branch: release-1.16
+      dir: staging/src/k8s.io/sample-cli-plugin
+    name: release-1.16
+    go: 1.12.7
+    dependencies:
+    - repository: api
+      branch: release-1.16
+    - repository: apimachinery
+      branch: release-1.16
+    - repository: cli-runtime
+      branch: release-1.16
+    - repository: client-go
+      branch: release-13.0
 - destination: kube-proxy
  library: true
  branches:
@@ -386,6 +550,16 @@ rules:
      branch: release-1.15
    - repository: component-base
      branch: release-1.15
+  - source:
+      branch: release-1.16
+      dir: staging/src/k8s.io/kube-proxy
+    name: release-1.16
+    go: 1.12.7
+    dependencies:
+    - repository: apimachinery
+      branch: release-1.16
+    - repository: component-base
+      branch: release-1.16
 - destination: kubelet
  library: true
  branches:
@@ -408,6 +582,16 @@ rules:
      branch: release-1.15
    - repository: api
      branch: release-1.15
+  - source:
+      branch: release-1.16
+      dir: staging/src/k8s.io/kubelet
+    name: release-1.16
+    go: 1.12.7
+    dependencies:
+    - repository: apimachinery
+      branch: release-1.16
+    - repository: api
+      branch: release-1.16
 - destination: kube-scheduler
  library: true
  branches:
@@ -430,6 +614,16 @@ rules:
      branch: release-1.15
    - repository: component-base
      branch: release-1.15
+  - source:
+      branch: release-1.16
+      dir: staging/src/k8s.io/kube-scheduler
+    name: release-1.16
+    go: 1.12.7
+    dependencies:
+    - repository: apimachinery
+      branch: release-1.16
+    - repository: component-base
+      branch: release-1.16
 - destination: kube-controller-manager
  library: true
  branches:
@@ -452,6 +646,16 @@ rules:
      branch: release-1.15
    - repository: component-base
      branch: release-1.15
+  - source:
+      branch: release-1.16
+      dir: staging/src/k8s.io/kube-controller-manager
+    name: release-1.16
+    go: 1.12.7
+    dependencies:
+    - repository: apimachinery
+      branch: release-1.16
+    - repository: component-base
+      branch: release-1.16
 - destination: cluster-bootstrap
  library: true
  branches:
@@ -474,6 +678,16 @@ rules:
      branch: release-1.15
    - repository: api
      branch: release-1.15
+  - source:
+      branch: release-1.16
+      dir: staging/src/k8s.io/cluster-bootstrap
+    name: release-1.16
+    go: 1.12.7
+    dependencies:
+    - repository: apimachinery
+      branch: release-1.16
+    - repository: api
+      branch: release-1.16
 - destination: cloud-provider
  library: true
  branches:
@@ -500,6 +714,18 @@ rules:
      branch: release-1.15
    - repository: client-go
      branch: release-12.0
+  - source:
+      branch: release-1.16
+      dir: staging/src/k8s.io/cloud-provider
+    name: release-1.16
+    go: 1.12.7
+    dependencies:
+    - repository: api
+      branch: release-1.16
+    - repository: apimachinery
+      branch: release-1.16
+    - repository: client-go
+      branch: release-13.0
 - destination: csi-translation-lib
  library: true
  branches:
@@ -530,6 +756,20 @@ rules:
      branch: release-12.0
    - repository: cloud-provider
      branch: release-1.15
+  - source:
+      branch: release-1.16
+      dir: staging/src/k8s.io/csi-translation-lib
+    name: release-1.16
+    go: 1.12.7
+    dependencies:
+    - repository: api
+      branch: release-1.16
+    - repository: apimachinery
+      branch: release-1.16
+    - repository: client-go
+      branch: release-13.0
+    - repository: cloud-provider
+      branch: release-1.16
 - destination: legacy-cloud-providers
  library: true
  branches:
@@ -568,6 +808,26 @@ rules:
      branch: release-1.15
    - repository: csi-translation-lib
      branch: release-1.15
+  - source:
+      branch: release-1.16
+      dir: staging/src/k8s.io/legacy-cloud-providers
+    name: release-1.16
+    go: 1.12.7
+    dependencies:
+    - repository: api
+      branch: release-1.16
+    - repository: apimachinery
+      branch: release-1.16
+    - repository: client-go
+      branch: release-13.0
+    - repository: cloud-provider
+      branch: release-1.16
+    - repository: csi-translation-lib
+      branch: release-1.16
+    - repository: apiserver
+      branch: release-1.16
+    - repository: component-base
+      branch: release-1.16
 - destination: node-api
  library: true
  branches:
@@ -598,6 +858,20 @@ rules:
      branch: release-12.0
    - repository: code-generator
      branch: release-1.15
+  - source:
+      branch: release-1.16
+      dir: staging/src/k8s.io/node-api
+    name: release-1.16
+    go: 1.12.7
+    dependencies:
+    - repository: api
+      branch: release-1.16
+    - repository: apimachinery
+      branch: release-1.16
+    - repository: client-go
+      branch: release-13.0
+    - repository: code-generator
+      branch: release-1.16
 - destination: cri-api
  library: true
  branches:
@@ -610,6 +884,11 @@ rules:
      dir: staging/src/k8s.io/cri-api
    name: release-1.15
    go: 1.12.5
+  - source:
+      branch: release-1.16
+      dir: staging/src/k8s.io/cri-api
+    name: release-1.16
+    go: 1.12.7
 - destination: kubectl
  library: true
  branches:
@@ -637,3 +916,23 @@ rules:
      dir: staging/src/k8s.io/kubectl
    name: release-1.15
    go: 1.12.5
+  - source:
+      branch: release-1.16
+      dir: staging/src/k8s.io/kubectl
+    name: release-1.16
+    go: 1.12.7
+    dependencies:
+    - repository: api
+      branch: release-1.16
+    - repository: apimachinery
+      branch: release-1.16
+    - repository: cli-runtime
+      branch: release-1.16
+    - repository: client-go
+      branch: release-13.0
+    - repository: code-generator
+      branch: release-1.16
+    - repository: component-base
+      branch: release-1.16
+    - repository: metrics
+      branch: release-1.16