From 1268d0bb233f544cc1f2efe4ca59758938984cec Mon Sep 17 00:00:00 2001 From: Nikhita Raghunath Date: Mon, 29 Mar 2021 14:45:13 +0530 Subject: [PATCH 1/2] staging/publishing: add release-1.21 rules --- staging/publishing/rules.yaml | 334 ++++++++++++++++++++++++++++++++++ 1 file changed, 334 insertions(+) diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml index cbbed6c2446..8376a1e0fdc 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -34,6 +34,10 @@ rules: branch: release-1.20 dir: staging/src/k8s.io/code-generator name: release-1.20 + - source: + branch: release-1.21 + dir: staging/src/k8s.io/code-generator + name: release-1.21 - destination: apimachinery library: true @@ -61,6 +65,10 @@ rules: branch: release-1.20 dir: staging/src/k8s.io/apimachinery name: release-1.20 + - source: + branch: release-1.21 + dir: staging/src/k8s.io/apimachinery + name: release-1.21 - destination: api library: true @@ -103,6 +111,13 @@ rules: dependencies: - repository: apimachinery branch: release-1.20 + - source: + branch: release-1.21 + dir: staging/src/k8s.io/api + name: release-1.21 + dependencies: + - repository: apimachinery + branch: release-1.21 - destination: client-go library: true @@ -175,6 +190,19 @@ rules: # assumes GO111MODULE=on go build -mod=mod ./... go test -mod=mod ./... + - source: + branch: release-1.21 + dir: staging/src/k8s.io/client-go + name: release-1.21 + dependencies: + - repository: apimachinery + branch: release-1.21 + - repository: api + branch: release-1.21 + smoke-test: | + # assumes GO111MODULE=on + go build -mod=mod ./... + go test -mod=mod ./... - destination: component-base library: true @@ -237,6 +265,17 @@ rules: branch: release-1.20 - repository: client-go branch: release-1.20 + - source: + branch: release-1.21 + dir: staging/src/k8s.io/component-base + name: release-1.21 + dependencies: + - repository: apimachinery + branch: release-1.21 + - repository: api + branch: release-1.21 + - repository: client-go + branch: release-1.21 - destination: component-helpers library: true @@ -263,6 +302,17 @@ rules: branch: release-1.20 - repository: client-go branch: release-1.20 + - source: + branch: release-1.21 + dir: staging/src/k8s.io/component-helpers + name: release-1.21 + dependencies: + - repository: apimachinery + branch: release-1.21 + - repository: api + branch: release-1.21 + - repository: client-go + branch: release-1.21 - destination: apiserver library: true @@ -335,6 +385,19 @@ rules: branch: release-1.20 - repository: component-base branch: release-1.20 + - source: + branch: release-1.21 + dir: staging/src/k8s.io/apiserver + name: release-1.21 + dependencies: + - repository: apimachinery + branch: release-1.21 + - repository: api + branch: release-1.21 + - repository: client-go + branch: release-1.21 + - repository: component-base + branch: release-1.21 - destination: kube-aggregator branches: @@ -426,6 +489,23 @@ rules: branch: release-1.20 - repository: code-generator branch: release-1.20 + - source: + branch: release-1.21 + dir: staging/src/k8s.io/kube-aggregator + name: release-1.21 + dependencies: + - repository: apimachinery + branch: release-1.21 + - repository: api + branch: release-1.21 + - repository: client-go + branch: release-1.21 + - repository: apiserver + branch: release-1.21 + - repository: component-base + branch: release-1.21 + - repository: code-generator + branch: release-1.21 - destination: sample-apiserver branches: @@ -542,6 +622,28 @@ rules: smoke-test: | # assumes GO111MODULE=on go build -mod=mod . + - source: + branch: release-1.21 + dir: staging/src/k8s.io/sample-apiserver + name: release-1.21 + dependencies: + - repository: apimachinery + branch: release-1.21 + - repository: api + branch: release-1.21 + - repository: client-go + branch: release-1.21 + - repository: apiserver + branch: release-1.21 + - repository: code-generator + branch: release-1.21 + - repository: component-base + branch: release-1.21 + required-packages: + - k8s.io/code-generator + smoke-test: | + # assumes GO111MODULE=on + go build -mod=mod . - destination: sample-controller branches: @@ -638,6 +740,24 @@ rules: smoke-test: | # assumes GO111MODULE=on go build -mod=mod . + - source: + branch: release-1.21 + dir: staging/src/k8s.io/sample-controller + name: release-1.21 + dependencies: + - repository: apimachinery + branch: release-1.21 + - repository: api + branch: release-1.21 + - repository: client-go + branch: release-1.21 + - repository: code-generator + branch: release-1.21 + required-packages: + - k8s.io/code-generator + smoke-test: | + # assumes GO111MODULE=on + go build -mod=mod . - destination: apiextensions-apiserver branches: @@ -739,6 +859,25 @@ rules: branch: release-1.20 required-packages: - k8s.io/code-generator + - source: + branch: release-1.21 + dir: staging/src/k8s.io/apiextensions-apiserver + name: release-1.21 + dependencies: + - repository: apimachinery + branch: release-1.21 + - repository: api + branch: release-1.21 + - repository: client-go + branch: release-1.21 + - repository: apiserver + branch: release-1.21 + - repository: code-generator + branch: release-1.21 + - repository: component-base + branch: release-1.21 + required-packages: + - k8s.io/code-generator - destination: metrics library: true @@ -811,6 +950,19 @@ rules: branch: release-1.20 - repository: code-generator branch: release-1.20 + - source: + branch: release-1.21 + dir: staging/src/k8s.io/metrics + name: release-1.21 + dependencies: + - repository: apimachinery + branch: release-1.21 + - repository: api + branch: release-1.21 + - repository: client-go + branch: release-1.21 + - repository: code-generator + branch: release-1.21 - destination: cli-runtime library: true @@ -873,6 +1025,17 @@ rules: branch: release-1.20 - repository: client-go branch: release-1.20 + - source: + branch: release-1.21 + dir: staging/src/k8s.io/cli-runtime + name: release-1.21 + dependencies: + - repository: api + branch: release-1.21 + - repository: apimachinery + branch: release-1.21 + - repository: client-go + branch: release-1.21 - destination: sample-cli-plugin library: false @@ -945,6 +1108,19 @@ rules: branch: release-1.20 - repository: client-go branch: release-1.20 + - source: + branch: release-1.21 + dir: staging/src/k8s.io/sample-cli-plugin + name: release-1.21 + dependencies: + - repository: api + branch: release-1.21 + - repository: apimachinery + branch: release-1.21 + - repository: cli-runtime + branch: release-1.21 + - repository: client-go + branch: release-1.21 - destination: kube-proxy library: true @@ -1017,6 +1193,19 @@ rules: branch: release-1.20 - repository: client-go branch: release-1.20 + - source: + branch: release-1.21 + dir: staging/src/k8s.io/kube-proxy + name: release-1.21 + dependencies: + - repository: apimachinery + branch: release-1.21 + - repository: component-base + branch: release-1.21 + - repository: api + branch: release-1.21 + - repository: client-go + branch: release-1.21 - destination: kubelet library: true @@ -1081,6 +1270,19 @@ rules: branch: release-1.20 - repository: component-base branch: release-1.20 + - source: + branch: release-1.21 + dir: staging/src/k8s.io/kubelet + name: release-1.21 + dependencies: + - repository: apimachinery + branch: release-1.21 + - repository: api + branch: release-1.21 + - repository: client-go + branch: release-1.21 + - repository: component-base + branch: release-1.21 - destination: kube-scheduler library: true @@ -1153,6 +1355,19 @@ rules: branch: release-1.20 - repository: client-go branch: release-1.20 + - source: + branch: release-1.21 + dir: staging/src/k8s.io/kube-scheduler + name: release-1.21 + dependencies: + - repository: apimachinery + branch: release-1.21 + - repository: component-base + branch: release-1.21 + - repository: api + branch: release-1.21 + - repository: client-go + branch: release-1.21 - destination: controller-manager library: true @@ -1192,6 +1407,21 @@ rules: branch: release-1.20 - repository: apiserver branch: release-1.20 + - source: + branch: release-1.21 + dir: staging/src/k8s.io/controller-manager + name: release-1.21 + dependencies: + - repository: api + branch: release-1.21 + - repository: apimachinery + branch: release-1.21 + - repository: client-go + branch: release-1.21 + - repository: component-base + branch: release-1.21 + - repository: apiserver + branch: release-1.21 - destination: cloud-provider library: true @@ -1268,6 +1498,23 @@ rules: branch: release-1.20 - repository: controller-manager branch: release-1.20 + - source: + branch: release-1.21 + dir: staging/src/k8s.io/cloud-provider + name: release-1.21 + dependencies: + - repository: api + branch: release-1.21 + - repository: apimachinery + branch: release-1.21 + - repository: apiserver + branch: release-1.21 + - repository: client-go + branch: release-1.21 + - repository: component-base + branch: release-1.21 + - repository: controller-manager + branch: release-1.21 - destination: kube-controller-manager library: true @@ -1352,6 +1599,25 @@ rules: branch: release-1.20 - repository: cloud-provider branch: release-1.20 + - source: + branch: release-1.21 + dir: staging/src/k8s.io/kube-controller-manager + name: release-1.21 + dependencies: + - repository: apimachinery + branch: release-1.21 + - repository: apiserver + branch: release-1.21 + - repository: component-base + branch: release-1.21 + - repository: api + branch: release-1.21 + - repository: client-go + branch: release-1.21 + - repository: controller-manager + branch: release-1.21 + - repository: cloud-provider + branch: release-1.21 - destination: cluster-bootstrap library: true @@ -1404,6 +1670,15 @@ rules: branch: release-1.20 - repository: api branch: release-1.20 + - source: + branch: release-1.21 + dir: staging/src/k8s.io/cluster-bootstrap + name: release-1.21 + dependencies: + - repository: apimachinery + branch: release-1.21 + - repository: api + branch: release-1.21 - destination: csi-translation-lib library: true @@ -1470,6 +1745,15 @@ rules: branch: release-1.20 - repository: apimachinery branch: release-1.20 + - source: + branch: release-1.21 + dir: staging/src/k8s.io/csi-translation-lib + name: release-1.21 + dependencies: + - repository: api + branch: release-1.21 + - repository: apimachinery + branch: release-1.21 - destination: legacy-cloud-providers library: true @@ -1576,6 +1860,27 @@ rules: branch: release-1.20 - repository: controller-manager branch: release-1.20 + - source: + branch: release-1.21 + dir: staging/src/k8s.io/legacy-cloud-providers + name: release-1.21 + dependencies: + - repository: api + branch: release-1.21 + - repository: apimachinery + branch: release-1.21 + - repository: client-go + branch: release-1.21 + - repository: cloud-provider + branch: release-1.21 + - repository: csi-translation-lib + branch: release-1.21 + - repository: apiserver + branch: release-1.21 + - repository: component-base + branch: release-1.21 + - repository: controller-manager + branch: release-1.21 - destination: node-api library: true @@ -1621,6 +1926,10 @@ rules: branch: release-1.20 dir: staging/src/k8s.io/cri-api name: release-1.20 + - source: + branch: release-1.21 + dir: staging/src/k8s.io/cri-api + name: release-1.21 - destination: kubectl library: true @@ -1727,6 +2036,27 @@ rules: branch: release-1.20 - repository: metrics branch: release-1.20 + - source: + branch: release-1.21 + dir: staging/src/k8s.io/kubectl + name: release-1.21 + dependencies: + - repository: api + branch: release-1.21 + - repository: apimachinery + branch: release-1.21 + - repository: cli-runtime + branch: release-1.21 + - repository: client-go + branch: release-1.21 + - repository: code-generator + branch: release-1.21 + - repository: component-base + branch: release-1.21 + - repository: component-helpers + branch: release-1.21 + - repository: metrics + branch: release-1.21 - destination: mount-utils library: true @@ -1739,3 +2069,7 @@ rules: branch: release-1.20 dir: staging/src/k8s.io/mount-utils name: release-1.20 + - source: + branch: release-1.21 + dir: staging/src/k8s.io/mount-utils + name: release-1.21 From 817e0c873da86f4252706de9a95b19c29294bf5a Mon Sep 17 00:00:00 2001 From: Nikhita Raghunath Date: Mon, 29 Mar 2021 14:50:01 +0530 Subject: [PATCH 2/2] staging/publishing: add go1.15.10 for release-1.20 branch --- staging/publishing/rules.yaml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml index 8376a1e0fdc..7b67f8e30bc 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -34,6 +34,7 @@ rules: branch: release-1.20 dir: staging/src/k8s.io/code-generator name: release-1.20 + go: 1.15.10 - source: branch: release-1.21 dir: staging/src/k8s.io/code-generator @@ -65,6 +66,7 @@ rules: branch: release-1.20 dir: staging/src/k8s.io/apimachinery name: release-1.20 + go: 1.15.10 - source: branch: release-1.21 dir: staging/src/k8s.io/apimachinery @@ -108,6 +110,7 @@ rules: branch: release-1.20 dir: staging/src/k8s.io/api name: release-1.20 + go: 1.15.10 dependencies: - repository: apimachinery branch: release-1.20 @@ -181,6 +184,7 @@ rules: branch: release-1.20 dir: staging/src/k8s.io/client-go name: release-1.20 + go: 1.15.10 dependencies: - repository: apimachinery branch: release-1.20 @@ -258,6 +262,7 @@ rules: branch: release-1.20 dir: staging/src/k8s.io/component-base name: release-1.20 + go: 1.15.10 dependencies: - repository: apimachinery branch: release-1.20 @@ -295,6 +300,7 @@ rules: branch: release-1.20 dir: staging/src/k8s.io/component-helpers name: release-1.20 + go: 1.15.10 dependencies: - repository: apimachinery branch: release-1.20 @@ -376,6 +382,7 @@ rules: branch: release-1.20 dir: staging/src/k8s.io/apiserver name: release-1.20 + go: 1.15.10 dependencies: - repository: apimachinery branch: release-1.20 @@ -476,6 +483,7 @@ rules: branch: release-1.20 dir: staging/src/k8s.io/kube-aggregator name: release-1.20 + go: 1.15.10 dependencies: - repository: apimachinery branch: release-1.20 @@ -604,6 +612,7 @@ rules: branch: release-1.20 dir: staging/src/k8s.io/sample-apiserver name: release-1.20 + go: 1.15.10 dependencies: - repository: apimachinery branch: release-1.20 @@ -726,6 +735,7 @@ rules: branch: release-1.20 dir: staging/src/k8s.io/sample-controller name: release-1.20 + go: 1.15.10 dependencies: - repository: apimachinery branch: release-1.20 @@ -844,6 +854,7 @@ rules: branch: release-1.20 dir: staging/src/k8s.io/apiextensions-apiserver name: release-1.20 + go: 1.15.10 dependencies: - repository: apimachinery branch: release-1.20 @@ -941,6 +952,7 @@ rules: branch: release-1.20 dir: staging/src/k8s.io/metrics name: release-1.20 + go: 1.15.10 dependencies: - repository: apimachinery branch: release-1.20 @@ -1018,6 +1030,7 @@ rules: branch: release-1.20 dir: staging/src/k8s.io/cli-runtime name: release-1.20 + go: 1.15.10 dependencies: - repository: api branch: release-1.20 @@ -1099,6 +1112,7 @@ rules: branch: release-1.20 dir: staging/src/k8s.io/sample-cli-plugin name: release-1.20 + go: 1.15.10 dependencies: - repository: api branch: release-1.20 @@ -1184,6 +1198,7 @@ rules: branch: release-1.20 dir: staging/src/k8s.io/kube-proxy name: release-1.20 + go: 1.15.10 dependencies: - repository: apimachinery branch: release-1.20 @@ -1261,6 +1276,7 @@ rules: branch: release-1.20 dir: staging/src/k8s.io/kubelet name: release-1.20 + go: 1.15.10 dependencies: - repository: apimachinery branch: release-1.20 @@ -1346,6 +1362,7 @@ rules: branch: release-1.20 dir: staging/src/k8s.io/kube-scheduler name: release-1.20 + go: 1.15.10 dependencies: - repository: apimachinery branch: release-1.20 @@ -1396,6 +1413,7 @@ rules: branch: release-1.20 dir: staging/src/k8s.io/controller-manager name: release-1.20 + go: 1.15.10 dependencies: - repository: api branch: release-1.20 @@ -1485,6 +1503,7 @@ rules: branch: release-1.20 dir: staging/src/k8s.io/cloud-provider name: release-1.20 + go: 1.15.10 dependencies: - repository: api branch: release-1.20 @@ -1584,6 +1603,7 @@ rules: branch: release-1.20 dir: staging/src/k8s.io/kube-controller-manager name: release-1.20 + go: 1.15.10 dependencies: - repository: apimachinery branch: release-1.20 @@ -1665,6 +1685,7 @@ rules: branch: release-1.20 dir: staging/src/k8s.io/cluster-bootstrap name: release-1.20 + go: 1.15.10 dependencies: - repository: apimachinery branch: release-1.20 @@ -1740,6 +1761,7 @@ rules: branch: release-1.20 dir: staging/src/k8s.io/csi-translation-lib name: release-1.20 + go: 1.15.10 dependencies: - repository: api branch: release-1.20 @@ -1843,6 +1865,7 @@ rules: branch: release-1.20 dir: staging/src/k8s.io/legacy-cloud-providers name: release-1.20 + go: 1.15.10 dependencies: - repository: api branch: release-1.20 @@ -1926,6 +1949,7 @@ rules: branch: release-1.20 dir: staging/src/k8s.io/cri-api name: release-1.20 + go: 1.15.10 - source: branch: release-1.21 dir: staging/src/k8s.io/cri-api @@ -2019,6 +2043,7 @@ rules: branch: release-1.20 dir: staging/src/k8s.io/kubectl name: release-1.20 + go: 1.15.10 dependencies: - repository: api branch: release-1.20 @@ -2069,6 +2094,7 @@ rules: branch: release-1.20 dir: staging/src/k8s.io/mount-utils name: release-1.20 + go: 1.15.10 - source: branch: release-1.21 dir: staging/src/k8s.io/mount-utils