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

[OCPCLOUD-1498] Implement supporting functions for reconcileMachineUpdates #34

Merged
merged 2 commits into from Apr 27, 2022
Merged

[OCPCLOUD-1498] Implement supporting functions for reconcileMachineUpdates #34

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
5228ea9
Set degraded condition when using invalid strategy
RadekManak Apr 22, 2022
0b686e5
Implement machineInfosByIndex
RadekManak Apr 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 20 additions & 3 deletions pkg/controllers/controlplanemachineset/updates.go
View file
Open in desktop
Expand Up @@ -24,6 +24,8 @@ import (
"github.com/go-logr/logr"
machinev1 "github.com/openshift/api/machine/v1"
"github.com/openshift/cluster-control-plane-machine-set-operator/pkg/machineproviders"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
ctrl "sigs.k8s.io/controller-runtime"
)

Expand Down Expand Up @@ -93,10 +95,23 @@ func (r *ControlPlaneMachineSetReconciler) reconcileMachineUpdates(ctx context.C
case machinev1.OnDelete:
return r.reconcileMachineOnDeleteUpdate(ctx, logger, cpms, machineProvider, indexedMachineInfos)
case machinev1.Recreate:
// TODO: Set CPMS condition degraded
meta.SetStatusCondition(&cpms.Status.Conditions, metav1.Condition{
Type: conditionDegraded,
Status: metav1.ConditionTrue,
Reason: reasonInvalidStrategy,
Message: fmt.Sprintf("%s: %s", invalidStrategyMessage, errRecreateStrategyNotSupported),
})

logger.Error(errRecreateStrategyNotSupported, invalidStrategyMessage)
default:
// TODO: Set CPMS condition degraded
meta.SetStatusCondition(&cpms.Status.Conditions,
metav1.Condition{
Type: conditionDegraded,
Status: metav1.ConditionTrue,
Reason: reasonInvalidStrategy,
Message: fmt.Sprintf("%s: %s: %s", invalidStrategyMessage, errUnknownStrategy, cpms.Spec.Strategy.Type),
})

logger.Error(fmt.Errorf("%w: %s", errUnknownStrategy, cpms.Spec.Strategy.Type), invalidStrategyMessage)
}

Expand Down Expand Up @@ -141,7 +156,9 @@ func (r *ControlPlaneMachineSetReconciler) reconcileMachineOnDeleteUpdate(ctx co
func machineInfosByIndex(machineInfos []machineproviders.MachineInfo) map[int32][]machineproviders.MachineInfo {
out := make(map[int32][]machineproviders.MachineInfo)

// TODO: Convert the list of machineInfos into a map that maps the index to a list of MachineInfos.
for _, machineInfo := range machineInfos {
out[machineInfo.Index] = append(out[machineInfo.Index], machineInfo)
}

return out
}
10 changes: 5 additions & 5 deletions pkg/controllers/controlplanemachineset/updates_test.go
View file
Open in desktop
Expand Up @@ -1108,7 +1108,7 @@ var _ = Describe("reconcileMachineUpdates", func() {
}))
})

PIt("Sets the degraded condition", func() {
It("Sets the degraded condition", func() {
Expect(cpms.Status.Conditions).To(ConsistOf(test.MatchCondition(metav1.Condition{
Type: conditionDegraded,
Status: metav1.ConditionTrue,
Expand Down Expand Up @@ -1143,7 +1143,7 @@ var _ = Describe("reconcileMachineUpdates", func() {
}))
})

PIt("Sets the degraded condition", func() {
It("Sets the degraded condition", func() {
Expect(cpms.Status.Conditions).To(ConsistOf(test.MatchCondition(metav1.Condition{
Type: conditionDegraded,
Status: metav1.ConditionTrue,
Expand Down Expand Up @@ -1181,23 +1181,23 @@ var _ = Describe("machineInfosByIndex", func() {
in: []machineproviders.MachineInfo{},
expected: map[int32][]machineproviders.MachineInfo{},
}),
PEntry("separately indexed machines", tableInput{
Entry("separately indexed machines", tableInput{
in: []machineproviders.MachineInfo{i0m0, i1m0, i2m0},
expected: map[int32][]machineproviders.MachineInfo{
0: {i0m0},
1: {i1m0},
2: {i2m0},
},
}),
PEntry("a mixture of indexed machines", tableInput{
Entry("a mixture of indexed machines", tableInput{
in: []machineproviders.MachineInfo{i0m0, i1m0, i2m0, i0m1, i1m1, i0m2},
expected: map[int32][]machineproviders.MachineInfo{
0: {i0m0, i0m1, i0m2},
1: {i1m0, i1m1},
2: {i2m0},
},
}),
PEntry("all machines in the same index", tableInput{
Entry("all machines in the same index", tableInput{
in: []machineproviders.MachineInfo{i0m0, i0m1, i0m2},
expected: map[int32][]machineproviders.MachineInfo{
0: {i0m0, i0m1, i0m2},
Expand Down