diff --git a/go.mod b/go.mod index 053e1867..9308fd92 100644 --- a/go.mod +++ b/go.mod @@ -15,8 +15,8 @@ require ( k8s.io/apimachinery v0.32.3 k8s.io/client-go v0.32.3 k8s.io/klog/v2 v2.130.1 - kmodules.xyz/client-go v0.32.3 - kmodules.xyz/resource-metadata v0.29.0 + kmodules.xyz/client-go v0.32.4-0.20250513055843-e286d040e0e9 + kmodules.xyz/resource-metadata v0.29.1-0.20250513064340-22fab8d1b164 sigs.k8s.io/controller-runtime v0.20.4 ) diff --git a/go.sum b/go.sum index 099686ce..c93172d3 100644 --- a/go.sum +++ b/go.sum @@ -321,14 +321,14 @@ k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJ k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= kmodules.xyz/apiversion v0.2.0 h1:vAQYqZFm4xu4pbB1cAdHbFEPES6EQkcR4wc06xdTOWk= kmodules.xyz/apiversion v0.2.0/go.mod h1:oPX8g8LvlPdPX3Yc5YvCzJHQnw3YF/X4/jdW0b1am80= -kmodules.xyz/client-go v0.32.3 h1:dO6VQkmii2rhyoXy+VVjiXMyJGcPne9b2rZ7fSrzDbQ= -kmodules.xyz/client-go v0.32.3/go.mod h1:ZwLnc7UqEXUNSe43n/SnER6+7YAQCu38L2te6YefoHU= +kmodules.xyz/client-go v0.32.4-0.20250513055843-e286d040e0e9 h1:U1dBMwlckBdgdZ3Dudxv+B6tlQ/020GYpi/J9If1Mtw= +kmodules.xyz/client-go v0.32.4-0.20250513055843-e286d040e0e9/go.mod h1:ZwLnc7UqEXUNSe43n/SnER6+7YAQCu38L2te6YefoHU= kmodules.xyz/go-containerregistry v0.0.14 h1:8MgLFa74HymAJEyjH7fyQJn5u2Ok6qPPFQX8ARfcXp0= kmodules.xyz/go-containerregistry v0.0.14/go.mod h1:xz0iGC3noyMi5NNAzXWTH6KqfiIgFWZAomw+U2zVOXs= kmodules.xyz/offshoot-api v0.32.0 h1:gogc5scSZe2JoXtZof72UGRl3Tit0kFaFRMkLLT1D8o= kmodules.xyz/offshoot-api v0.32.0/go.mod h1:tled7OxYZ3SkUJcrVFVVYyd+zXjsRSEm1R6Q3k4gcx0= -kmodules.xyz/resource-metadata v0.29.0 h1:i6YfAZ8x7l1DiUPSrE/JwoThwOFfI3Zw6f8KT2E8084= -kmodules.xyz/resource-metadata v0.29.0/go.mod h1:sPMFu8+4V1M4mNqmzQQv5t9rkIg4AmiHplu2NdE5Tkc= +kmodules.xyz/resource-metadata v0.29.1-0.20250513064340-22fab8d1b164 h1:CvPTF+lSEnW0+eCcWiIivHlivOIv/Yw2HOD2+8x9b0c= +kmodules.xyz/resource-metadata v0.29.1-0.20250513064340-22fab8d1b164/go.mod h1:iASwA5yAEOPpqrepmmjmWvM2w8m0aHlxTIIGe5wgni0= kmodules.xyz/resource-metrics v0.30.6 h1:y+26VJ3oJ6FtE+f/sc9HfMAfaySZA+fIytRJ14YtxDo= kmodules.xyz/resource-metrics v0.30.6/go.mod h1:SL7hGoKCUOTOEQXVEkryREwlVkujM8jKPVEPUklZ3JY= moul.io/http2curl/v2 v2.3.1-0.20221024080105-10c404f653f7 h1:NykkTlRB+X40z86cLHdEmuoTxhNKhQebLT379b1EumA= diff --git a/lib/billing_event.go b/lib/billing_event.go index b295fccf..88f838af 100644 --- a/lib/billing_event.go +++ b/lib/billing_event.go @@ -60,6 +60,7 @@ func (p *BillingEventCreator) CreateEvent(obj client.Object) (*api.Event, error) Name: ns.Name, CreationTimestamp: ns.CreationTimestamp, } + res.Spec.Namespace.SkipBilling = ns.Annotations[kmapi.AceSkipBillingKey] == "true" if ns.Labels[kmapi.ClientOrgKey] == "true" { res.Spec.Namespace.AceOrgID = ns.Annotations[kmapi.AceOrgIDKey] diff --git a/vendor/kmodules.xyz/client-go/api/v1/cluster.go b/vendor/kmodules.xyz/client-go/api/v1/cluster.go index f25ac7df..e501b0ba 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/cluster.go +++ b/vendor/kmodules.xyz/client-go/api/v1/cluster.go @@ -60,6 +60,7 @@ const ( ClusterProfileLabel string = "cluster.appscode.com/profile" AceOrgIDKey string = "ace.appscode.com/org-id" + AceSkipBillingKey string = "ace.appscode.com/skip-billing" ClientOrgKey string = "ace.appscode.com/client-org" ClientOrgMonitoringKey string = "ace.appscode.com/client-org-monitoring" ClientKeyPrefix string = "client.ace.appscode.com/" diff --git a/vendor/kmodules.xyz/resource-metadata/apis/core/v1alpha1/generic_resource_types.go b/vendor/kmodules.xyz/resource-metadata/apis/core/v1alpha1/generic_resource_types.go index fe057f5a..6378e472 100644 --- a/vendor/kmodules.xyz/resource-metadata/apis/core/v1alpha1/generic_resource_types.go +++ b/vendor/kmodules.xyz/resource-metadata/apis/core/v1alpha1/generic_resource_types.go @@ -84,6 +84,7 @@ type NamespaceInfo struct { CreationTimestamp metav1.Time `json:"creationTimestamp,omitempty"` AceOrgID string `json:"aceOrgID,omitempty"` AceOrgMetadata map[string]string `json:"aceOrgMetadata,omitempty"` + SkipBilling bool `json:"skipBilling,omitempty"` } type ComputeResource struct { diff --git a/vendor/kmodules.xyz/resource-metadata/apis/core/v1alpha1/openapi_generated.go b/vendor/kmodules.xyz/resource-metadata/apis/core/v1alpha1/openapi_generated.go index f5080f3f..f8155270 100644 --- a/vendor/kmodules.xyz/resource-metadata/apis/core/v1alpha1/openapi_generated.go +++ b/vendor/kmodules.xyz/resource-metadata/apis/core/v1alpha1/openapi_generated.go @@ -20350,6 +20350,12 @@ func schema_resource_metadata_apis_core_v1alpha1_NamespaceInfo(ref common.Refere }, }, }, + "skipBilling": { + SchemaProps: spec.SchemaProps{ + Type: []string{"boolean"}, + Format: "", + }, + }, }, Required: []string{"name"}, }, diff --git a/vendor/modules.txt b/vendor/modules.txt index d3c70991..392f5693 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -907,7 +907,7 @@ k8s.io/utils/trace # kmodules.xyz/apiversion v0.2.0 ## explicit; go 1.14 kmodules.xyz/apiversion -# kmodules.xyz/client-go v0.32.3 +# kmodules.xyz/client-go v0.32.4-0.20250513055843-e286d040e0e9 ## explicit; go 1.23.0 kmodules.xyz/client-go kmodules.xyz/client-go/api/v1 @@ -928,7 +928,7 @@ kmodules.xyz/go-containerregistry/name ## explicit; go 1.23.0 kmodules.xyz/offshoot-api/api/v1 kmodules.xyz/offshoot-api/api/v2 -# kmodules.xyz/resource-metadata v0.29.0 +# kmodules.xyz/resource-metadata v0.29.1-0.20250513064340-22fab8d1b164 ## explicit; go 1.23.0 kmodules.xyz/resource-metadata/apis/core/v1alpha1 kmodules.xyz/resource-metadata/apis/identity/v1alpha1