Merge pull request #3751 from saschagrunert/bucket-prefix-logic

Use production or test bucket when submitting GCB jobs
kubernetes · Sep 11, 2024 · e75995d · e75995d
2 parents cfe00a2 + bd364bd
commit e75995d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/pkg/gcp/gcb/gcb.go b/pkg/gcp/gcb/gcb.go
@@ -284,12 +284,9 @@ func (g *GCB) Submit() error {
  }
 
  // build the GCS bucket string to be used to sign all the artifacts
- bucketPrefix := release.BucketPrefix
- gcsBucket := "gs://" + bucketPrefix
+ gcsBucket := "gs://" + release.TestBucket
  if g.options.NoMock {
- gcsBucket = strings.TrimSuffix(gcsBucket, "-")
- } else {
- gcsBucket = fmt.Sprintf("%s%s", gcsBucket, "gcb")
+ gcsBucket = strings.ReplaceAll(gcsBucket, release.TestBucket, release.ProductionBucket)
  }
 
  gcbSubs, gcbSubsErr := g.SetGCBSubstitutions(toolOrg, toolRepo, toolRef, gcsBucket)
@@ -321,14 +318,13 @@ func (g *GCB) Submit() error {
  gcbSubs["NOMOCK_TAG"] = ""
  gcbSubs["NOMOCK"] = ""
 
- userBucket := fmt.Sprintf("%s%s", bucketPrefix, gcbSubs["GCP_USER_TAG"])
+ userBucket := strings.ReplaceAll(release.TestBucket, "gcb", gcbSubs["GCP_USER_TAG"])
  userBucketSetErr := os.Setenv("USER_BUCKET", userBucket)
  if userBucketSetErr != nil {
  return userBucketSetErr
  }
 
- testBucket := fmt.Sprintf("%s%s", bucketPrefix, "gcb")
- testBucketSetErr := os.Setenv("BUCKET", testBucket)
+ testBucketSetErr := os.Setenv("BUCKET", release.TestBucket)
  if testBucketSetErr != nil {
  return testBucketSetErr
  }

diff --git a/pkg/release/release.go b/pkg/release/release.go
@@ -55,8 +55,6 @@ const (
  DefaultRelengStagingTestProject = "k8s-staging-releng-test"
  DefaultRelengStagingProject = "k8s-staging-releng"
  DefaultDiskSize = "500"
- BucketPrefix = "kubernetes-release-"
- BucketPrefixK8sInfra = "k8s-release-"
 
  versionReleaseRE = `v(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)-?([a-zA-Z0-9]+\.(0|[1-9][0-9]*)\.)?`
  versionBuildRE = `([0-9]{1,})\+([0-9a-f]{5,40})`