mirrors/talos
1
0
Fork 0
mirror of https://github.com/siderolabs/talos.git synced 2025-10-27 14:31:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove maintenance config when maintenance service is shut down

Browse Source 
We now remove the machine config with the id `maintenance` when we are done with it - when the maintenance service is shut down.

Closes siderolabs/talos#8424, where in some configurations there would be machine configs with both `v1alpha1` and `maintenance` IDs present, causing the `talosctl edit machineconfig` to loop twice and causing confusion.

Signed-off-by: Utku Ozdemir <utku.ozdemir@siderolabs.com>
This commit is contained in:
Utku Ozdemir 2024-03-14 10:59:10 +01:00
parent 952801d8b2
commit 7376f34e82
No known key found for this signature in database
GPG Key ID: 65933E76F0549B0D
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/app/machined/pkg/controllers/runtime/maintenance_service.go
View File

@ -111,6 +111,12 @@ func (ctrl *MaintenanceServiceController) Run(ctx context.Context, r controller.
lastReachableAddresses = nil lastReachableAddresses = nil
lastListenAddress = "" lastListenAddress = ""
} }
// clean up maintenance machine config, as we are done with the maintenance service
err := r.Destroy(ctx, config.NewMachineConfigWithID(nil, config.MaintenanceID).Metadata())
if err != nil && !state.IsNotFoundError(err) {
logger.Error("failed to destroy maintenance machine config", zap.String("id", config.MaintenanceID), zap.Error(err))
}
} }
defer shutdownServer(context.Background()) defer shutdownServer(context.Background())

27
internal/app/machined/pkg/controllers/runtime/maintenance_service_test.go
View File

@ -25,9 +25,12 @@ import (
runtimectrl "github.com/siderolabs/talos/internal/app/machined/pkg/controllers/runtime" runtimectrl "github.com/siderolabs/talos/internal/app/machined/pkg/controllers/runtime"
"github.com/siderolabs/talos/internal/app/machined/pkg/controllers/secrets" "github.com/siderolabs/talos/internal/app/machined/pkg/controllers/secrets"
talosruntime "github.com/siderolabs/talos/internal/app/machined/pkg/runtime" talosruntime "github.com/siderolabs/talos/internal/app/machined/pkg/runtime"
"github.com/siderolabs/talos/internal/app/machined/pkg/runtime/v1alpha1/platform/metal"
"github.com/siderolabs/talos/internal/app/maintenance" "github.com/siderolabs/talos/internal/app/maintenance"
machineapi "github.com/siderolabs/talos/pkg/machinery/api/machine"
"github.com/siderolabs/talos/pkg/machinery/client" "github.com/siderolabs/talos/pkg/machinery/client"
"github.com/siderolabs/talos/pkg/machinery/config" "github.com/siderolabs/talos/pkg/machinery/config"
configres "github.com/siderolabs/talos/pkg/machinery/resources/config"
"github.com/siderolabs/talos/pkg/machinery/resources/hardware" "github.com/siderolabs/talos/pkg/machinery/resources/hardware"
"github.com/siderolabs/talos/pkg/machinery/resources/network" "github.com/siderolabs/talos/pkg/machinery/resources/network"
"github.com/siderolabs/talos/pkg/machinery/resources/runtime" "github.com/siderolabs/talos/pkg/machinery/resources/runtime"
@ -114,6 +117,25 @@ func (suite *MaintenanceServiceSuite) TestRunService() {
_, err = mc.Version(suite.Ctx()) _, err = mc.Version(suite.Ctx())
suite.Require().ErrorContains(err, "API is not implemented in maintenance mode") suite.Require().ErrorContains(err, "API is not implemented in maintenance mode")
// apply partial machine config
_, err = mc.ApplyConfiguration(suite.Ctx(), &machineapi.ApplyConfigurationRequest{
Data: []byte(`
apiVersion: v1alpha1
kind: KmsgLogConfig
name: test
url: "tcp://127.0.0.42:1234"
`),
})
suite.Require().NoError(err)
// assert that the config with the maintenance ID is created
rtestutils.AssertResource[*configres.MachineConfig](suite.Ctx(), suite.T(), suite.State(), configres.MaintenanceID, func(r *configres.MachineConfig, assertion *assert.Assertions) {
configBytes, configBytesErr := r.Container().Bytes()
assertion.NoError(configBytesErr)
assertion.Contains(string(configBytes), "tcp://127.0.0.42:1234")
})
suite.Require().NoError(mc.Close()) suite.Require().NoError(mc.Close())
// change the listen address // change the listen address
@ -168,6 +190,9 @@ func (suite *MaintenanceServiceSuite) TestRunService() {
_, err = net.Dial("tcp", maintenanceConfig.TypedSpec().ListenAddress) _, err = net.Dial("tcp", maintenanceConfig.TypedSpec().ListenAddress)
suite.Require().ErrorContains(err, "connection refused") suite.Require().ErrorContains(err, "connection refused")
// assert that the maintenance service is removed from the config after the service was shut down
rtestutils.AssertNoResource[*configres.MachineConfig](suite.Ctx(), suite.T(), suite.State(), configres.MaintenanceID)
} }
type mockController struct { type mockController struct {
@ -242,7 +267,7 @@ func (mock mockController) IsBootstrapAllowed() bool {
} }
func (mock mockState) Platform() talosruntime.Platform { func (mock mockState) Platform() talosruntime.Platform {
return nil return &metal.Metal{} // required for ApplyConfiguration to not fail
} }
func (mock mockState) Machine() talosruntime.MachineState { func (mock mockState) Machine() talosruntime.MachineState {