Skip to content

Commit f70e187

Browse files
bk201guangbochen
authored andcommitted
Restart fleet-controller while setting client secret
Restarting fleet-controller speed up the bootstrap process. Signed-off-by: Kiefer Chang <[email protected]>
1 parent 26d06f3 commit f70e187

File tree

2 files changed

+36
-0
lines changed

2 files changed

+36
-0
lines changed

pkg/plan/bootstrap.go

+8
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,18 @@ func (p *plan) addInstructions(cfg *config.Config, dataDir string) error {
111111
return err
112112
}
113113

114+
if err := p.addInstruction(rancher.ToScaleDownFleetControllerInstruction(cfg.RancherInstallerImage, cfg.SystemDefaultRegistry, k8sVersion)); err != nil {
115+
return err
116+
}
117+
114118
if err := p.addInstruction(rancher.ToUpdateClientSecretInstruction(cfg.RancherInstallerImage, cfg.SystemDefaultRegistry, k8sVersion)); err != nil {
115119
return err
116120
}
117121

122+
if err := p.addInstruction(rancher.ToScaleUpFleetControllerInstruction(cfg.RancherInstallerImage, cfg.SystemDefaultRegistry, k8sVersion)); err != nil {
123+
return err
124+
}
125+
118126
if err := p.addInstruction(resources.ToInstruction(cfg.RancherInstallerImage, cfg.SystemDefaultRegistry, k8sVersion, dataDir)); err != nil {
119127
return err
120128
}

pkg/rancher/wait.go

+28
Original file line numberDiff line numberDiff line change
@@ -95,3 +95,31 @@ func ToUpdateClientSecretInstruction(imageOverride, systemDefaultRegistry, k8sVe
9595
Command: cmd,
9696
}, nil
9797
}
98+
99+
func ToScaleDownFleetControllerInstruction(imageOverride, systemDefaultRegistry, k8sVersion string) (*applyinator.Instruction, error) {
100+
cmd, err := self.Self()
101+
if err != nil {
102+
return nil, fmt.Errorf("resolving location of %s: %w", os.Args[0], err)
103+
}
104+
return &applyinator.Instruction{
105+
Name: "scale-down-fleet-controller",
106+
SaveOutput: true,
107+
Args: []string{"retry", kubectl.Command(k8sVersion), "-n", "cattle-fleet-system", "scale", "--replicas", "0", "deploy/fleet-controller"},
108+
Env: kubectl.Env(k8sVersion),
109+
Command: cmd,
110+
}, nil
111+
}
112+
113+
func ToScaleUpFleetControllerInstruction(imageOverride, systemDefaultRegistry, k8sVersion string) (*applyinator.Instruction, error) {
114+
cmd, err := self.Self()
115+
if err != nil {
116+
return nil, fmt.Errorf("resolving location of %s: %w", os.Args[0], err)
117+
}
118+
return &applyinator.Instruction{
119+
Name: "scale-up-fleet-controller",
120+
SaveOutput: true,
121+
Args: []string{"retry", kubectl.Command(k8sVersion), "-n", "cattle-fleet-system", "scale", "--replicas", "1", "deploy/fleet-controller"},
122+
Env: kubectl.Env(k8sVersion),
123+
Command: cmd,
124+
}, nil
125+
}

0 commit comments

Comments
 (0)