Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
14 changes: 11 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,20 @@ jobs:
echo "All 3 attempts failed"
exit 1
- name: Save controller logs
if: failure()
if: always()
run: |
mkdir -p /tmp/logs
minikube kubectl -- -n chaos-engineering logs -lapp=chaos-controller -c manager --tail=-1 > /tmp/logs/e2e.txt 2>&1 || true
minikube kubectl -- -n chaos-engineering logs -lapp=chaos-controller -c manager --tail=-1 > /tmp/logs/manager.txt 2>&1 || true
minikube kubectl -- -n chaos-engineering describe pods -lapp=chaos-controller > /tmp/logs/manager-describe.txt 2>&1 || true
minikube kubectl -- get pods -A -o wide > /tmp/logs/all-pods.txt 2>&1 || true
minikube kubectl -- describe pods -l chaos.datadoghq.com/disruption-name -A > /tmp/logs/chaos-pods-describe.txt 2>&1 || true
for pod in $(minikube kubectl -- get pods -A -l chaos.datadoghq.com/disruption-name -o jsonpath='{range .items[*]}{.metadata.namespace}/{.metadata.name}{"\n"}{end}' 2>/dev/null); do
ns="${pod%/*}"; name="${pod#*/}"
minikube kubectl -- -n "${ns}" logs "${name}" --all-containers=true --tail=-1 --prefix=true > "/tmp/logs/chaos-pod-${ns}-${name}.txt" 2>&1 || true
done
minikube kubectl -- get events -A --sort-by='.lastTimestamp' > /tmp/logs/events.txt 2>&1 || true
- name: Upload controller logs
if: failure()
if: always()
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
with:
name: e2e-controller-logs
Expand Down
36 changes: 21 additions & 15 deletions LICENSE-3rdparty.csv
Original file line number Diff line number Diff line change
Expand Up @@ -459,18 +459,16 @@ github.com/onsi/gomega,github.com/onsi/gomega/matchers/support/goraph/edge,MIT
github.com/onsi/gomega,github.com/onsi/gomega/matchers/support/goraph/node,MIT
github.com/onsi/gomega,github.com/onsi/gomega/matchers/support/goraph/util,MIT
github.com/onsi/gomega,github.com/onsi/gomega/types,MIT
github.com/opencontainers/cgroups,github.com/opencontainers/cgroups,Apache-2.0
github.com/opencontainers/cgroups,github.com/opencontainers/cgroups/devices/config,Apache-2.0
github.com/opencontainers/cgroups,github.com/opencontainers/cgroups/fs,Apache-2.0
github.com/opencontainers/cgroups,github.com/opencontainers/cgroups/fs2,Apache-2.0
github.com/opencontainers/cgroups,github.com/opencontainers/cgroups/fscommon,Apache-2.0
github.com/opencontainers/cgroups,github.com/opencontainers/cgroups/internal/path,Apache-2.0
github.com/opencontainers/go-digest,github.com/opencontainers/go-digest,Apache-2.0
github.com/opencontainers/image-spec,github.com/opencontainers/image-spec/identity,Apache-2.0
github.com/opencontainers/image-spec,github.com/opencontainers/image-spec/specs-go,Apache-2.0
github.com/opencontainers/image-spec,github.com/opencontainers/image-spec/specs-go/v1,Apache-2.0
github.com/opencontainers/runc,github.com/opencontainers/runc/internal/pathrs,Apache-2.0
github.com/opencontainers/runc,github.com/opencontainers/runc/libcontainer/cgroups,Apache-2.0
github.com/opencontainers/runc,github.com/opencontainers/runc/libcontainer/cgroups/fs,Apache-2.0
github.com/opencontainers/runc,github.com/opencontainers/runc/libcontainer/cgroups/fs2,Apache-2.0
github.com/opencontainers/runc,github.com/opencontainers/runc/libcontainer/cgroups/fscommon,Apache-2.0
github.com/opencontainers/runc,github.com/opencontainers/runc/libcontainer/configs,Apache-2.0
github.com/opencontainers/runc,github.com/opencontainers/runc/libcontainer/devices,Apache-2.0
github.com/opencontainers/runc,github.com/opencontainers/runc/libcontainer/utils,Apache-2.0
github.com/opencontainers/runtime-spec,github.com/opencontainers/runtime-spec/specs-go,Apache-2.0
github.com/opencontainers/selinux,github.com/opencontainers/selinux/go-selinux,Apache-2.0
github.com/opencontainers/selinux,github.com/opencontainers/selinux/go-selinux/label,Apache-2.0
Expand Down Expand Up @@ -598,6 +596,7 @@ go.opentelemetry.io/otel,go.opentelemetry.io/otel/attribute/internal/xxhash,Apac
go.opentelemetry.io/otel,go.opentelemetry.io/otel/baggage,Apache-2.0
go.opentelemetry.io/otel,go.opentelemetry.io/otel/codes,Apache-2.0
go.opentelemetry.io/otel,go.opentelemetry.io/otel/internal/baggage,Apache-2.0
go.opentelemetry.io/otel,go.opentelemetry.io/otel/internal/errorhandler,Apache-2.0
go.opentelemetry.io/otel,go.opentelemetry.io/otel/internal/global,Apache-2.0
go.opentelemetry.io/otel,go.opentelemetry.io/otel/propagation,Apache-2.0
go.opentelemetry.io/otel,go.opentelemetry.io/otel/semconv/v1.20.0,Apache-2.0
Expand All @@ -606,6 +605,7 @@ go.opentelemetry.io/otel,go.opentelemetry.io/otel/semconv/v1.26.0,Apache-2.0
go.opentelemetry.io/otel,go.opentelemetry.io/otel/semconv/v1.37.0,Apache-2.0
go.opentelemetry.io/otel,go.opentelemetry.io/otel/semconv/v1.39.0,Apache-2.0
go.opentelemetry.io/otel,go.opentelemetry.io/otel/semconv/v1.39.0/otelconv,Apache-2.0
go.opentelemetry.io/otel,go.opentelemetry.io/otel/semconv/v1.40.0,Apache-2.0
go.opentelemetry.io/otel/log,go.opentelemetry.io/otel/log,Apache-2.0
go.opentelemetry.io/otel/log,go.opentelemetry.io/otel/log/embedded,Apache-2.0
go.opentelemetry.io/otel/log,go.opentelemetry.io/otel/log/global,Apache-2.0
Expand Down Expand Up @@ -757,6 +757,7 @@ google.golang.org/grpc,google.golang.org/grpc/internal/grpclog,Apache-2.0
google.golang.org/grpc,google.golang.org/grpc/internal/grpcsync,Apache-2.0
google.golang.org/grpc,google.golang.org/grpc/internal/grpcutil,Apache-2.0
google.golang.org/grpc,google.golang.org/grpc/internal/idle,Apache-2.0
google.golang.org/grpc,google.golang.org/grpc/internal/mem,Apache-2.0
google.golang.org/grpc,google.golang.org/grpc/internal/metadata,Apache-2.0
google.golang.org/grpc,google.golang.org/grpc/internal/pretty,Apache-2.0
google.golang.org/grpc,google.golang.org/grpc/internal/proxyattributes,Apache-2.0
Expand Down Expand Up @@ -897,7 +898,7 @@ k8s.io/api,k8s.io/api/scheduling/v1beta1,Apache-2.0
k8s.io/api,k8s.io/api/storage/v1,Apache-2.0
k8s.io/api,k8s.io/api/storage/v1alpha1,Apache-2.0
k8s.io/api,k8s.io/api/storage/v1beta1,Apache-2.0
k8s.io/api,k8s.io/api/storagemigration/v1alpha1,Apache-2.0
k8s.io/api,k8s.io/api/storagemigration/v1beta1,Apache-2.0
k8s.io/apiextensions-apiserver,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions,Apache-2.0
k8s.io/apiextensions-apiserver,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,Apache-2.0
k8s.io/apimachinery,k8s.io/apimachinery/pkg/api/equality,Apache-2.0
Expand All @@ -913,6 +914,7 @@ k8s.io/apimachinery,k8s.io/apimachinery/pkg/api/validate/content,Apache-2.0
k8s.io/apimachinery,k8s.io/apimachinery/pkg/api/validation,Apache-2.0
k8s.io/apimachinery,k8s.io/apimachinery/pkg/apis/meta/internalversion,Apache-2.0
k8s.io/apimachinery,k8s.io/apimachinery/pkg/apis/meta/internalversion/scheme,Apache-2.0
k8s.io/apimachinery,k8s.io/apimachinery/pkg/apis/meta/internalversion/validation,Apache-2.0
k8s.io/apimachinery,k8s.io/apimachinery/pkg/apis/meta/v1,Apache-2.0
k8s.io/apimachinery,k8s.io/apimachinery/pkg/apis/meta/v1/unstructured,Apache-2.0
k8s.io/apimachinery,k8s.io/apimachinery/pkg/apis/meta/v1/validation,Apache-2.0
Expand Down Expand Up @@ -954,6 +956,7 @@ k8s.io/apimachinery,k8s.io/apimachinery/pkg/util/strategicpatch,Apache-2.0
k8s.io/apimachinery,k8s.io/apimachinery/pkg/util/uuid,Apache-2.0
k8s.io/apimachinery,k8s.io/apimachinery/pkg/util/validation,Apache-2.0
k8s.io/apimachinery,k8s.io/apimachinery/pkg/util/validation/field,Apache-2.0
k8s.io/apimachinery,k8s.io/apimachinery/pkg/util/version,Apache-2.0
k8s.io/apimachinery,k8s.io/apimachinery/pkg/util/wait,Apache-2.0
k8s.io/apimachinery,k8s.io/apimachinery/pkg/util/yaml,Apache-2.0
k8s.io/apimachinery,k8s.io/apimachinery/pkg/version,Apache-2.0
Expand Down Expand Up @@ -1014,7 +1017,7 @@ k8s.io/client-go,k8s.io/client-go/applyconfigurations/scheduling/v1beta1,Apache-
k8s.io/client-go,k8s.io/client-go/applyconfigurations/storage/v1,Apache-2.0
k8s.io/client-go,k8s.io/client-go/applyconfigurations/storage/v1alpha1,Apache-2.0
k8s.io/client-go,k8s.io/client-go/applyconfigurations/storage/v1beta1,Apache-2.0
k8s.io/client-go,k8s.io/client-go/applyconfigurations/storagemigration/v1alpha1,Apache-2.0
k8s.io/client-go,k8s.io/client-go/applyconfigurations/storagemigration/v1beta1,Apache-2.0
k8s.io/client-go,k8s.io/client-go/discovery,Apache-2.0
k8s.io/client-go,k8s.io/client-go/discovery/fake,Apache-2.0
k8s.io/client-go,k8s.io/client-go/dynamic,Apache-2.0
Expand Down Expand Up @@ -1091,7 +1094,7 @@ k8s.io/client-go,k8s.io/client-go/informers/storage/v1,Apache-2.0
k8s.io/client-go,k8s.io/client-go/informers/storage/v1alpha1,Apache-2.0
k8s.io/client-go,k8s.io/client-go/informers/storage/v1beta1,Apache-2.0
k8s.io/client-go,k8s.io/client-go/informers/storagemigration,Apache-2.0
k8s.io/client-go,k8s.io/client-go/informers/storagemigration/v1alpha1,Apache-2.0
k8s.io/client-go,k8s.io/client-go/informers/storagemigration/v1beta1,Apache-2.0
k8s.io/client-go,k8s.io/client-go/kubernetes,Apache-2.0
k8s.io/client-go,k8s.io/client-go/kubernetes/fake,Apache-2.0
k8s.io/client-go,k8s.io/client-go/kubernetes/scheme,Apache-2.0
Expand Down Expand Up @@ -1203,8 +1206,8 @@ k8s.io/client-go,k8s.io/client-go/kubernetes/typed/storage/v1alpha1,Apache-2.0
k8s.io/client-go,k8s.io/client-go/kubernetes/typed/storage/v1alpha1/fake,Apache-2.0
k8s.io/client-go,k8s.io/client-go/kubernetes/typed/storage/v1beta1,Apache-2.0
k8s.io/client-go,k8s.io/client-go/kubernetes/typed/storage/v1beta1/fake,Apache-2.0
k8s.io/client-go,k8s.io/client-go/kubernetes/typed/storagemigration/v1alpha1,Apache-2.0
k8s.io/client-go,k8s.io/client-go/kubernetes/typed/storagemigration/v1alpha1/fake,Apache-2.0
k8s.io/client-go,k8s.io/client-go/kubernetes/typed/storagemigration/v1beta1,Apache-2.0
k8s.io/client-go,k8s.io/client-go/kubernetes/typed/storagemigration/v1beta1/fake,Apache-2.0
k8s.io/client-go,k8s.io/client-go/listers,Apache-2.0
k8s.io/client-go,k8s.io/client-go/listers/admissionregistration/v1,Apache-2.0
k8s.io/client-go,k8s.io/client-go/listers/admissionregistration/v1alpha1,Apache-2.0
Expand Down Expand Up @@ -1255,7 +1258,7 @@ k8s.io/client-go,k8s.io/client-go/listers/scheduling/v1beta1,Apache-2.0
k8s.io/client-go,k8s.io/client-go/listers/storage/v1,Apache-2.0
k8s.io/client-go,k8s.io/client-go/listers/storage/v1alpha1,Apache-2.0
k8s.io/client-go,k8s.io/client-go/listers/storage/v1beta1,Apache-2.0
k8s.io/client-go,k8s.io/client-go/listers/storagemigration/v1alpha1,Apache-2.0
k8s.io/client-go,k8s.io/client-go/listers/storagemigration/v1beta1,Apache-2.0
k8s.io/client-go,k8s.io/client-go/metadata,Apache-2.0
k8s.io/client-go,k8s.io/client-go/openapi,Apache-2.0
k8s.io/client-go,k8s.io/client-go/pkg/apis/clientauthentication,Apache-2.0
Expand Down Expand Up @@ -1295,6 +1298,7 @@ k8s.io/client-go,k8s.io/client-go/util/flowcontrol,Apache-2.0
k8s.io/client-go,k8s.io/client-go/util/homedir,Apache-2.0
k8s.io/client-go,k8s.io/client-go/util/jsonpath,Apache-2.0
k8s.io/client-go,k8s.io/client-go/util/keyutil,Apache-2.0
k8s.io/client-go,k8s.io/client-go/util/watchlist,Apache-2.0
k8s.io/client-go,k8s.io/client-go/util/workqueue,Apache-2.0
k8s.io/klog/v2,k8s.io/klog/v2,Apache-2.0
k8s.io/klog/v2,k8s.io/klog/v2/internal/buffer,Apache-2.0
Expand All @@ -1310,6 +1314,7 @@ k8s.io/kube-openapi,k8s.io/kube-openapi/pkg/internal,Apache-2.0
k8s.io/kube-openapi,k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json,Apache-2.0
k8s.io/kube-openapi,k8s.io/kube-openapi/pkg/schemaconv,Apache-2.0
k8s.io/kube-openapi,k8s.io/kube-openapi/pkg/spec3,Apache-2.0
k8s.io/kube-openapi,k8s.io/kube-openapi/pkg/util,Apache-2.0
k8s.io/kube-openapi,k8s.io/kube-openapi/pkg/util/proto,Apache-2.0
k8s.io/kube-openapi,k8s.io/kube-openapi/pkg/validation/spec,Apache-2.0
k8s.io/utils,k8s.io/utils/buffer,Apache-2.0
Expand All @@ -1318,7 +1323,6 @@ k8s.io/utils,k8s.io/utils/internal/third_party/forked/golang/golang-lru,Apache-2
k8s.io/utils,k8s.io/utils/internal/third_party/forked/golang/net,Apache-2.0
k8s.io/utils,k8s.io/utils/lru,Apache-2.0
k8s.io/utils,k8s.io/utils/net,Apache-2.0
k8s.io/utils,k8s.io/utils/pointer,Apache-2.0
k8s.io/utils,k8s.io/utils/ptr,Apache-2.0
k8s.io/utils,k8s.io/utils/trace,Apache-2.0
sigs.k8s.io/controller-runtime,sigs.k8s.io/controller-runtime,Apache-2.0
Expand Down Expand Up @@ -1366,6 +1370,7 @@ sigs.k8s.io/controller-runtime,sigs.k8s.io/controller-runtime/pkg/webhook,Apache
sigs.k8s.io/controller-runtime,sigs.k8s.io/controller-runtime/pkg/webhook/admission,Apache-2.0
sigs.k8s.io/controller-runtime,sigs.k8s.io/controller-runtime/pkg/webhook/admission/metrics,Apache-2.0
sigs.k8s.io/controller-runtime,sigs.k8s.io/controller-runtime/pkg/webhook/conversion,Apache-2.0
sigs.k8s.io/controller-runtime,sigs.k8s.io/controller-runtime/pkg/webhook/conversion/metrics,Apache-2.0
sigs.k8s.io/controller-runtime,sigs.k8s.io/controller-runtime/pkg/webhook/internal/metrics,Apache-2.0
sigs.k8s.io/json,sigs.k8s.io/json,Apache-2.0
sigs.k8s.io/json,sigs.k8s.io/json/internal/golang/encoding/json,Apache-2.0
Expand All @@ -1377,3 +1382,4 @@ sigs.k8s.io/structured-merge-diff/v6,sigs.k8s.io/structured-merge-diff/v6/schema
sigs.k8s.io/structured-merge-diff/v6,sigs.k8s.io/structured-merge-diff/v6/typed,Apache-2.0
sigs.k8s.io/structured-merge-diff/v6,sigs.k8s.io/structured-merge-diff/v6/value,Apache-2.0
sigs.k8s.io/yaml,sigs.k8s.io/yaml,Apache-2.0
sigs.k8s.io/yaml,sigs.k8s.io/yaml/kyaml,Apache-2.0
11 changes: 5 additions & 6 deletions cgroup/manager_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ import (
"path/filepath"
"strings"

"github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/opencontainers/runc/libcontainer/cgroups/fs"
"github.com/opencontainers/runc/libcontainer/cgroups/fs2"
"github.com/opencontainers/runc/libcontainer/configs"
"github.com/opencontainers/cgroups"
"github.com/opencontainers/cgroups/fs"
"github.com/opencontainers/cgroups/fs2"
"go.uber.org/zap"

"github.com/DataDog/chaos-controller/o11y/tags"
Expand All @@ -26,8 +25,8 @@ type instManager struct {
type pkgManager struct{}

func newAllCGroupManager(cgroupFile string, cgroupMount string, log *zap.SugaredLogger) (allCGroupManager, error) {
cg := &configs.Cgroup{
Resources: &configs.Resources{},
cg := &cgroups.Cgroup{
Resources: &cgroups.Resources{},
}

// parse the proc cgroup file
Expand Down
Loading