Skip to content

Commit

Permalink
Update deps
Browse files Browse the repository at this point in the history
Signed-off-by: Tamal Saha <tamal@appscode.com>
  • Loading branch information
tamalsaha committed Feb 2, 2025
1 parent f435670 commit 47fd90c
Show file tree
Hide file tree
Showing 14 changed files with 857 additions and 109 deletions.
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ require (
github.com/pkg/errors v0.9.1
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.75.2
github.com/prometheus-operator/prometheus-operator/pkg/client v0.75.2
go.bytebuilders.dev/audit v0.0.39
go.bytebuilders.dev/license-verifier/kubernetes v0.14.5
go.bytebuilders.dev/audit v0.0.40
go.bytebuilders.dev/license-verifier/kubernetes v0.14.6
gomodules.xyz/encoding v0.0.8
gomodules.xyz/pointer v0.1.0
gomodules.xyz/runtime v0.3.0
Expand All @@ -43,7 +43,7 @@ require (
kmodules.xyz/monitoring-agent-api v0.30.2
kmodules.xyz/objectstore-api v0.29.1
kmodules.xyz/offshoot-api v0.30.1
kmodules.xyz/resource-metadata v0.24.1
kmodules.xyz/resource-metadata v0.24.3
kmodules.xyz/webhook-runtime v0.29.1
kubeops.dev/csi-driver-cacerts v0.1.0
kubeops.dev/petset v0.0.7
Expand Down Expand Up @@ -152,7 +152,7 @@ require (
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
github.com/zeebo/xxh3 v1.0.2 // indirect
go.bytebuilders.dev/license-proxyserver v0.0.20 // indirect
go.bytebuilders.dev/license-verifier v0.14.5 // indirect
go.bytebuilders.dev/license-verifier v0.14.6 // indirect
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
Expand Down
16 changes: 8 additions & 8 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -383,14 +383,14 @@ github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ=
github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
go.bytebuilders.dev/audit v0.0.39 h1:JNwXIwqFZc+x5uvl0yyR2LdSVtfiLX85ypybKHTrNhA=
go.bytebuilders.dev/audit v0.0.39/go.mod h1:XbqHg9V/MldBx6qEsvs/McufBYiBkAg5r/cCfEit94Y=
go.bytebuilders.dev/audit v0.0.40 h1:KjKsov9bk0SAfsylaX321L5L8j8KrPD5nP+ug1skpQE=
go.bytebuilders.dev/audit v0.0.40/go.mod h1:ImDf8GWWBhCAZPwey7GPR0u2/KH8bvmhQ1kCz0AYtfc=
go.bytebuilders.dev/license-proxyserver v0.0.20 h1:gzRSwUmX/LSwPVE6T9oy5RLIutU1EeI7hmS+QGsYBY4=
go.bytebuilders.dev/license-proxyserver v0.0.20/go.mod h1:2PJmjMCXncVyeP3fIVQ+hwZnuhmWSTmbcuEMBrFKIac=
go.bytebuilders.dev/license-verifier v0.14.5 h1:4P+eoi7n8QaEUFpM2TtXASmIdg4mjtXbMsvexWr2GWU=
go.bytebuilders.dev/license-verifier v0.14.5/go.mod h1:LqWXJKee5ofDcCYM6T5WilYlUc4NlKeZz58tHwO8GEs=
go.bytebuilders.dev/license-verifier/kubernetes v0.14.5 h1:pB2OkG/rDK8m8IQzS5l8ibJhfZwd/A2JQsbZtTxT0+8=
go.bytebuilders.dev/license-verifier/kubernetes v0.14.5/go.mod h1:yhEnPHRAlQ8t3Ini2K4qFI4dn+zWFCi3cW8GXS0Fj1A=
go.bytebuilders.dev/license-verifier v0.14.6 h1:0iHYGURUbx8toiXvFKftn/qMpeHzqHbAgEnEzOCNLvo=
go.bytebuilders.dev/license-verifier v0.14.6/go.mod h1:LqWXJKee5ofDcCYM6T5WilYlUc4NlKeZz58tHwO8GEs=
go.bytebuilders.dev/license-verifier/kubernetes v0.14.6 h1:NxmASX0A3lu+ABd4zuT5Ib+I63y3j5uJxmlUFEGxqWg=
go.bytebuilders.dev/license-verifier/kubernetes v0.14.6/go.mod h1:N5QxsJF4EGLduOsTsW9gGfRuuMvN33T8pg5Y9NfKzuo=
go.etcd.io/bbolt v1.3.8 h1:xs88BrvEv273UsB79e0hcVrlUWmS0a8upikMFhSyAtA=
go.etcd.io/bbolt v1.3.8/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
go.etcd.io/etcd/api/v3 v3.5.14 h1:vHObSCxyB9zlF60w7qzAdTcGaglbJOpSj1Xj9+WGxq0=
Expand Down Expand Up @@ -670,8 +670,8 @@ kmodules.xyz/offshoot-api v0.30.1 h1:TrulAYO+oBsXe9sZZGTmNWIuI8qD2izMpgcTSPvgAmI
kmodules.xyz/offshoot-api v0.30.1/go.mod h1:T3mpjR6fui0QzOcmQvIuANytW48fe9ytmy/1cgx6D4g=
kmodules.xyz/prober v0.29.0 h1:Ex7m4F9rH7uWNNJlLgP63ROOM+nUATJkC2L5OQ7nwMg=
kmodules.xyz/prober v0.29.0/go.mod h1:UtK+HKyI1lFLEKX+HFLyOCVju6TO93zv3kwGpzqmKOo=
kmodules.xyz/resource-metadata v0.24.1 h1:l4PmP+zbccPUQmSHKfEmmFLWMXtAHcgaRLWZ3v4WjYM=
kmodules.xyz/resource-metadata v0.24.1/go.mod h1:TIHbYsuqmLl8yhYwV/4Uwwm4CO4GdqGHy1KAOgKhpYY=
kmodules.xyz/resource-metadata v0.24.3 h1:yGXm6G1YIXru3mgDqDWsCPhGfotT3xBTKy+jd0bpF+E=
kmodules.xyz/resource-metadata v0.24.3/go.mod h1:rPUZSMR0e1Vi+gONQ2ZhOFW+GvUeK+1AI7h9fzTZoKI=
kmodules.xyz/resource-metrics v0.30.5 h1:ZhpGeR9DCz1HTrKUg/mWhr95wlFzCPRdgVAqwaggy1o=
kmodules.xyz/resource-metrics v0.30.5/go.mod h1:w9+rz7/s/kGP1GWzYSuRdCn+l7EwpesmESSEHkLBnIQ=
kmodules.xyz/webhook-runtime v0.29.1 h1:SQ8NvwJpxv5CUuXIubSg9g0Bk8BBnj4dhCWEk6Ou8g8=
Expand Down
64 changes: 64 additions & 0 deletions vendor/go.bytebuilders.dev/audit/lib/billing_event.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@ limitations under the License.
package lib

import (
"context"

api "go.bytebuilders.dev/audit/api/v1"

core "k8s.io/api/core/v1"
kmapi "kmodules.xyz/client-go/api/v1"
"kmodules.xyz/client-go/discovery"
corev1alpha1 "kmodules.xyz/resource-metadata/apis/core/v1alpha1"
Expand All @@ -28,6 +31,9 @@ import (
type BillingEventCreator struct {
Mapper discovery.ResourceMapper
ClusterMetadata *kmapi.ClusterMetadata
ClientBilling bool
PodLister client.Reader
PVCLister client.Reader
}

func (p *BillingEventCreator) CreateEvent(obj client.Object) (*api.Event, error) {
Expand All @@ -41,8 +47,66 @@ func (p *BillingEventCreator) CreateEvent(obj client.Object) (*api.Event, error)
return nil, err
}

if p.ClientBilling {
if r, ok := obj.(Resource); ok {
var podList core.PodList
err = p.PodLister.List(context.TODO(), &podList, client.InNamespace(obj.GetNamespace()), client.MatchingLabels(r.OffshootSelectors()))
if err != nil {
return nil, err
}
podresources := make([]corev1alpha1.ComputeResource, 0, len(podList.Items))
for _, pod := range podList.Items {
pr := corev1alpha1.ComputeResource{
UID: pod.UID,
Name: pod.Name,
CreationTimestamp: pod.CreationTimestamp,
Containers: make([]corev1alpha1.ContainerResource, 0, len(pod.Spec.Containers)),
InitContainers: make([]corev1alpha1.ContainerResource, 0, len(pod.Spec.Containers)),
}
for _, c := range pod.Spec.Containers {
pr.Containers = append(pr.Containers, corev1alpha1.ContainerResource{
Name: c.Name,
Resource: c.Resources,
RestartPolicy: c.RestartPolicy,
})
}
for _, c := range pod.Spec.InitContainers {
pr.InitContainers = append(pr.InitContainers, corev1alpha1.ContainerResource{
Name: c.Name,
Resource: c.Resources,
RestartPolicy: c.RestartPolicy,
})
}
podresources = append(podresources, pr)
}
res.Spec.Pods = podresources

var pvcList core.PersistentVolumeClaimList
err = p.PVCLister.List(context.TODO(), &pvcList, client.InNamespace(obj.GetNamespace()), client.MatchingLabels(r.OffshootSelectors()))
if err != nil {
return nil, err
}
pvcresources := make([]corev1alpha1.StorageResource, 0, len(podList.Items))
for _, pvc := range pvcList.Items {
if pvc.Status.Phase == core.ClaimBound {
pvcresources = append(pvcresources, corev1alpha1.StorageResource{
UID: pvc.UID,
Name: pvc.Name,
CreationTimestamp: pvc.CreationTimestamp,
Resources: pvc.Spec.Resources,
})
}
}
res.Spec.Storage = pvcresources
}
}

return &api.Event{
Resource: res,
ResourceID: *rid,
}, nil
}

type Resource interface {
OffshootSelectors() map[string]string
}
136 changes: 136 additions & 0 deletions vendor/go.bytebuilders.dev/audit/lib/lister.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
/*
Copyright AppsCode Inc. and Contributors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package lib

import (
"context"
"reflect"

core "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/labels"
corelisters "k8s.io/client-go/listers/core/v1"
"sigs.k8s.io/controller-runtime/pkg/client"
)

type PodReader struct {
delegate corelisters.PodLister
}

var _ client.Reader = &PodReader{}

func NewPodReader(delegate corelisters.PodLister) PodReader {
return PodReader{delegate: delegate}
}

func (r PodReader) Get(ctx context.Context, key client.ObjectKey, obj client.Object, _ ...client.GetOption) error {
pod, err := r.delegate.Pods(key.Namespace).Get(key.Name)
if err != nil {
return err
}
assign(obj, pod)
return nil
}

func (r PodReader) List(ctx context.Context, list client.ObjectList, opts ...client.ListOption) error {
var o client.ListOptions
o.ApplyOptions(opts)

var ls labels.Selector
if o.LabelSelector != nil {
ls = o.LabelSelector
} else if o.Raw != nil && o.Raw.LabelSelector != "" {
var err error
ls, err = labels.Parse(o.Raw.LabelSelector)
if err != nil {
return err
}
}

pods, err := r.delegate.Pods(o.Namespace).List(ls)
if err != nil {
return err
}

podList := core.PodList{
Items: make([]core.Pod, 0, len(pods)),
}
for _, pod := range pods {
podList.Items = append(podList.Items, *pod)
}
assign(list, podList)

return nil
}

type PersistentVolumeClaimReader struct {
delegate corelisters.PersistentVolumeClaimLister
}

var _ client.Reader = &PersistentVolumeClaimReader{}

func NewPersistentVolumeClaimReader(delegate corelisters.PersistentVolumeClaimLister) PersistentVolumeClaimReader {
return PersistentVolumeClaimReader{delegate: delegate}
}

func (r PersistentVolumeClaimReader) Get(ctx context.Context, key client.ObjectKey, obj client.Object, _ ...client.GetOption) error {
pod, err := r.delegate.PersistentVolumeClaims(key.Namespace).Get(key.Name)
if err != nil {
return err
}
assign(obj, pod)

return nil
}

func (r PersistentVolumeClaimReader) List(ctx context.Context, list client.ObjectList, opts ...client.ListOption) error {
var o client.ListOptions
o.ApplyOptions(opts)

var ls labels.Selector
if o.LabelSelector != nil {
ls = o.LabelSelector
} else if o.Raw != nil && o.Raw.LabelSelector != "" {
var err error
ls, err = labels.Parse(o.Raw.LabelSelector)
if err != nil {
return err
}
}

pvcs, err := r.delegate.PersistentVolumeClaims(o.Namespace).List(ls)
if err != nil {
return err
}

pvcList := core.PersistentVolumeClaimList{
Items: make([]core.PersistentVolumeClaim, 0, len(pvcs)),
}
for _, pvc := range pvcs {
pvcList.Items = append(pvcList.Items, *pvc)
}
assign(list, pvcList)

return nil
}

func assign(target, src any) {
srcValue := reflect.ValueOf(src)
if srcValue.Kind() == reflect.Pointer {
srcValue = srcValue.Elem()
}
reflect.ValueOf(target).Elem().Set(srcValue)
}
Loading

0 comments on commit 47fd90c

Please sign in to comment.