Skip to content

Commit

Permalink
api-machinery to master
Browse files Browse the repository at this point in the history
Signed-off-by: Hiranmoy Das Chowdhury <[email protected]>
  • Loading branch information
HiranmoyChowdhury committed May 27, 2024
1 parent 5eaf333 commit 0238342
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 10 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ require (
k8s.io/klog/v2 v2.120.1
kmodules.xyz/client-go v0.29.14
kmodules.xyz/custom-resources v0.29.1
kubedb.dev/apimachinery v0.45.2-0.20240515112316-c4861416c70e
kubedb.dev/apimachinery v0.45.2-0.20240527101929-0744dd0c9b62
sigs.k8s.io/controller-runtime v0.17.4
xorm.io/xorm v1.3.6
)
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -609,8 +609,8 @@ kmodules.xyz/monitoring-agent-api v0.29.0 h1:gpFl6OZrlMLb/ySMHdREI9EwGtnJ91oZBn9
kmodules.xyz/monitoring-agent-api v0.29.0/go.mod h1:iNbvaMTgVFOI5q2LJtGK91j4Dmjv4ZRiRdasGmWLKQI=
kmodules.xyz/offshoot-api v0.29.2 h1:akXmvkNqFz1n9p1STVs9iP7ODYET0S7BhcYCMXEjK4A=
kmodules.xyz/offshoot-api v0.29.2/go.mod h1:Wv7Xo8wbvznI+8bhaylRFHFjkt30xRDOUOnqV8kOAxM=
kubedb.dev/apimachinery v0.45.2-0.20240515112316-c4861416c70e h1:EfMR1D5mdhI7gL8AaIbMp8JXQsBy95tw/p0VKBUQJR8=
kubedb.dev/apimachinery v0.45.2-0.20240515112316-c4861416c70e/go.mod h1:n/8V16s0dvnNeeY0KuveptY5zDP0MWhPg8b+TsPKUwc=
kubedb.dev/apimachinery v0.45.2-0.20240527101929-0744dd0c9b62 h1:l5sRrQe/+7az4t5eSHRFKryrznJvcbQcAuh48rmPCC8=
kubedb.dev/apimachinery v0.45.2-0.20240527101929-0744dd0c9b62/go.mod h1:LBoGqbBHFeIRLv1KtkkmVxjK/g9CmQETVpwszFp9Ly0=
kubeops.dev/petset v0.0.5 h1:VVXi39JhjondlbHyZ98z0MLp6VCmiCMinL59K48Y2zA=
kubeops.dev/petset v0.0.5/go.mod h1:ijtKT1HlAht2vBEZj5LW7C00XEs3B0d1VdCQgd5V4cA=
lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,11 @@ func (f *FerretDB) ValidateCreateOrUpdate() field.ErrorList {
} else {
if f.Spec.Backend.Postgres.URL == nil {
err := f.validateServiceRef(f.Spec.Backend.Postgres.Service)
allErr = append(allErr, field.Invalid(field.NewPath("spec").Child("backend"),
f.Name,
err.Error()))
if err != nil {
allErr = append(allErr, field.Invalid(field.NewPath("spec").Child("backend"),
f.Name,
err.Error()))
}
}
}
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ type PgBouncerSpec struct {
PodTemplate ofst.PodTemplateSpec `json:"podTemplate,omitempty"`

// Database to proxy by connection pooling.
// +optional
Database Database `json:"database,omitempty"`

// ConnectionPoolConfig defines Connection pool configuration.
Expand Down
2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1467,7 +1467,7 @@ kmodules.xyz/monitoring-agent-api/api/v1
## explicit; go 1.22.0
kmodules.xyz/offshoot-api/api/v1
kmodules.xyz/offshoot-api/api/v2
# kubedb.dev/apimachinery v0.45.2-0.20240515112316-c4861416c70e
# kubedb.dev/apimachinery v0.45.2-0.20240527101929-0744dd0c9b62
## explicit; go 1.22.0
kubedb.dev/apimachinery/apis
kubedb.dev/apimachinery/apis/catalog
Expand Down

0 comments on commit 0238342

Please sign in to comment.