Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove gateway restart during rp predeploy #3071

Merged
merged 2 commits into from
Jul 31, 2023
Merged

remove gateway restart during rp predeploy #3071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7b54fe
remove gateway restart during rp predeploy
rajdeepc2792 Jul 28, 2023
989c9c4
rename predeploy scaleset restart functions
rajdeepc2792 Jul 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 16 additions & 27 deletions pkg/deploy/predeploy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,8 @@ import (
const (
// Rotate the secret on every deploy of the RP if the most recent
// secret is greater than 7 days old
rotateSecretAfter = time.Hour * 24 * 7
rpRestartScript = "systemctl restart aro-rp"
gatewayRestartScript = "systemctl restart aro-gateway"
rotateSecretAfter = time.Hour * 24 * 7
rpRestartScript = "systemctl restart aro-rp"
)

// PreDeploy deploys managed identity, NSGs and keyvaults, needed for main
Expand Down Expand Up @@ -401,11 +400,7 @@ func (d *deployer) configureServiceSecrets(ctx context.Context) error {
}

if isRotated {
err = d.restartOldScalesets(ctx, d.config.GatewayResourceGroupName)
if err != nil {
return err
}
err = d.restartOldScalesets(ctx, d.config.RPResourceGroupName)
err = d.restartOldScalesets(ctx)
if err != nil {
return err
}
Expand Down Expand Up @@ -490,14 +485,14 @@ func (d *deployer) ensureSecretKey(ctx context.Context, kv keyvault.Manager, sec
})
}

func (d *deployer) restartOldScalesets(ctx context.Context, resourceGroupName string) error {
scalesets, err := d.vmss.List(ctx, resourceGroupName)
func (d *deployer) restartOldScalesets(ctx context.Context) error {
scalesets, err := d.vmss.List(ctx, d.config.RPResourceGroupName)
if err != nil {
return err
}

for _, vmss := range scalesets {
err = d.restartOldScaleset(ctx, *vmss.Name, resourceGroupName)
err = d.restartOldScaleset(ctx, *vmss.Name)
if err != nil {
return err
}
Expand All @@ -506,35 +501,29 @@ func (d *deployer) restartOldScalesets(ctx context.Context, resourceGroupName st
return nil
}

func (d *deployer) restartOldScaleset(ctx context.Context, vmssName string, resourceGroupName string) error {
var restartScript string
switch {
case strings.HasPrefix(vmssName, gatewayVMSSPrefix):
restartScript = gatewayRestartScript
rajdeepc2792 marked this conversation as resolved.
Show resolved Hide resolved
case strings.HasPrefix(vmssName, rpVMSSPrefix):
restartScript = rpRestartScript
default:
func (d *deployer) restartOldScaleset(ctx context.Context, vmssName string) error {
if !strings.HasPrefix(vmssName, rpVMSSPrefix) {
return &api.CloudError{
StatusCode: http.StatusBadRequest,
CloudErrorBody: &api.CloudErrorBody{
Code: api.CloudErrorCodeInvalidResource,
Message: fmt.Sprintf("provided vmss %s does not match RP or gateway prefix",
Message: fmt.Sprintf("provided vmss %s does not match RP prefix",
vmssName,
),
},
}
}

scalesetVMs, err := d.vmssvms.List(ctx, resourceGroupName, vmssName, "", "", "")
scalesetVMs, err := d.vmssvms.List(ctx, d.config.RPResourceGroupName, vmssName, "", "", "")
if err != nil {
return err
}

for _, vm := range scalesetVMs {
d.log.Printf("waiting for restart script to complete on older vmss %s, instance %s", vmssName, *vm.InstanceID)
err = d.vmssvms.RunCommandAndWait(ctx, resourceGroupName, vmssName, *vm.InstanceID, mgmtcompute.RunCommandInput{
d.log.Printf("waiting for restart script to complete on older rp vmss %s, instance %s", vmssName, *vm.InstanceID)
err = d.vmssvms.RunCommandAndWait(ctx, d.config.RPResourceGroupName, vmssName, *vm.InstanceID, mgmtcompute.RunCommandInput{
CommandID: to.StringPtr("RunShellScript"),
Script: &[]string{restartScript},
Script: &[]string{rpRestartScript},
})

if err != nil {
Expand All @@ -545,7 +534,7 @@ func (d *deployer) restartOldScaleset(ctx context.Context, vmssName string, reso
time.Sleep(30 * time.Second)
timeoutCtx, cancel := context.WithTimeout(ctx, time.Hour)
defer cancel()
err = d.waitForReadiness(timeoutCtx, resourceGroupName, vmssName, *vm.InstanceID)
err = d.waitForReadiness(timeoutCtx, vmssName, *vm.InstanceID)
if err != nil {
return err
}
Expand All @@ -554,9 +543,9 @@ func (d *deployer) restartOldScaleset(ctx context.Context, vmssName string, reso
return nil
}

func (d *deployer) waitForReadiness(ctx context.Context, resourceGroupName string, vmssName string, vmInstanceID string) error {
func (d *deployer) waitForReadiness(ctx context.Context, vmssName string, vmInstanceID string) error {
return wait.PollImmediateUntil(10*time.Second, func() (bool, error) {
return d.isVMInstanceHealthy(ctx, resourceGroupName, vmssName, vmInstanceID), nil
return d.isVMInstanceHealthy(ctx, d.config.RPResourceGroupName, vmssName, vmInstanceID), nil
}, ctx.Done())
}

Expand Down
Loading