Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit ae1245e

Browse files
committedFeb 20, 2024
Fixing bugs
Signed-off-by: Lazar Cvetković <[email protected]>
1 parent 6a1d1ab commit ae1245e

File tree

4 files changed

+3
-29
lines changed

4 files changed

+3
-29
lines changed
 

‎.github/workflows/stargz_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
kubectl patch configmap -n knative-serving config-autoscaler -p "{\"data\": {\"allow-zero-initial-scale\": \"true\"}}"
6868
6969
- name: Setup stock-only node
70-
run: ./scripts/setup_tool setup_node stock-only use-stargz
70+
run: ./scripts/setup_tool setup_node REGULAR stock-only use-stargz
7171

7272
- name: Check containerd service is running
7373
run: sudo screen -list | grep "containerd"

‎scripts/cluster/create_multinode_cluster.go

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@ func CreateMultinodeCluster(stockContainerd string, rawHaReplicaCount string) er
4141
return err
4242
}
4343

44-
/*if err := CreateMasterKubeletService(); err != nil {
45-
return err
46-
}*/
47-
4844
if err := DeployKubernetes(haReplicaCount); err != nil {
4945
return err
5046
}
@@ -77,29 +73,6 @@ func CreateMultinodeCluster(stockContainerd string, rawHaReplicaCount string) er
7773
return nil
7874
}
7975

80-
// Create kubelet service on master node
81-
func CreateMasterKubeletService() error {
82-
utils.WaitPrintf("Creating kubelet service")
83-
// Create service directory if not exist
84-
_, err := utils.ExecShellCmd("sudo mkdir -p /etc/sysconfig")
85-
if !utils.CheckErrorWithMsg(err, "Failed to create kubelet service!\n") {
86-
return err
87-
}
88-
bashCmd := `sudo sh -c 'cat <<EOF > /etc/sysconfig/kubelet
89-
KUBELET_EXTRA_ARGS="--container-runtime=remote --v=%d --runtime-request-timeout=15m --container-runtime-endpoint=unix:///run/containerd/containerd.sock"
90-
EOF'`
91-
_, err = utils.ExecShellCmd(bashCmd, configs.System.LogVerbosity)
92-
if !utils.CheckErrorWithMsg(err, "Failed to create kubelet service!\n") {
93-
return err
94-
}
95-
_, err = utils.ExecShellCmd("sudo systemctl daemon-reload")
96-
if !utils.CheckErrorWithTagAndMsg(err, "Failed to create kubelet service!\n") {
97-
return err
98-
}
99-
100-
return nil
101-
}
102-
10376
// Deploy Kubernetes
10477
func DeployKubernetes(haReplicaCount int) error {
10578
utils.WaitPrintf("Deploying Kubernetes(version %s)", configs.Kube.K8sVersion)

‎scripts/setup.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ func main() {
181181
// Original scripts from `scripts/cloudlab` directory
182182
case "setup_node":
183183
if setupFlags.NArg() < 3 {
184+
// ha_mode - REGULAR (do not install load balancers), MASTER, BACKUP (with load balancers)
184185
utils.FatalPrintf("Missing parameters: %s <ha_mode> <sandbox> [use-stargz]\n", subCmd)
185186
utils.CleanEnvironment()
186187
os.Exit(1)

‎scripts/utils/system.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ func PrepareEnvironment() error {
253253
func CleanEnvironment() error {
254254
// Define task List
255255
cleanTaskList := []func() error{
256-
//CleanUpTmpDir,
256+
CleanUpTmpDir,
257257
}
258258
// Execute task
259259
for _, task := range cleanTaskList {

0 commit comments

Comments
 (0)
Please sign in to comment.