Skip to content

Commit d91908e

Browse files
committed
mvp
Signed-off-by: Pavel Tishkov <[email protected]>
1 parent d1b064f commit d91908e

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

images/hooks/cmd/migrate-virthandler-kvm-node-labels/main.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626
"github.com/deckhouse/module-sdk/pkg"
2727
"github.com/deckhouse/module-sdk/pkg/app"
2828
"github.com/deckhouse/module-sdk/pkg/registry"
29-
"k8s.io/utils/ptr"
3029

3130
"hooks/pkg/common"
3231

@@ -55,7 +54,7 @@ var kvmLabelPatch = []map[string]string{
5554
var _ = registry.RegisterFunc(configDiscoveryService, handleDiscoveryVirtHandlerNodes)
5655

5756
var configDiscoveryService = &pkg.HookConfig{
58-
OnBeforeHelm: &pkg.OrderedConfig{Order: 1},
57+
OnBeforeHelm: &pkg.OrderedConfig{Order: 5},
5958
Kubernetes: []pkg.KubernetesConfig{
6059
{
6160
Name: nodesSnapshot,
@@ -67,15 +66,16 @@ var configDiscoveryService = &pkg.HookConfig{
6766
virtHandlerLabel: virtHandlerLabelValue,
6867
},
6968
},
70-
ExecuteHookOnSynchronization: ptr.To(false),
71-
ExecuteHookOnEvents: ptr.To(false),
69+
// ExecuteHookOnSynchronization: ptr.To(false),
70+
// ExecuteHookOnEvents: ptr.To(false),
7271
},
7372
},
7473

7574
Queue: fmt.Sprintf("modules/%s", common.MODULE_NAME),
7675
}
7776

7877
func handleDiscoveryVirtHandlerNodes(_ context.Context, input *pkg.HookInput) error {
78+
input.Logger.Info("🟨start🟨")
7979
nodes := input.Snapshots.Get(nodesSnapshot)
8080
if len(nodes) == 0 {
8181
return nil
@@ -90,10 +90,10 @@ func handleDiscoveryVirtHandlerNodes(_ context.Context, input *pkg.HookInput) er
9090

9191
if _, ok := nodeInfo.Labels[kvmEnabledLabel]; !ok {
9292
input.PatchCollector.PatchWithJSON(kvmLabelPatch, "v1", "Node", "", nodeInfo.Name)
93-
input.Logger.Error(fmt.Sprintf(logMessageTemplate, kvmEnabledLabel, nodeInfo.Name))
93+
input.Logger.Info(fmt.Sprintf(logMessageTemplate, kvmEnabledLabel, nodeInfo.Name))
9494
}
9595
}
96-
96+
input.Logger.Info("🟧finish🟧")
9797
return nil
9898
}
9999

templates/nodegroupconfiguration-detect-kvm.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ spec:
4444
4545
node=$(bb-d8-node-name)
4646
47-
max_attempts=3
48-
until bb-kubectl --kubeconfig $kubeconfig label --overwrite=true node "$node" "$label"; do
49-
attempt=$(( attempt + 1 ))
50-
if [ "$attempt" -gt "$max_attempts" ]; then
51-
bb-log-error "failed to label node $node with label $label after $max_attempts attempts"
52-
exit 1
53-
fi
54-
echo "Waiting for label node $node with label $label (attempt $attempt of $max_attempts)..."
55-
sleep 5
56-
done
47+
# max_attempts=3
48+
# until bb-kubectl --kubeconfig $kubeconfig label --overwrite=true node "$node" "$label"; do
49+
# attempt=$(( attempt + 1 ))
50+
# if [ "$attempt" -gt "$max_attempts" ]; then
51+
# bb-log-error "failed to label node $node with label $label after $max_attempts attempts"
52+
# exit 1
53+
# fi
54+
# echo "Waiting for label node $node with label $label (attempt $attempt of $max_attempts)..."
55+
# sleep 5
56+
# done

0 commit comments

Comments
 (0)