Merge pull request #2765 from saschagrunert/official-patches-no-rc

Stop building rc.0 versions after official patches
kubernetes · Mar 9, 2023 · 6891f44 · 6891f44
2 parents ceac92a + 0671d63
commit 6891f44
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/pkg/release/release_version.go b/pkg/release/release_version.go
@@ -18,7 +18,6 @@ package release
 
 import (
 	"fmt"
-	"regexp"
 	"strconv"
 	"strings"
 
@@ -192,12 +191,6 @@ func GenerateReleaseVersion(
 
 		if releaseType == ReleaseTypeOfficial {
 			releaseVersions.official = releaseVersions.prime
-			// Only primary branches get rc releases
-			if regexp.MustCompile(`^release-(\d+)\.(\d+)$`).MatchString(branch) {
-				releaseVersions.rc = fmt.Sprintf(
-					"v%d.%d.%d-rc.0", v.Major, v.Minor, v.Patch+1,
-				)
-			}
 		} else if releaseType == ReleaseTypeRC {
 			releaseVersions.rc = fmt.Sprintf(
 				"%s-rc.%d", releaseVersions.prime, labelID,

diff --git a/pkg/release/release_version_test.go b/pkg/release/release_version_test.go
@@ -43,11 +43,11 @@ func TestGenerateReleaseVersion(t *testing.T) {
 				require.Nil(t, err)
 				require.Equal(t, "v1.18.4", res.Prime())
 				require.Equal(t, "v1.18.4", res.Official())
-				require.Equal(t, "v1.18.5-rc.0", res.RC())
+				require.Empty(t, res.RC())
 				require.Empty(t, res.Beta())
 				require.Empty(t, res.Alpha())
 				require.Equal(t,
-					[]string{"v1.18.4", "v1.18.5-rc.0"},
+					[]string{"v1.18.4"},
 					res.Ordered(),
 				)
 			},