From 310730e94a6b69222276d77e81baca2e5b9d5d7f Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Fri, 14 Aug 2020 04:37:43 -0400 Subject: [PATCH 1/3] publishing: Use go1.13.15 for 1.18, 1.17, and 1.16 release branches Signed-off-by: Stephen Augustus --- staging/publishing/rules.yaml | 144 +++++++++++++++++----------------- 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml index 9f91e20b831..5dbe3744f5c 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -16,17 +16,17 @@ rules: branch: release-1.16 dir: staging/src/k8s.io/code-generator name: release-1.16 - go: 1.13.9 + go: 1.13.15 - source: branch: release-1.17 dir: staging/src/k8s.io/code-generator name: release-1.17 - go: 1.13.9 + go: 1.13.15 - source: branch: release-1.18 dir: staging/src/k8s.io/code-generator name: release-1.18 - go: 1.13.9 + go: 1.13.15 - source: branch: release-1.19 dir: staging/src/k8s.io/code-generator @@ -44,17 +44,17 @@ rules: branch: release-1.16 dir: staging/src/k8s.io/apimachinery name: release-1.16 - go: 1.13.9 + go: 1.13.15 - source: branch: release-1.17 dir: staging/src/k8s.io/apimachinery name: release-1.17 - go: 1.13.9 + go: 1.13.15 - source: branch: release-1.18 dir: staging/src/k8s.io/apimachinery name: release-1.18 - go: 1.13.9 + go: 1.13.15 - source: branch: release-1.19 dir: staging/src/k8s.io/apimachinery @@ -75,7 +75,7 @@ rules: branch: release-1.16 dir: staging/src/k8s.io/api name: release-1.16 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.16 @@ -83,7 +83,7 @@ rules: branch: release-1.17 dir: staging/src/k8s.io/api name: release-1.17 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.17 @@ -91,7 +91,7 @@ rules: branch: release-1.18 dir: staging/src/k8s.io/api name: release-1.18 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.18 @@ -120,7 +120,7 @@ rules: branch: release-1.16 dir: staging/src/k8s.io/client-go name: release-13.0 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.16 @@ -130,7 +130,7 @@ rules: branch: release-1.17 dir: staging/src/k8s.io/client-go name: release-14.0 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.17 @@ -140,7 +140,7 @@ rules: branch: release-1.18 dir: staging/src/k8s.io/client-go name: release-1.18 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.18 @@ -179,7 +179,7 @@ rules: branch: release-1.16 dir: staging/src/k8s.io/component-base name: release-1.16 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.16 @@ -191,7 +191,7 @@ rules: branch: release-1.17 dir: staging/src/k8s.io/component-base name: release-1.17 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.17 @@ -203,7 +203,7 @@ rules: branch: release-1.18 dir: staging/src/k8s.io/component-base name: release-1.18 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.18 @@ -244,7 +244,7 @@ rules: branch: release-1.16 dir: staging/src/k8s.io/apiserver name: release-1.16 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.16 @@ -258,7 +258,7 @@ rules: branch: release-1.17 dir: staging/src/k8s.io/apiserver name: release-1.17 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.17 @@ -272,7 +272,7 @@ rules: branch: release-1.18 dir: staging/src/k8s.io/apiserver name: release-1.18 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.18 @@ -320,7 +320,7 @@ rules: branch: release-1.16 dir: staging/src/k8s.io/kube-aggregator name: release-1.16 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.16 @@ -338,7 +338,7 @@ rules: branch: release-1.17 dir: staging/src/k8s.io/kube-aggregator name: release-1.17 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.17 @@ -356,7 +356,7 @@ rules: branch: release-1.18 dir: staging/src/k8s.io/kube-aggregator name: release-1.18 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.18 @@ -414,7 +414,7 @@ rules: branch: release-1.16 dir: staging/src/k8s.io/sample-apiserver name: release-1.16 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.16 @@ -434,7 +434,7 @@ rules: branch: release-1.17 dir: staging/src/k8s.io/sample-apiserver name: release-1.17 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.17 @@ -454,7 +454,7 @@ rules: branch: release-1.18 dir: staging/src/k8s.io/sample-apiserver name: release-1.18 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.18 @@ -515,7 +515,7 @@ rules: branch: release-1.16 dir: staging/src/k8s.io/sample-controller name: release-1.16 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.16 @@ -531,7 +531,7 @@ rules: branch: release-1.17 dir: staging/src/k8s.io/sample-controller name: release-1.17 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.17 @@ -547,7 +547,7 @@ rules: branch: release-1.18 dir: staging/src/k8s.io/sample-controller name: release-1.18 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.18 @@ -604,7 +604,7 @@ rules: branch: release-1.16 dir: staging/src/k8s.io/apiextensions-apiserver name: release-1.16 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.16 @@ -624,7 +624,7 @@ rules: branch: release-1.17 dir: staging/src/k8s.io/apiextensions-apiserver name: release-1.17 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.17 @@ -644,7 +644,7 @@ rules: branch: release-1.18 dir: staging/src/k8s.io/apiextensions-apiserver name: release-1.18 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.18 @@ -701,7 +701,7 @@ rules: branch: release-1.16 dir: staging/src/k8s.io/metrics name: release-1.16 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.16 @@ -715,7 +715,7 @@ rules: branch: release-1.17 dir: staging/src/k8s.io/metrics name: release-1.17 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.17 @@ -729,7 +729,7 @@ rules: branch: release-1.18 dir: staging/src/k8s.io/metrics name: release-1.18 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.18 @@ -772,7 +772,7 @@ rules: branch: release-1.16 dir: staging/src/k8s.io/cli-runtime name: release-1.16 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: api branch: release-1.16 @@ -784,7 +784,7 @@ rules: branch: release-1.17 dir: staging/src/k8s.io/cli-runtime name: release-1.17 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: api branch: release-1.17 @@ -796,7 +796,7 @@ rules: branch: release-1.18 dir: staging/src/k8s.io/cli-runtime name: release-1.18 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: api branch: release-1.18 @@ -837,7 +837,7 @@ rules: branch: release-1.16 dir: staging/src/k8s.io/sample-cli-plugin name: release-1.16 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: api branch: release-1.16 @@ -851,7 +851,7 @@ rules: branch: release-1.17 dir: staging/src/k8s.io/sample-cli-plugin name: release-1.17 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: api branch: release-1.17 @@ -865,7 +865,7 @@ rules: branch: release-1.18 dir: staging/src/k8s.io/sample-cli-plugin name: release-1.18 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: api branch: release-1.18 @@ -910,7 +910,7 @@ rules: branch: release-1.16 dir: staging/src/k8s.io/kube-proxy name: release-1.16 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.16 @@ -924,7 +924,7 @@ rules: branch: release-1.17 dir: staging/src/k8s.io/kube-proxy name: release-1.17 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.17 @@ -938,7 +938,7 @@ rules: branch: release-1.18 dir: staging/src/k8s.io/kube-proxy name: release-1.18 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.18 @@ -983,7 +983,7 @@ rules: branch: release-1.16 dir: staging/src/k8s.io/kubelet name: release-1.16 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.16 @@ -993,7 +993,7 @@ rules: branch: release-1.17 dir: staging/src/k8s.io/kubelet name: release-1.17 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.17 @@ -1003,7 +1003,7 @@ rules: branch: release-1.18 dir: staging/src/k8s.io/kubelet name: release-1.18 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.18 @@ -1044,7 +1044,7 @@ rules: branch: release-1.16 dir: staging/src/k8s.io/kube-scheduler name: release-1.16 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.16 @@ -1058,7 +1058,7 @@ rules: branch: release-1.17 dir: staging/src/k8s.io/kube-scheduler name: release-1.17 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.17 @@ -1072,7 +1072,7 @@ rules: branch: release-1.18 dir: staging/src/k8s.io/kube-scheduler name: release-1.18 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.18 @@ -1117,7 +1117,7 @@ rules: branch: release-1.16 dir: staging/src/k8s.io/kube-controller-manager name: release-1.16 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.16 @@ -1131,7 +1131,7 @@ rules: branch: release-1.17 dir: staging/src/k8s.io/kube-controller-manager name: release-1.17 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.17 @@ -1145,7 +1145,7 @@ rules: branch: release-1.18 dir: staging/src/k8s.io/kube-controller-manager name: release-1.18 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.18 @@ -1186,7 +1186,7 @@ rules: branch: release-1.16 dir: staging/src/k8s.io/cluster-bootstrap name: release-1.16 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.16 @@ -1196,7 +1196,7 @@ rules: branch: release-1.17 dir: staging/src/k8s.io/cluster-bootstrap name: release-1.17 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.17 @@ -1206,7 +1206,7 @@ rules: branch: release-1.18 dir: staging/src/k8s.io/cluster-bootstrap name: release-1.18 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: apimachinery branch: release-1.18 @@ -1243,7 +1243,7 @@ rules: branch: release-1.16 dir: staging/src/k8s.io/cloud-provider name: release-1.16 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: api branch: release-1.16 @@ -1255,7 +1255,7 @@ rules: branch: release-1.17 dir: staging/src/k8s.io/cloud-provider name: release-1.17 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: api branch: release-1.17 @@ -1267,7 +1267,7 @@ rules: branch: release-1.18 dir: staging/src/k8s.io/cloud-provider name: release-1.18 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: api branch: release-1.18 @@ -1312,7 +1312,7 @@ rules: branch: release-1.16 dir: staging/src/k8s.io/csi-translation-lib name: release-1.16 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: api branch: release-1.16 @@ -1326,7 +1326,7 @@ rules: branch: release-1.17 dir: staging/src/k8s.io/csi-translation-lib name: release-1.17 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: api branch: release-1.17 @@ -1340,7 +1340,7 @@ rules: branch: release-1.18 dir: staging/src/k8s.io/csi-translation-lib name: release-1.18 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: api branch: release-1.18 @@ -1393,7 +1393,7 @@ rules: branch: release-1.16 dir: staging/src/k8s.io/legacy-cloud-providers name: release-1.16 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: api branch: release-1.16 @@ -1413,7 +1413,7 @@ rules: branch: release-1.17 dir: staging/src/k8s.io/legacy-cloud-providers name: release-1.17 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: api branch: release-1.17 @@ -1433,7 +1433,7 @@ rules: branch: release-1.18 dir: staging/src/k8s.io/legacy-cloud-providers name: release-1.18 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: api branch: release-1.18 @@ -1477,7 +1477,7 @@ rules: branch: release-1.16 dir: staging/src/k8s.io/node-api name: release-1.16 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: api branch: release-1.16 @@ -1491,7 +1491,7 @@ rules: branch: release-1.17 dir: staging/src/k8s.io/node-api name: release-1.17 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: api branch: release-1.17 @@ -1513,17 +1513,17 @@ rules: branch: release-1.16 dir: staging/src/k8s.io/cri-api name: release-1.16 - go: 1.13.9 + go: 1.13.15 - source: branch: release-1.17 dir: staging/src/k8s.io/cri-api name: release-1.17 - go: 1.13.9 + go: 1.13.15 - source: branch: release-1.18 dir: staging/src/k8s.io/cri-api name: release-1.18 - go: 1.13.9 + go: 1.13.15 - source: branch: release-1.19 dir: staging/src/k8s.io/cri-api @@ -1556,7 +1556,7 @@ rules: branch: release-1.16 dir: staging/src/k8s.io/kubectl name: release-1.16 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: api branch: release-1.16 @@ -1576,7 +1576,7 @@ rules: branch: release-1.17 dir: staging/src/k8s.io/kubectl name: release-1.17 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: api branch: release-1.17 @@ -1596,7 +1596,7 @@ rules: branch: release-1.18 dir: staging/src/k8s.io/kubectl name: release-1.18 - go: 1.13.9 + go: 1.13.15 dependencies: - repository: api branch: release-1.18 @@ -1640,7 +1640,7 @@ rules: branch: master dir: staging/src/k8s.io/controller-manager name: master - go: 1.13.9 + go: 1.13.15 - source: branch: release-1.19 dir: staging/src/k8s.io/controller-manager From 6ed4f7cacdbb3619e810265992fa68e6d27d265f Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Fri, 14 Aug 2020 04:45:51 -0400 Subject: [PATCH 2/3] publishing: Use go1.15.0 as default version Signed-off-by: Stephen Augustus --- staging/publishing/rules.yaml | 50 +++++++++++++++++------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml index 5dbe3744f5c..e46144712e2 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -4,7 +4,7 @@ recursive-delete-patterns: - BUILD.bazel - "*/BUILD.bazel" - Gopkg.toml -default-go-version: 1.14.6 +default-go-version: 1.15 rules: - destination: code-generator branches: @@ -31,7 +31,7 @@ rules: branch: release-1.19 dir: staging/src/k8s.io/code-generator name: release-1.19 - go: 1.14.6 + go: 1.15 - destination: apimachinery library: true @@ -59,7 +59,7 @@ rules: branch: release-1.19 dir: staging/src/k8s.io/apimachinery name: release-1.19 - go: 1.14.6 + go: 1.15 - destination: api library: true @@ -99,7 +99,7 @@ rules: branch: release-1.19 dir: staging/src/k8s.io/api name: release-1.19 - go: 1.14.6 + go: 1.15 dependencies: - repository: apimachinery branch: release-1.19 @@ -150,7 +150,7 @@ rules: branch: release-1.19 dir: staging/src/k8s.io/client-go name: release-1.19 - go: 1.14.6 + go: 1.15 dependencies: - repository: apimachinery branch: release-1.19 @@ -215,7 +215,7 @@ rules: branch: release-1.19 dir: staging/src/k8s.io/component-base name: release-1.19 - go: 1.14.6 + go: 1.15 dependencies: - repository: apimachinery branch: release-1.19 @@ -286,7 +286,7 @@ rules: branch: release-1.19 dir: staging/src/k8s.io/apiserver name: release-1.19 - go: 1.14.6 + go: 1.15 dependencies: - repository: apimachinery branch: release-1.19 @@ -374,7 +374,7 @@ rules: branch: release-1.19 dir: staging/src/k8s.io/kube-aggregator name: release-1.19 - go: 1.14.6 + go: 1.15 dependencies: - repository: apimachinery branch: release-1.19 @@ -474,7 +474,7 @@ rules: branch: release-1.19 dir: staging/src/k8s.io/sample-apiserver name: release-1.19 - go: 1.14.6 + go: 1.15 dependencies: - repository: apimachinery branch: release-1.19 @@ -563,7 +563,7 @@ rules: branch: release-1.19 dir: staging/src/k8s.io/sample-controller name: release-1.19 - go: 1.14.6 + go: 1.15 dependencies: - repository: apimachinery branch: release-1.19 @@ -664,7 +664,7 @@ rules: branch: release-1.19 dir: staging/src/k8s.io/apiextensions-apiserver name: release-1.19 - go: 1.14.6 + go: 1.15 dependencies: - repository: apimachinery branch: release-1.19 @@ -743,7 +743,7 @@ rules: branch: release-1.19 dir: staging/src/k8s.io/metrics name: release-1.19 - go: 1.14.6 + go: 1.15 dependencies: - repository: apimachinery branch: release-1.19 @@ -808,7 +808,7 @@ rules: branch: release-1.19 dir: staging/src/k8s.io/cli-runtime name: release-1.19 - go: 1.14.6 + go: 1.15 dependencies: - repository: api branch: release-1.19 @@ -879,7 +879,7 @@ rules: branch: release-1.19 dir: staging/src/k8s.io/sample-cli-plugin name: release-1.19 - go: 1.14.6 + go: 1.15 dependencies: - repository: api branch: release-1.19 @@ -952,7 +952,7 @@ rules: branch: release-1.19 dir: staging/src/k8s.io/kube-proxy name: release-1.19 - go: 1.14.6 + go: 1.15 dependencies: - repository: apimachinery branch: release-1.19 @@ -1013,7 +1013,7 @@ rules: branch: release-1.19 dir: staging/src/k8s.io/kubelet name: release-1.19 - go: 1.14.6 + go: 1.15 dependencies: - repository: apimachinery branch: release-1.19 @@ -1086,7 +1086,7 @@ rules: branch: release-1.19 dir: staging/src/k8s.io/kube-scheduler name: release-1.19 - go: 1.14.6 + go: 1.15 dependencies: - repository: apimachinery branch: release-1.19 @@ -1159,7 +1159,7 @@ rules: branch: release-1.19 dir: staging/src/k8s.io/kube-controller-manager name: release-1.19 - go: 1.14.6 + go: 1.15 dependencies: - repository: apimachinery branch: release-1.19 @@ -1216,7 +1216,7 @@ rules: branch: release-1.19 dir: staging/src/k8s.io/cluster-bootstrap name: release-1.19 - go: 1.14.6 + go: 1.15 dependencies: - repository: apimachinery branch: release-1.19 @@ -1279,7 +1279,7 @@ rules: branch: release-1.19 dir: staging/src/k8s.io/cloud-provider name: release-1.19 - go: 1.14.6 + go: 1.15 dependencies: - repository: api branch: release-1.19 @@ -1354,7 +1354,7 @@ rules: branch: release-1.19 dir: staging/src/k8s.io/csi-translation-lib name: release-1.19 - go: 1.14.6 + go: 1.15 dependencies: - repository: api branch: release-1.19 @@ -1453,7 +1453,7 @@ rules: branch: release-1.19 dir: staging/src/k8s.io/legacy-cloud-providers name: release-1.19 - go: 1.14.6 + go: 1.15 dependencies: - repository: api branch: release-1.19 @@ -1528,7 +1528,7 @@ rules: branch: release-1.19 dir: staging/src/k8s.io/cri-api name: release-1.19 - go: 1.14.6 + go: 1.15 - destination: kubectl library: true @@ -1616,7 +1616,7 @@ rules: branch: release-1.19 dir: staging/src/k8s.io/kubectl name: release-1.19 - go: 1.14.6 + go: 1.15 dependencies: - repository: api branch: release-1.19 @@ -1645,4 +1645,4 @@ rules: branch: release-1.19 dir: staging/src/k8s.io/controller-manager name: release-1.19 - go: 1.14.6 + go: 1.15 From 7681a3a0db3fc0315e3c9adcb72bd66c2cb9df21 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Fri, 14 Aug 2020 05:16:29 -0400 Subject: [PATCH 3/3] publishing: Drop 'go' field from 'controller-manager' 'master' branch This was previous incorrectly set to go1.13. Dropping the field allows us to pick up the 'default-go-version'. Signed-off-by: Stephen Augustus --- staging/publishing/rules.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml index e46144712e2..b61fa32c075 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -1640,7 +1640,6 @@ rules: branch: master dir: staging/src/k8s.io/controller-manager name: master - go: 1.13.15 - source: branch: release-1.19 dir: staging/src/k8s.io/controller-manager