Skip to content

Commit ff466d3

Browse files
authored
Add skip billing to namespace metadata (#53)
Signed-off-by: Tamal Saha <tamal@appscode.com>
1 parent 3e09848 commit ff466d3

File tree

7 files changed

+17
-8
lines changed

7 files changed

+17
-8
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ require (
1515
k8s.io/apimachinery v0.32.3
1616
k8s.io/client-go v0.32.3
1717
k8s.io/klog/v2 v2.130.1
18-
kmodules.xyz/client-go v0.32.3
19-
kmodules.xyz/resource-metadata v0.29.0
18+
kmodules.xyz/client-go v0.32.4-0.20250513055843-e286d040e0e9
19+
kmodules.xyz/resource-metadata v0.29.1-0.20250513064340-22fab8d1b164
2020
sigs.k8s.io/controller-runtime v0.20.4
2121
)
2222

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -321,14 +321,14 @@ k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJ
321321
k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
322322
kmodules.xyz/apiversion v0.2.0 h1:vAQYqZFm4xu4pbB1cAdHbFEPES6EQkcR4wc06xdTOWk=
323323
kmodules.xyz/apiversion v0.2.0/go.mod h1:oPX8g8LvlPdPX3Yc5YvCzJHQnw3YF/X4/jdW0b1am80=
324-
kmodules.xyz/client-go v0.32.3 h1:dO6VQkmii2rhyoXy+VVjiXMyJGcPne9b2rZ7fSrzDbQ=
325-
kmodules.xyz/client-go v0.32.3/go.mod h1:ZwLnc7UqEXUNSe43n/SnER6+7YAQCu38L2te6YefoHU=
324+
kmodules.xyz/client-go v0.32.4-0.20250513055843-e286d040e0e9 h1:U1dBMwlckBdgdZ3Dudxv+B6tlQ/020GYpi/J9If1Mtw=
325+
kmodules.xyz/client-go v0.32.4-0.20250513055843-e286d040e0e9/go.mod h1:ZwLnc7UqEXUNSe43n/SnER6+7YAQCu38L2te6YefoHU=
326326
kmodules.xyz/go-containerregistry v0.0.14 h1:8MgLFa74HymAJEyjH7fyQJn5u2Ok6qPPFQX8ARfcXp0=
327327
kmodules.xyz/go-containerregistry v0.0.14/go.mod h1:xz0iGC3noyMi5NNAzXWTH6KqfiIgFWZAomw+U2zVOXs=
328328
kmodules.xyz/offshoot-api v0.32.0 h1:gogc5scSZe2JoXtZof72UGRl3Tit0kFaFRMkLLT1D8o=
329329
kmodules.xyz/offshoot-api v0.32.0/go.mod h1:tled7OxYZ3SkUJcrVFVVYyd+zXjsRSEm1R6Q3k4gcx0=
330-
kmodules.xyz/resource-metadata v0.29.0 h1:i6YfAZ8x7l1DiUPSrE/JwoThwOFfI3Zw6f8KT2E8084=
331-
kmodules.xyz/resource-metadata v0.29.0/go.mod h1:sPMFu8+4V1M4mNqmzQQv5t9rkIg4AmiHplu2NdE5Tkc=
330+
kmodules.xyz/resource-metadata v0.29.1-0.20250513064340-22fab8d1b164 h1:CvPTF+lSEnW0+eCcWiIivHlivOIv/Yw2HOD2+8x9b0c=
331+
kmodules.xyz/resource-metadata v0.29.1-0.20250513064340-22fab8d1b164/go.mod h1:iASwA5yAEOPpqrepmmjmWvM2w8m0aHlxTIIGe5wgni0=
332332
kmodules.xyz/resource-metrics v0.30.6 h1:y+26VJ3oJ6FtE+f/sc9HfMAfaySZA+fIytRJ14YtxDo=
333333
kmodules.xyz/resource-metrics v0.30.6/go.mod h1:SL7hGoKCUOTOEQXVEkryREwlVkujM8jKPVEPUklZ3JY=
334334
moul.io/http2curl/v2 v2.3.1-0.20221024080105-10c404f653f7 h1:NykkTlRB+X40z86cLHdEmuoTxhNKhQebLT379b1EumA=

lib/billing_event.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ func (p *BillingEventCreator) CreateEvent(obj client.Object) (*api.Event, error)
6060
Name: ns.Name,
6161
CreationTimestamp: ns.CreationTimestamp,
6262
}
63+
res.Spec.Namespace.SkipBilling = ns.Annotations[kmapi.AceSkipBillingKey] == "true"
6364
if ns.Labels[kmapi.ClientOrgKey] == "true" {
6465
res.Spec.Namespace.AceOrgID = ns.Annotations[kmapi.AceOrgIDKey]
6566

vendor/kmodules.xyz/client-go/api/v1/cluster.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ const (
6060
ClusterProfileLabel string = "cluster.appscode.com/profile"
6161

6262
AceOrgIDKey string = "ace.appscode.com/org-id"
63+
AceSkipBillingKey string = "ace.appscode.com/skip-billing"
6364
ClientOrgKey string = "ace.appscode.com/client-org"
6465
ClientOrgMonitoringKey string = "ace.appscode.com/client-org-monitoring"
6566
ClientKeyPrefix string = "client.ace.appscode.com/"

vendor/kmodules.xyz/resource-metadata/apis/core/v1alpha1/generic_resource_types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ type NamespaceInfo struct {
8484
CreationTimestamp metav1.Time `json:"creationTimestamp,omitempty"`
8585
AceOrgID string `json:"aceOrgID,omitempty"`
8686
AceOrgMetadata map[string]string `json:"aceOrgMetadata,omitempty"`
87+
SkipBilling bool `json:"skipBilling,omitempty"`
8788
}
8889

8990
type ComputeResource struct {

vendor/kmodules.xyz/resource-metadata/apis/core/v1alpha1/openapi_generated.go

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -907,7 +907,7 @@ k8s.io/utils/trace
907907
# kmodules.xyz/apiversion v0.2.0
908908
## explicit; go 1.14
909909
kmodules.xyz/apiversion
910-
# kmodules.xyz/client-go v0.32.3
910+
# kmodules.xyz/client-go v0.32.4-0.20250513055843-e286d040e0e9
911911
## explicit; go 1.23.0
912912
kmodules.xyz/client-go
913913
kmodules.xyz/client-go/api/v1
@@ -928,7 +928,7 @@ kmodules.xyz/go-containerregistry/name
928928
## explicit; go 1.23.0
929929
kmodules.xyz/offshoot-api/api/v1
930930
kmodules.xyz/offshoot-api/api/v2
931-
# kmodules.xyz/resource-metadata v0.29.0
931+
# kmodules.xyz/resource-metadata v0.29.1-0.20250513064340-22fab8d1b164
932932
## explicit; go 1.23.0
933933
kmodules.xyz/resource-metadata/apis/core/v1alpha1
934934
kmodules.xyz/resource-metadata/apis/identity/v1alpha1

0 commit comments

Comments
 (0)