Skip to content

Commit 7deb14c

Browse files
authored
Prepare for release v0.7.0-rc.0 (#161)
ProductLine: KubeDB Release: v2025.2.6-rc.0 Release-tracker: kubedb/CHANGELOG#106 Signed-off-by: 1gtm <1gtm@appscode.com>
1 parent 4790577 commit 7deb14c

39 files changed

+4376
-298
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ require (
3232
k8s.io/klog/v2 v2.130.1
3333
kmodules.xyz/client-go v0.30.44
3434
kmodules.xyz/custom-resources v0.30.0
35-
kubedb.dev/apimachinery v0.51.1-0.20250127085441-7f9ee3e6b9a6
35+
kubedb.dev/apimachinery v0.52.0-rc.0
3636
sigs.k8s.io/controller-runtime v0.18.4
3737
xorm.io/xorm v1.3.6
3838
)
@@ -128,7 +128,7 @@ require (
128128
golang.org/x/sys v0.28.0 // indirect
129129
golang.org/x/term v0.27.0 // indirect
130130
golang.org/x/text v0.21.0 // indirect
131-
golang.org/x/time v0.5.0 // indirect
131+
golang.org/x/time v0.6.0 // indirect
132132
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
133133
gomodules.xyz/mergo v0.3.13 // indirect
134134
gomodules.xyz/pointer v0.1.0 // indirect

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -577,8 +577,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
577577
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
578578
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
579579
golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
580-
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
581-
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
580+
golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
581+
golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
582582
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
583583
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
584584
golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
@@ -663,8 +663,8 @@ kmodules.xyz/monitoring-agent-api v0.30.2 h1:sAgz5P5EXZqhlj1NzJ+QltAgeIx5bGSMj+a
663663
kmodules.xyz/monitoring-agent-api v0.30.2/go.mod h1:BoZFPDDRB7J39CcUsSDlzgW8PQCwik4ILPleyUob+Mg=
664664
kmodules.xyz/offshoot-api v0.30.1 h1:TrulAYO+oBsXe9sZZGTmNWIuI8qD2izMpgcTSPvgAmI=
665665
kmodules.xyz/offshoot-api v0.30.1/go.mod h1:T3mpjR6fui0QzOcmQvIuANytW48fe9ytmy/1cgx6D4g=
666-
kubedb.dev/apimachinery v0.51.1-0.20250127085441-7f9ee3e6b9a6 h1:E03N1SRs3wWppLqHHrfMB1hzNdsgTBI5UwCzMxfWOHI=
667-
kubedb.dev/apimachinery v0.51.1-0.20250127085441-7f9ee3e6b9a6/go.mod h1:pbuXlEZM70Uw1SnSGH7bbzcAiwEYq4NX0CRG8ugODNY=
666+
kubedb.dev/apimachinery v0.52.0-rc.0 h1:9DUShkQGjSINbxgj9/mC2/r6GtFZmJuBOc6RrxzCgB8=
667+
kubedb.dev/apimachinery v0.52.0-rc.0/go.mod h1:5v0QfKvvx9/LasI3561/gIzz9Y9gwmvN3Xm94jdzfMI=
668668
kubeops.dev/petset v0.0.7 h1:F77BTRfUqRVO7kNc8q2oFSSviDmYBqni/osXqu0kgJ4=
669669
kubeops.dev/petset v0.0.7/go.mod h1:lt0SZV4ohRy7RiwLNUnMoauG4lCbcRbSqhMg20rdUQg=
670670
kubeops.dev/sidekick v0.0.10 h1:/lOT+yV920F6TTPLc7bKR9HLAG/Yx+sTRm1C7rUz744=

vendor/golang.org/x/time/LICENSE

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

vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/mariadb_version_types.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ type MariaDBVersionSpec struct {
5454
Version string `json:"version"`
5555
// Database Image
5656
DB MariaDBVersionDatabase `json:"db"`
57+
// Maxscale Image
58+
// +optional
59+
Maxscale MariaDBVersionMaxscale `json:"maxscale"`
5760
// Exporter Image
5861
Exporter MariaDBVersionExporter `json:"exporter"`
5962
// Coordinator Image
@@ -87,6 +90,14 @@ type MariaDBVersionDatabase struct {
8790
Image string `json:"image"`
8891
}
8992

93+
// MariaDBVersionMaxscale is the mariadb maxscale image
94+
type MariaDBVersionMaxscale struct {
95+
Image string `json:"image"`
96+
// SecurityContext is for the additional config for the maxscale container
97+
// +optional
98+
SecurityContext SecurityContext `json:"securityContext"`
99+
}
100+
90101
// MariaDBVersionExporter is the image for the MariaDB exporter
91102
type MariaDBVersionExporter struct {
92103
Image string `json:"image"`

vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/openapi_generated.go

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

vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/postgres_version_types.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ type PostgresVersionSpec struct {
7474
// SecurityContext is for the additional config for postgres DB container
7575
// +optional
7676
SecurityContext PostgresSecurityContext `json:"securityContext"`
77+
// PostgresVersionTLSSpec is used to set postgres version specific tls settings
78+
// +optional
79+
TLS *PostgresVersionTLSSpec `json:"tls,omitempty"`
7780
// update constraints
7881
UpdateConstraints UpdateConstraints `json:"updateConstraints,omitempty"`
7982
// +optional
@@ -110,6 +113,13 @@ type PostgresVersionPodSecurityPolicy struct {
110113
DatabasePolicyName string `json:"databasePolicyName"`
111114
}
112115

116+
// PostgresVersionTLSSpec is used to set postgres version specific tls settings
117+
type PostgresVersionTLSSpec struct {
118+
// DisableSSLSessionResumption determines whether to disable or enable Envoy Session Resumption
119+
// +optional
120+
DisableSSLSessionResumption bool `json:"disableSSLSessionResumption,omitempty"`
121+
}
122+
113123
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
114124

115125
// PostgresVersionList is a list of PostgresVersions

vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/zz_generated.deepcopy.go

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

vendor/kubedb.dev/apimachinery/apis/helpers.go

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ func SetDefaultResourceLimits(req *core.ResourceRequirements, defaultResources c
4343
// - return limit
4444
// else
4545
// - return default
46+
4647
calLimit := func(name core.ResourceName, defaultValue resource.Quantity) resource.Quantity {
4748
if r, ok := req.Requests[name]; ok {
48-
// l is greater than r == 1.
49-
if l, exist := req.Limits[name]; exist && l.Cmp(r) == 1 {
49+
if l, exist := req.Limits[name]; exist && l.Cmp(r) > 0 {
5050
return l
5151
}
5252
return r
@@ -56,6 +56,7 @@ func SetDefaultResourceLimits(req *core.ResourceRequirements, defaultResources c
5656
}
5757
return defaultValue
5858
}
59+
5960
// if request is not set,
6061
// - if limit exists:
6162
// - copy limit
@@ -64,15 +65,15 @@ func SetDefaultResourceLimits(req *core.ResourceRequirements, defaultResources c
6465
// else
6566
// - return request
6667
// endif
67-
calRequest := func(name core.ResourceName, defaultValue resource.Quantity) resource.Quantity {
68-
if r, ok := req.Requests[name]; !ok {
69-
if l, exist := req.Limits[name]; exist {
70-
return l
71-
}
72-
return defaultValue
73-
} else {
68+
calRequest := func(name core.ResourceName, defaultValue resource.Quantity, originalLimit resource.Quantity) resource.Quantity {
69+
if r, ok := req.Requests[name]; ok {
7470
return r
7571
}
72+
if originalLimit.Value() > 0 {
73+
// If original Limits existed, use them for Requests
74+
return originalLimit
75+
}
76+
return defaultValue
7677
}
7778

7879
if req.Limits == nil {
@@ -82,13 +83,19 @@ func SetDefaultResourceLimits(req *core.ResourceRequirements, defaultResources c
8283
req.Requests = core.ResourceList{}
8384
}
8485

85-
// Calculate the limits first
86+
// Store the original Limits to differentiate between newly set and existing values
87+
originalLimits := make(map[core.ResourceName]resource.Quantity)
88+
for l := range req.Limits {
89+
originalLimits[l] = req.Limits[l]
90+
}
91+
92+
// Calculate limits first
8693
for l := range defaultResources.Limits {
8794
req.Limits[l] = calLimit(l, defaultResources.Limits[l])
8895
}
8996

90-
// Once the limit is calculated, Calculate requests
97+
// Calculate requests after limits
9198
for r := range defaultResources.Requests {
92-
req.Requests[r] = calRequest(r, defaultResources.Requests[r])
99+
req.Requests[r] = calRequest(r, defaultResources.Requests[r], originalLimits[r])
93100
}
94101
}

0 commit comments

Comments
 (0)