Skip to content

Commit 510a47e

Browse files
authored
Merge pull request #4170 from ameukam/drop-legacy-bucket
Remove deprecated bucket
2 parents b195bcf + 9e4d075 commit 510a47e

File tree

2 files changed

+0
-12
lines changed

2 files changed

+0
-12
lines changed

pkg/build/build.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ import (
2222
"github.com/sirupsen/logrus"
2323

2424
"sigs.k8s.io/release-sdk/object"
25-
26-
"k8s.io/release/pkg/release"
2725
)
2826

2927
var DefaultExtraVersionMarkers = []string{}
@@ -151,13 +149,6 @@ func (bi *Instance) getGCSBuildPath(version string) (string, error) {
151149
func (bi *Instance) setBucket() {
152150
bucket := bi.opts.Bucket
153151

154-
if bi.opts.Bucket == "" {
155-
if bi.opts.CI {
156-
// TODO: Remove this once all CI and release jobs run on K8s Infra
157-
bucket = release.CIBucketLegacy
158-
}
159-
}
160-
161152
bi.opts.Bucket = bucket
162153

163154
logrus.Infof("Bucket has been set to %s", bi.opts.Bucket)

pkg/release/release.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,6 @@ const (
9191
// WindowsLocalPath is the directory where Windows GCE scripts are created.
9292
WindowsLocalPath = ReleaseStagePath + "/full/kubernetes/cluster/gce/windows"
9393

94-
// CIBucketLegacy is the default bucket for Kubernetes CI releases.
95-
CIBucketLegacy = "kubernetes-release-dev"
96-
9794
// CIBucketK8sInfra is the community infra bucket for Kubernetes CI releases.
9895
CIBucketK8sInfra = "k8s-release-dev"
9996

0 commit comments

Comments
 (0)