Skip to content

Commit 64f747e

Browse files
committed
fix multi-loader CI
Signed-off-by: Leonid Kondrashov <leo.kondrashov@gmail.com>
1 parent dccf6fe commit 64f747e

File tree

4 files changed

+5
-23
lines changed

4 files changed

+5
-23
lines changed

.github/actions/ci_knative_setup/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ runs:
4242
kubectl patch configmap -n knative-serving config-domain -p "{\"data\": {\"$KNATIVE_DOMAIN\": \"\"}}"
4343
kubectl patch configmap -n knative-serving config-autoscaler -p "{\"data\": {\"allow-zero-initial-scale\": \"true\"}}"
4444
kubectl patch configmap -n knative-serving config-features -p "{\"data\": {\"kubernetes.podspec-affinity\": \"enabled\"}}"
45-
kubectl label node knative-control-plane loader-nodetype=worker
45+
kubectl label node knative-control-plane loader-nodetype=singlenode

.github/workflows/e2e_multi_loader.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
run: bash ./scripts/setup/setup_multi_test_trace.sh
3636

3737
- name: Build and run multi-loader
38-
run: go run tools/multi_loader/multi_loader.go --multiLoaderConfigPath tools/multi_loader/multi_loader_config.json
38+
run: go run tools/multi_loader/multi_loader.go --multiLoaderConfigPath tools/multi_loader/multi_loader_config.json --verbosity debug
3939

4040
- name: Check multi_loader output
4141
run: |
@@ -110,7 +110,7 @@ jobs:
110110
echo "multi_loader_config.json modified successfully"
111111
112112
- name: Build and run multi-loader
113-
run: go run tools/multi_loader/multi_loader.go --multiLoaderConfigPath tools/multi_loader/multi_loader_config.json
113+
run: go run tools/multi_loader/multi_loader.go --multiLoaderConfigPath tools/multi_loader/multi_loader_config.json --verbosity debug
114114

115115
- name: Check multi_loader output
116116
run: |

pkg/common/validators.go

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,13 @@
11
package common
22

33
import (
4-
"bytes"
54
"net"
65
"os"
7-
"os/exec"
86
"slices"
97

108
log "github.com/sirupsen/logrus"
119
)
1210

13-
func CheckNode(node string) {
14-
if !IsValidIP(node) {
15-
log.Fatal("Invalid IP address for node ", node)
16-
}
17-
cmd := exec.Command("ssh", "-oStrictHostKeyChecking=no", "-p", "22", node, "exit")
18-
// -oStrictHostKeyChecking=no -p 22
19-
out, err := cmd.CombinedOutput()
20-
if bytes.Contains(out, []byte("Permission denied")) || err != nil {
21-
log.Error(string(out))
22-
log.Fatal("Failed to connect to node ", node)
23-
}
24-
}
25-
2611
func CheckPath(path string) {
2712
if path == "" {
2813
return

tools/multi_loader/common/utils.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,7 @@ func DetermineNodesIPs(multiLoaderConfig *types.MultiLoaderConfiguration) {
180180

181181
switch {
182182
case IsKinD():
183-
nodeIP := DetermineNodeIP(Worker)
184-
masterIP = nodeIP
185-
loaderIP = nodeIP
186-
workerIPs = []string{nodeIP}
183+
fallthrough
187184
case IsSingleNode():
188185
nodeIP := DetermineNodeIP(SingleNode)
189186
masterIP = nodeIP
@@ -201,7 +198,7 @@ func DetermineNodesIPs(multiLoaderConfig *types.MultiLoaderConfiguration) {
201198
assignDefaults(&multiLoaderConfig.AutoScalerNode, DeterminePodIP(AutoScalerPod))
202199
assignDefaults(&multiLoaderConfig.ActivatorNode, DeterminePodIP(ActivatorPod))
203200

204-
log.Trace("Node IPs determined", multiLoaderConfig)
201+
log.Debug("Node IPs determined", multiLoaderConfig)
205202
}
206203

207204
/**

0 commit comments

Comments
 (0)