Skip to content

Commit 5938d93

Browse files
tamalsahatamalsaha
committed
SkipBilling -> EnableResourceTrial
Signed-off-by: Tamal Saha <tamal@appscode.com>
1 parent ff466d3 commit 5938d93

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
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.4-0.20250513055843-e286d040e0e9
19-
kmodules.xyz/resource-metadata v0.29.1-0.20250513064340-22fab8d1b164
18+
kmodules.xyz/client-go v0.32.4-0.20250513070944-c75b17fe7c82
19+
kmodules.xyz/resource-metadata v0.29.1-0.20250513074243-0452de808ec1
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.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=
324+
kmodules.xyz/client-go v0.32.4-0.20250513070944-c75b17fe7c82 h1:WbDqyWzq50f+5Dman/wvUPpAPjXlnNwf24fsfmtFBMc=
325+
kmodules.xyz/client-go v0.32.4-0.20250513070944-c75b17fe7c82/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.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=
330+
kmodules.xyz/resource-metadata v0.29.1-0.20250513074243-0452de808ec1 h1:9q/s6ScTVdhpdstRnvfQQkqVB/kVO67RivOWOkIe7FU=
331+
kmodules.xyz/resource-metadata v0.29.1-0.20250513074243-0452de808ec1/go.mod h1:KEcdN2IPqp22IzgiaUYXuuSQYsKzDeINaZo/JggbJH0=
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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +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"
63+
res.Spec.Namespace.EnableResourceTrial = ns.Annotations[kmapi.AceEnableResourceTrialKey] == "true"
6464
if ns.Labels[kmapi.ClientOrgKey] == "true" {
6565
res.Spec.Namespace.AceOrgID = ns.Annotations[kmapi.AceOrgIDKey]
6666

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ const (
5959
ClusterProviderNameKey string = "cluster.appscode.com/provider"
6060
ClusterProfileLabel string = "cluster.appscode.com/profile"
6161

62-
AceOrgIDKey string = "ace.appscode.com/org-id"
63-
AceSkipBillingKey string = "ace.appscode.com/skip-billing"
64-
ClientOrgKey string = "ace.appscode.com/client-org"
65-
ClientOrgMonitoringKey string = "ace.appscode.com/client-org-monitoring"
66-
ClientKeyPrefix string = "client.ace.appscode.com/"
62+
AceOrgIDKey string = "ace.appscode.com/org-id"
63+
AceEnableResourceTrialKey string = "ace.appscode.com/enable-resource-trial"
64+
ClientOrgKey string = "ace.appscode.com/client-org"
65+
ClientOrgMonitoringKey string = "ace.appscode.com/client-org-monitoring"
66+
ClientKeyPrefix string = "client.ace.appscode.com/"
6767

6868
ClusterClaimKeyID string = "id.k8s.io"
6969
ClusterClaimKeyInfo string = "cluster.ace.info"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@ type NamespaceInfo struct {
8181
UID types.UID `json:"uid,omitempty"`
8282
Name string `json:"name"`
8383
// +optional
84-
CreationTimestamp metav1.Time `json:"creationTimestamp,omitempty"`
85-
AceOrgID string `json:"aceOrgID,omitempty"`
86-
AceOrgMetadata map[string]string `json:"aceOrgMetadata,omitempty"`
87-
SkipBilling bool `json:"skipBilling,omitempty"`
84+
CreationTimestamp metav1.Time `json:"creationTimestamp,omitempty"`
85+
AceOrgID string `json:"aceOrgID,omitempty"`
86+
AceOrgMetadata map[string]string `json:"aceOrgMetadata,omitempty"`
87+
EnableResourceTrial bool `json:"enableResourceTrial,omitempty"`
8888
}
8989

9090
type ComputeResource struct {

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

Lines changed: 1 addition & 1 deletion
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.4-0.20250513055843-e286d040e0e9
910+
# kmodules.xyz/client-go v0.32.4-0.20250513070944-c75b17fe7c82
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.1-0.20250513064340-22fab8d1b164
931+
# kmodules.xyz/resource-metadata v0.29.1-0.20250513074243-0452de808ec1
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)