Skip to content

Commit

Permalink
Merge pull request #106 from openebs/rc-upgrade
Browse files Browse the repository at this point in the history 
add rc tag validation in upgrade regex
  • Loading branch information
@w3aman
w3aman authored Dec 13, 2024
2 parents 4b5ece3 + a6e1950 commit 9913de7
Show file tree
Hide file tree
Showing 2 changed files with 91 additions and 14 deletions.
95 changes: 82 additions & 13 deletions common/controlplane/v1/upgrade.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@ const (
func (cp CPv1) Upgrade(isUpgradingToUnstableBranch, isPartialRebuildDisableNeeded bool) (string, error) {
kubectlPlugin := GetPluginPath()

pluginVersion, err := GetPluginVersion()
if err != nil {
return "", fmt.Errorf("failed to get plugin version, err:%v", err)
}

pluginVersion = strings.TrimSpace(pluginVersion)

CIRegistry, ok := os.LookupEnv("CI_REGISTRY")
if !ok {
return "", fmt.Errorf("environment variable CI_REGISTRY is not defined")
Expand All @@ -40,8 +47,16 @@ func (cp CPv1) Upgrade(isUpgradingToUnstableBranch, isPartialRebuildDisableNeede

// Append arguments based on conditions
if isUpgradingToUnstableBranch {
cmdArgs = append(cmdArgs, "--registry", CIRegistry, string(AllowUpgradeToUnstableBranchFlag))
// for plugin version with rc tag i.e. release candidate
// upgrade job images are not present in ci-registry, they are in
// docker hub. so for those tags we dont need to add --registry flag.
if strings.Contains(pluginVersion, "-rc") {
cmdArgs = append(cmdArgs, string(AllowUpgradeToUnstableBranchFlag))
} else {
cmdArgs = append(cmdArgs, "--registry", CIRegistry, string(AllowUpgradeToUnstableBranchFlag))
}
}

if isPartialRebuildDisableNeeded {
cmdArgs = append(cmdArgs, "--set", string(DisablePartialRebuild))
}
Expand All @@ -57,7 +72,7 @@ func (cp CPv1) Upgrade(isUpgradingToUnstableBranch, isPartialRebuildDisableNeede
cmd.Stderr = &stderr

// Run the command
err := cmd.Run()
err = cmd.Run()
if err != nil {
logf.Log.Info(stderr.String())
return stderr.String(), fmt.Errorf("plugin failed to upgrade, err:%v", err)
Expand All @@ -76,6 +91,13 @@ func (cp CPv1) UpgradeWithSkipDataPlaneRestart(isUpgradingToUnstableBranch, isPa

kubectlPlugin := GetPluginPath()

pluginVersion, err := GetPluginVersion()
if err != nil {
return fmt.Errorf("failed to get plugin version, err:%v", err)
}

pluginVersion = strings.TrimSpace(pluginVersion)

CIRegistry, ok := os.LookupEnv("CI_REGISTRY")
if !ok {
return fmt.Errorf("environment varianble CI_REGISTRY is not defined")
Expand All @@ -86,7 +108,14 @@ func (cp CPv1) UpgradeWithSkipDataPlaneRestart(isUpgradingToUnstableBranch, isPa

// Append arguments based on conditions
if isUpgradingToUnstableBranch {
cmdArgs = append(cmdArgs, "--registry", CIRegistry, string(AllowUpgradeToUnstableBranchFlag))
// for plugin version with rc tag i.e. release candidate
// upgrade job images are not present in ci-registry, they are in
// docker hub. so for those tags we dont need to add --registry flag.
if strings.Contains(pluginVersion, "-rc") {
cmdArgs = append(cmdArgs, string(AllowUpgradeToUnstableBranchFlag))
} else {
cmdArgs = append(cmdArgs, "--registry", CIRegistry, string(AllowUpgradeToUnstableBranchFlag))
}
}
if isPartialRebuildDisableNeeded {
cmdArgs = append(cmdArgs, "--set", string(DisablePartialRebuild))
Expand All @@ -98,7 +127,7 @@ func (cp CPv1) UpgradeWithSkipDataPlaneRestart(isUpgradingToUnstableBranch, isPa
// Print the command that will be executed
logf.Log.Info("Executing", "command", strings.Join(cmd.Args, " "))

_, err := cmd.Output()
_, err = cmd.Output()

if err != nil {
return fmt.Errorf("plugin failed to upgrade when skip data plane restart flag is passsed , error %v", err)
Expand All @@ -115,6 +144,13 @@ func (cp CPv1) UpgradeWithSkipSingleReplicaValidation(isUpgradingToUnstableBranc

kubectlPlugin := GetPluginPath()

pluginVersion, err := GetPluginVersion()
if err != nil {
return fmt.Errorf("failed to get plugin version, err:%v", err)
}

pluginVersion = strings.TrimSpace(pluginVersion)

CIRegistry, ok := os.LookupEnv("CI_REGISTRY")
if !ok {
return fmt.Errorf("environment varianble CI_REGISTRY is not defined")
Expand All @@ -125,7 +161,14 @@ func (cp CPv1) UpgradeWithSkipSingleReplicaValidation(isUpgradingToUnstableBranc

// Append arguments based on conditions
if isUpgradingToUnstableBranch {
cmdArgs = append(cmdArgs, "--registry", CIRegistry, string(AllowUpgradeToUnstableBranchFlag))
// for plugin version with rc tag i.e. release candidate
// upgrade job images are not present in ci-registry, they are in
// docker hub. so for those tags we dont need to add --registry flag.
if strings.Contains(pluginVersion, "-rc") {
cmdArgs = append(cmdArgs, string(AllowUpgradeToUnstableBranchFlag))
} else {
cmdArgs = append(cmdArgs, "--registry", CIRegistry, string(AllowUpgradeToUnstableBranchFlag))
}
}
if isPartialRebuildDisableNeeded {
cmdArgs = append(cmdArgs, "--set", string(DisablePartialRebuild))
Expand All @@ -137,7 +180,7 @@ func (cp CPv1) UpgradeWithSkipSingleReplicaValidation(isUpgradingToUnstableBranc
// Print the command that will be executed
logf.Log.Info("Executing", "command", strings.Join(cmd.Args, " "))

_, err := cmd.Output()
_, err = cmd.Output()

if err != nil {
return fmt.Errorf("plugin failed to upgrade when skip single replica volume flag is passsed , error %v", err)
Expand All @@ -153,6 +196,13 @@ func (cp CPv1) UpgradeWithSkipSingleReplicaValidation(isUpgradingToUnstableBranc
func (cp CPv1) UpgradeWithSkipReplicaRebuild(isUpgradingToUnstableBranch, isPartialRebuildDisableNeeded bool) error {
kubectlPlugin := GetPluginPath()

pluginVersion, err := GetPluginVersion()
if err != nil {
return fmt.Errorf("failed to get plugin version, err:%v", err)
}

pluginVersion = strings.TrimSpace(pluginVersion)

CIRegistry, ok := os.LookupEnv("CI_REGISTRY")
if !ok {
return fmt.Errorf("environment varianble CI_REGISTRY is not defined")
Expand All @@ -163,7 +213,14 @@ func (cp CPv1) UpgradeWithSkipReplicaRebuild(isUpgradingToUnstableBranch, isPart

// Append arguments based on conditions
if isUpgradingToUnstableBranch {
cmdArgs = append(cmdArgs, "--registry", CIRegistry, string(AllowUpgradeToUnstableBranchFlag))
// for plugin version with rc tag i.e. release candidate
// upgrade job images are not present in ci-registry, they are in
// docker hub. so for those tags we dont need to add --registry flag.
if strings.Contains(pluginVersion, "-rc") {
cmdArgs = append(cmdArgs, string(AllowUpgradeToUnstableBranchFlag))
} else {
cmdArgs = append(cmdArgs, "--registry", CIRegistry, string(AllowUpgradeToUnstableBranchFlag))
}
}
if isPartialRebuildDisableNeeded {
cmdArgs = append(cmdArgs, "--set", string(DisablePartialRebuild))
Expand All @@ -175,7 +232,7 @@ func (cp CPv1) UpgradeWithSkipReplicaRebuild(isUpgradingToUnstableBranch, isPart
// Print the command that will be executed
logf.Log.Info("Executing", "command", strings.Join(cmd.Args, " "))

_, err := cmd.Output()
_, err = cmd.Output()

if err != nil {
return fmt.Errorf("plugin failed to upgrade with --skip-rebuild-replica flag , error %v", err)
Expand All @@ -189,6 +246,13 @@ func (cp CPv1) UpgradeWithSkipReplicaRebuild(isUpgradingToUnstableBranch, isPart
func (cp CPv1) UpgradeWithSkipCordonNodeValidation(isUpgradingToUnstableBranch, isPartialRebuildDisableNeeded bool) error {
kubectlPlugin := GetPluginPath()

pluginVersion, err := GetPluginVersion()
if err != nil {
return fmt.Errorf("failed to get plugin version, err:%v", err)
}

pluginVersion = strings.TrimSpace(pluginVersion)

CIRegistry, ok := os.LookupEnv("CI_REGISTRY")
if !ok {
return fmt.Errorf("environment varianble CI_REGISTRY is not defined")
Expand All @@ -199,11 +263,16 @@ func (cp CPv1) UpgradeWithSkipCordonNodeValidation(isUpgradingToUnstableBranch,

// Append arguments based on conditions
if isUpgradingToUnstableBranch {
cmdArgs = append(cmdArgs, "--registry", CIRegistry, string(AllowUpgradeToUnstableBranchFlag))
if isPartialRebuildDisableNeeded {
cmdArgs = append(cmdArgs, "--set", string(DisablePartialRebuild))
// for plugin version with rc tag i.e. release candidate
// upgrade job images are not present in ci-registry, they are in
// docker hub. so for those tags we dont need to add --registry flag.
if strings.Contains(pluginVersion, "-rc") {
cmdArgs = append(cmdArgs, string(AllowUpgradeToUnstableBranchFlag))
} else {
cmdArgs = append(cmdArgs, "--registry", CIRegistry, string(AllowUpgradeToUnstableBranchFlag))
}
} else if isPartialRebuildDisableNeeded {
}
if isPartialRebuildDisableNeeded {
cmdArgs = append(cmdArgs, "--set", string(DisablePartialRebuild))
}

Expand All @@ -213,7 +282,7 @@ func (cp CPv1) UpgradeWithSkipCordonNodeValidation(isUpgradingToUnstableBranch,
// Print the command that will be executed
logf.Log.Info("Executing", "command", strings.Join(cmd.Args, " "))

_, err := cmd.Output()
_, err = cmd.Output()

if err != nil {
return fmt.Errorf("plugin failed to upgrade with skip cordon node validation flag, error %v", err)
Expand Down
10 changes: 9 additions & 1 deletion common/mayastor/upgrade/upgrade.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@ func CheckIfUpgradingToUnstableBranch() (string, bool, error) {
// regex will work for both tags, with and without starting v
tagRegexForDevelopBranch := `v?[0-9]+\.[0-9]+\.[0-9]+-0-main-unstable(-[0-9]+){6}-0`
tagRegexForPreReleaseTesting := `v?[0-9]+\.[0-9]+\.[0-9]+-0-release-unstable(-[0-9]+){6}-0`
tagRegexForReleaseCandidateTesting := `v?[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+`
tagRegexForReleaseBranch := `v?[0-9]+\.[0-9]+\.[0-9]`

// Construct a new regular expression by surrounding tagRegex with parentheses and appending "+0)"
Expand All @@ -340,6 +341,7 @@ func CheckIfUpgradingToUnstableBranch() (string, bool, error) {
pluginVersionOutputFormatRegexForDevelopBranch := fmt.Sprintf(`\(%s\+0\)`, tagRegexForDevelopBranch)
pluginVersionOutputFormatRegexForPreReleaseTesting := fmt.Sprintf(`\(%s\+0\)`, tagRegexForPreReleaseTesting)
pluginVersionOutputFormatRegexForReleaseBranch := fmt.Sprintf(`\(%s\+0\)`, tagRegexForReleaseBranch)
pluginVersionOutputFormatRegexForReleaseCandidateTesting := fmt.Sprintf(`\(%s\+0\)`, tagRegexForReleaseCandidateTesting)

// Create a regular expression object for the plugin version format regex for develop branch
pluginRegexDevelopBranch, err := regexp.Compile(pluginVersionOutputFormatRegexForDevelopBranch)
Expand All @@ -359,10 +361,16 @@ func CheckIfUpgradingToUnstableBranch() (string, bool, error) {
return pluginVersion, false, fmt.Errorf("failed to create valid regex, err:%v", err)
}

// Create a regular expression object for the plugin version format regex for release branch
pluginRegexReleaseCandidateTesting, err := regexp.Compile(pluginVersionOutputFormatRegexForReleaseCandidateTesting)
if err != nil {
return pluginVersion, false, fmt.Errorf("failed to create valid regex, err:%v", err)
}

// Match plugin version with regular expressions
// for develop branch and pre-release testing, version should be
// considered as unstable and will need --allow-unstable flag
if pluginRegexDevelopBranch.MatchString(pluginVersion) || pluginRegexPreReleaseTesting.MatchString(pluginVersion) {
if pluginRegexDevelopBranch.MatchString(pluginVersion) || pluginRegexPreReleaseTesting.MatchString(pluginVersion) || pluginRegexReleaseCandidateTesting.MatchString(pluginVersion) {
return pluginVersion, true, nil
}

Expand Down

0 comments on commit 9913de7

Please sign in to comment.