Skip to content

Commit b037e81

Browse files
authored
Prepare for release v0.53.0 (#794)
ProductLine: KubeDB Release: v2025.3.24 Release-tracker: kubedb/CHANGELOG#111 Signed-off-by: 1gtm <1gtm@appscode.com>
1 parent 3085c9c commit b037e81

23 files changed

+4262
-3935
lines changed

go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ require (
2929
kmodules.xyz/client-go v0.32.1
3030
kmodules.xyz/custom-resources v0.32.0
3131
kmodules.xyz/monitoring-agent-api v0.32.0
32-
kubedb.dev/apimachinery v0.53.0-rc.1
33-
kubedb.dev/db-client-go v0.8.0-rc.1
34-
kubeops.dev/petset v0.0.9
32+
kubedb.dev/apimachinery v0.53.0
33+
kubedb.dev/db-client-go v0.8.0
34+
kubeops.dev/petset v0.0.10
3535
sigs.k8s.io/controller-runtime v0.20.3
3636
sigs.k8s.io/yaml v1.4.0
3737
stash.appscode.dev/apimachinery v0.39.0
@@ -138,7 +138,7 @@ require (
138138
k8s.io/apiextensions-apiserver v0.32.3 // indirect
139139
k8s.io/apiserver v0.32.3 // indirect
140140
k8s.io/kube-aggregator v0.32.3 // indirect
141-
k8s.io/kube-openapi v0.0.0-20250318172550-b98be4ee1595 // indirect
141+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
142142
k8s.io/metrics v0.32.3 // indirect
143143
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
144144
kmodules.xyz/apiversion v0.2.0 // indirect
@@ -147,8 +147,8 @@ require (
147147
kmodules.xyz/prober v0.32.0 // indirect
148148
kmodules.xyz/resource-metadata v0.26.1 // indirect
149149
kubeops.dev/csi-driver-cacerts v0.1.0 // indirect
150-
kubeops.dev/sidekick v0.0.10 // indirect
151-
kubestash.dev/apimachinery v0.17.0-rc.0 // indirect
150+
kubeops.dev/sidekick v0.0.11 // indirect
151+
kubestash.dev/apimachinery v0.17.0 // indirect
152152
sigs.k8s.io/gateway-api v1.1.0 // indirect
153153
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
154154
sigs.k8s.io/kustomize/api v0.18.0 // indirect

go.sum

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,8 @@ github.com/nxadm/tail v1.4.11/go.mod h1:OTaG3NK980DZzxbRq6lEuzgU+mug70nY11sMd4JX
304304
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
305305
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
306306
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
307-
github.com/onsi/ginkgo/v2 v2.22.1 h1:QW7tbJAUDyVDVOM5dFa7qaybo+CRfR7bemlQUN6Z8aM=
308-
github.com/onsi/ginkgo/v2 v2.22.1/go.mod h1:S6aTpoRsSq2cZOd+pssHAlKW/Q/jZt6cPrPlnj4a1xM=
307+
github.com/onsi/ginkgo/v2 v2.23.1 h1:Ox0cOPv/t8RzKJUfDo9ZKtRvBOJY369sFJnl00CjqwY=
308+
github.com/onsi/ginkgo/v2 v2.23.1/go.mod h1:zXTP6xIp3U8aVuXN8ENK9IXRaTjFnpVB9mGmaSRvxnM=
309309
github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8=
310310
github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY=
311311
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
@@ -573,8 +573,8 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY
573573
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
574574
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
575575
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
576-
golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE=
577-
golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588=
576+
golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY=
577+
golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY=
578578
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
579579
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
580580
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -676,8 +676,8 @@ k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
676676
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
677677
k8s.io/kube-aggregator v0.32.3 h1:j+lUE4V1sMANYv/wCdU2E8SgnSLJksaJ+6bNnoV6Pfs=
678678
k8s.io/kube-aggregator v0.32.3/go.mod h1:aAl5az9Rlq4sPPSf8/ckpDGSYit75g4g1dp6rKInXZM=
679-
k8s.io/kube-openapi v0.0.0-20250318172550-b98be4ee1595 h1:oj2YLpdiU3TRGr10fBjJ5Gny1rEFB9NC4KZh1lxpn+Y=
680-
k8s.io/kube-openapi v0.0.0-20250318172550-b98be4ee1595/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
679+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4=
680+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
681681
k8s.io/kubectl v0.29.0 h1:Oqi48gXjikDhrBF67AYuZRTcJV4lg2l42GmvsP7FmYI=
682682
k8s.io/kubectl v0.29.0/go.mod h1:0jMjGWIcMIQzmUaMgAzhSELv5WtHo2a8pq67DtviAJs=
683683
k8s.io/metrics v0.32.3 h1:2vsBvw0v8rIIlczZ/lZ8Kcqk9tR6Fks9h+dtFNbc2a4=
@@ -702,18 +702,18 @@ kmodules.xyz/prober v0.32.0 h1:8Z6pFRAu8kP0wwX2BooPCRy2SE6ZkUMHQmZDH5VUEGY=
702702
kmodules.xyz/prober v0.32.0/go.mod h1:h0fH4m9DaIwuNZq85zOlWUvBycyy4LvCPMUUhpS3iSE=
703703
kmodules.xyz/resource-metadata v0.26.1 h1:FKxvM8v5GkWWAnLHwnHGZNgewzNtKO7SDP+mRTA6M4g=
704704
kmodules.xyz/resource-metadata v0.26.1/go.mod h1:E4scoxcEgd7NGLU69IiS0Qh+KnwYQ/ckZtDyA8ydZKs=
705-
kubedb.dev/apimachinery v0.53.0-rc.1 h1:m6fah43nDPBEQhcc5XGs0UjHM5oBLgDwJ9hx8v2wBsU=
706-
kubedb.dev/apimachinery v0.53.0-rc.1/go.mod h1:RqpIP0aPGQKLGegTQcXFnN41QyXyp85plbqA27lLBkw=
707-
kubedb.dev/db-client-go v0.8.0-rc.1 h1:SgiiZqHLguS/TzNp3WcS//20hSVtdCZm12e6AY8uL1Q=
708-
kubedb.dev/db-client-go v0.8.0-rc.1/go.mod h1:xlBK8fwZ0/rDTT8GbH9iWesLapFEZtH5pbeSZyBrfSo=
705+
kubedb.dev/apimachinery v0.53.0 h1:uxgf/Kc27/A87/oZd+TjddAC2IS5C3ubZGiRBVqu0cc=
706+
kubedb.dev/apimachinery v0.53.0/go.mod h1:CSK+s+3FJcqJv7tx8R1VKDOUMa7bbruOQ9yk7U9dmMo=
707+
kubedb.dev/db-client-go v0.8.0 h1:/GuEqnxEH7hd6OEsNw6iL+c5lia9qMmjrMdqcmFLM2c=
708+
kubedb.dev/db-client-go v0.8.0/go.mod h1:AdVl0R1pxvHRAjuAICh9MpAbQTVLIs6v0FrzJhl1iR0=
709709
kubeops.dev/csi-driver-cacerts v0.1.0 h1:WDgKNo5QAiMoVy4c/4ARWeCXJbqdcXdcn8VLImV4VZU=
710710
kubeops.dev/csi-driver-cacerts v0.1.0/go.mod h1:5a/ZOn5LFw26PPBpTKvsivBjcvVArOrJX24C+k+przk=
711-
kubeops.dev/petset v0.0.9 h1:8+wH2rHtaAUJ+g+fgQ/KcUT4iFIm6LHvKuaq53Fg63A=
712-
kubeops.dev/petset v0.0.9/go.mod h1:RyuWbc1juV1i3/GRnCpemVd3cf6YEFSenhh0to4D2a4=
713-
kubeops.dev/sidekick v0.0.10 h1:/lOT+yV920F6TTPLc7bKR9HLAG/Yx+sTRm1C7rUz744=
714-
kubeops.dev/sidekick v0.0.10/go.mod h1:VRyiiKGiJikv/8dNCkrXfkwZCv/2HoIhkmtNurs0gcM=
715-
kubestash.dev/apimachinery v0.17.0-rc.0 h1:W45jbhVIc8/LTE1Zh8ixtr7Ayan1tePmoyAsouU6eTk=
716-
kubestash.dev/apimachinery v0.17.0-rc.0/go.mod h1:oggAzrdIEm+S0A0c3mLpcIXtn0x08jzlOgVn4sUFJco=
711+
kubeops.dev/petset v0.0.10 h1:sNaqmHrD9bW7pcrWnwPoiQrKvdRwRX0BaRQc5QA78Bg=
712+
kubeops.dev/petset v0.0.10/go.mod h1:uHL83kggwmtSxdlIfxNbY2isV22iYV6YjADv0y+Z7YA=
713+
kubeops.dev/sidekick v0.0.11 h1:OydXdIH6cYSiWxKIWvrywk95WhhHSERkc7RNPOmTekc=
714+
kubeops.dev/sidekick v0.0.11/go.mod h1:90KMNmJOPoMKHbrdC1cpEsMx+1KjTea/lHDAbGRDzHc=
715+
kubestash.dev/apimachinery v0.17.0 h1:ON7yCYUYVpM6o4M4GcYENJ1GVCWzi9BWblPx2VVw7bw=
716+
kubestash.dev/apimachinery v0.17.0/go.mod h1:DJA9+lXsdUaXNryb6P+XIaEtUHR18gMA5wqly0Y4/fE=
717717
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
718718
sigs.k8s.io/gateway-api v1.1.0 h1:DsLDXCi6jR+Xz8/xd0Z1PYl2Pn0TyaFMOPPZIj4inDM=
719719
sigs.k8s.io/gateway-api v1.1.0/go.mod h1:ZH4lHrL2sDi0FHZ9jjneb8kKnGzFWyrTya35sWUTrRs=

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ type FerretDBVersionSpec struct {
5151
// Database Image
5252
DB FerretDBVersionDatabase `json:"db"`
5353

54+
// Postgres version
55+
Postgres FerretDBVersionPostgres `json:"postgres"`
56+
5457
// Deprecated versions usable but regarded as obsolete and best avoided, typically due to having been superseded.
5558
// +optional
5659
Deprecated bool `json:"deprecated,omitempty"`
@@ -72,6 +75,11 @@ type FerretDBVersionDatabase struct {
7275
Image string `json:"image"`
7376
}
7477

78+
type FerretDBVersionPostgres struct {
79+
// Which versions pg will be used as backend of ferretdb. default 13.13 when backend internally managed
80+
Version string `json:"version"`
81+
}
82+
7583
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
7684

7785
// FerretDBVersionList contains a list of FerretDBVersion

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

Lines changed: 31 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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,13 @@ type PostgresSecurityContext struct {
142142
RunAsAnyNonRoot bool `json:"runAsAnyNonRoot,omitempty"`
143143
}
144144

145-
// +kubebuilder:validation:Enum=Official;TimescaleDB;PostGIS;KubeDB;PostgreSQL
145+
// +kubebuilder:validation:Enum=Official;TimescaleDB;PostGIS;KubeDB;DocumentDB;PostgreSQL
146146
type PostgresDistro string
147147

148148
const (
149149
PostgresDistroOfficial PostgresDistro = "Official"
150150
PostgresDistroTimescaleDB PostgresDistro = "TimescaleDB"
151151
PostgresDistroPostGIS PostgresDistro = "PostGIS"
152152
PostgresDistroKubeDB PostgresDistro = "KubeDB"
153+
PostgresDistroDocumentDB PostgresDistro = "DocumentDB"
153154
)

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

Lines changed: 17 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/kubedb/constants.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -983,6 +983,8 @@ const (
983983
SolrTempConfigDir = "/temp-config"
984984
SolrCustomConfigDir = "/custom-config"
985985
SolrSecurityConfigDir = "/var/security"
986+
SolrZkReadyCondition = "SolrZkReady"
987+
SolrZkReady = "ZookeeperReady"
986988

987989
SolrCloudHostKey = "host"
988990
SolrCloudHostValue = ""
@@ -1443,6 +1445,7 @@ const (
14431445
FerretDBContainerName = "ferretdb"
14441446
FerretDBMainImage = "ghcr.io/ferretdb/ferretdb"
14451447
FerretDBUser = "postgres"
1448+
FerretDBLinkedDBName = "ferretdb"
14461449

14471450
FerretDBServerPath = "/etc/certs/server"
14481451

vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/ferretdb_helpers.go

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -255,14 +255,6 @@ func (f *FerretDB) SetDefaults(kc client.Client) {
255255
f.setDefaultPodTemplateValues(f.Spec.Server.Secondary.PodTemplate, &frVersion)
256256
}
257257

258-
if f.Spec.Backend.LinkedDB == "" {
259-
if f.Spec.Backend.ExternallyManaged {
260-
f.Spec.Backend.LinkedDB = "postgres"
261-
} else {
262-
f.Spec.Backend.LinkedDB = "ferretdb"
263-
}
264-
}
265-
266258
if f.Spec.AuthSecret == nil {
267259
f.Spec.AuthSecret = &SecretReference{
268260
ExternallyManaged: false,
@@ -278,19 +270,6 @@ func (f *FerretDB) SetDefaults(kc client.Client) {
278270
f.Spec.Monitor.Prometheus.Exporter.SecurityContext.RunAsGroup = frVersion.Spec.SecurityContext.RunAsUser
279271
}
280272
}
281-
defaultVersion := "16.4-bookworm"
282-
if f.IsLaterVersion(&frVersion, 2) {
283-
defaultVersion = "16.7-doc"
284-
}
285-
if !f.Spec.Backend.ExternallyManaged {
286-
if f.Spec.Backend.Version == nil {
287-
f.Spec.Backend.Version = &defaultVersion
288-
}
289-
}
290-
291-
if f.Spec.Backend.PostgresRef != nil && f.Spec.Backend.PostgresRef.Name != "" && f.Spec.Backend.PostgresRef.Namespace == "" {
292-
f.Spec.Backend.PostgresRef.Namespace = f.Namespace
293-
}
294273

295274
f.SetTLSDefaults()
296275
f.SetHealthCheckerDefaults()
@@ -314,7 +293,7 @@ func (f *FerretDB) setDefaultPodTemplateValues(podTemplate *ofst.PodTemplateSpec
314293
f.setDefaultPodTemplateSecurityContext(frVersion, podTemplate)
315294
}
316295

317-
func (f *FerretDB) IsLaterVersion(frVersion *catalog.FerretDBVersion, version uint64) bool {
296+
func (f *FerretDB) IsVersionAtLeast(frVersion *catalog.FerretDBVersion, version uint64) bool {
318297
v, _ := semver.NewVersion(frVersion.Spec.Version)
319298
return v.Major() >= version
320299
}

vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/ferretdb_types.go

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,6 @@ type FerretDBSpec struct {
9898
// Monitor is used monitor database instance and KubeDB Backend
9999
// +optional
100100
Monitor *mona.AgentSpec `json:"monitor,omitempty"`
101-
102-
Backend *FerretDBBackend `json:"backend"`
103101
}
104102

105103
type FerretDBStatus struct {
@@ -115,19 +113,6 @@ type FerretDBStatus struct {
115113
Conditions []kmapi.Condition `json:"conditions,omitempty"`
116114
}
117115

118-
type FerretDBBackend struct {
119-
// PostgresRef refers to the AppBinding of the backend Postgres server
120-
// +optional
121-
PostgresRef *kmapi.ObjectReference `json:"postgresRef,omitempty"`
122-
// Which versions pg will be used as backend of ferretdb. default 13.13 when backend internally managed
123-
// +optional
124-
Version *string `json:"version,omitempty"`
125-
// A DB inside backend specifically made for ferretdb
126-
// +optional
127-
LinkedDB string `json:"linkedDB,omitempty"`
128-
ExternallyManaged bool `json:"externallyManaged"`
129-
}
130-
131116
type FerretDBServer struct {
132117
Primary *FerretDBServerSpec `json:"primary,omitempty"`
133118
Secondary *FerretDBServerSpec `json:"secondary,omitempty"`

0 commit comments

Comments
 (0)