Skip to content

Commit 9c38262

Browse files
author
CloudNativePG Automated Updates
committed
chore: sync API
1 parent 3020b41 commit 9c38262

13 files changed

Lines changed: 41 additions & 59 deletions

‎go.mod‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
module github.com/cloudnative-pg/api
22

3-
go 1.25.0
3+
go 1.26.0
44

55
toolchain go1.26.2
66

77
require (
88
github.com/cloudnative-pg/barman-cloud v0.5.0
99
github.com/cloudnative-pg/machinery v0.4.0
1010
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.87.1
11-
k8s.io/api v0.35.4
12-
k8s.io/apimachinery v0.35.4
13-
sigs.k8s.io/controller-runtime v0.23.3
11+
k8s.io/api v0.36.0
12+
k8s.io/apimachinery v0.36.0
1413
)
1514

1615
require (
@@ -25,9 +24,9 @@ require (
2524
golang.org/x/text v0.33.0 // indirect
2625
gopkg.in/inf.v0 v0.9.1 // indirect
2726
k8s.io/klog/v2 v2.140.0 // indirect
28-
k8s.io/kube-openapi v0.0.0-20251125145642-4e65d59e963e // indirect
27+
k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a // indirect
2928
k8s.io/utils v0.0.0-20260319190234-28399d86e0b5 // indirect
3029
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
3130
sigs.k8s.io/randfill v1.0.0 // indirect
32-
sigs.k8s.io/structured-merge-diff/v6 v6.3.2-0.20260122202528-d9cc6641c482 // indirect
31+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2 // indirect
3332
)

‎go.sum‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ github.com/onsi/ginkgo/v2 v2.28.1 h1:S4hj+HbZp40fNKuLUQOYLDgZLwNUVn19N3Atb98NCyI
3535
github.com/onsi/ginkgo/v2 v2.28.1/go.mod h1:CLtbVInNckU3/+gC8LzkGUb9oF+e8W8TdUsxPwvdOgE=
3636
github.com/onsi/gomega v1.39.1 h1:1IJLAad4zjPn2PsnhH70V4DKRFlrCzGBNrNaru+Vf28=
3737
github.com/onsi/gomega v1.39.1/go.mod h1:hL6yVALoTOxeWudERyfppUcZXjMwIMLnuSfruD2lcfg=
38-
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
3938
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
39+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
40+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
4041
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.87.1 h1:wyKanf+IFdbIqbDNYGt+f1dabLErLWtBaxd0KaAx4aM=
4142
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.87.1/go.mod h1:WHiLZmOWVop/MoYvRD58LfnPeyE+dcITby/jQjg83Hw=
4243
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
@@ -72,23 +73,21 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
7273
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
7374
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
7475
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
75-
k8s.io/api v0.35.4 h1:P7nFYKl5vo9AGUp1Z+Pmd3p2tA7bX2wbFWCvDeRv988=
76-
k8s.io/api v0.35.4/go.mod h1:yl4lqySWOgYJJf9RERXKUwE9g2y+CkuwG+xmcOK8wXU=
77-
k8s.io/apimachinery v0.35.4 h1:xtdom9RG7e+yDp71uoXoJDWEE2eOiHgeO4GdBzwWpds=
78-
k8s.io/apimachinery v0.35.4/go.mod h1:NNi1taPOpep0jOj+oRha3mBJPqvi0hGdaV8TCqGQ+cc=
76+
k8s.io/api v0.36.0 h1:SgqDhZzHdOtMk40xVSvCXkP9ME0H05hPM3p9AB1kL80=
77+
k8s.io/api v0.36.0/go.mod h1:m1LVrGPNYax5NBHdO+QuAedXyuzTt4RryI/qnmNvs34=
78+
k8s.io/apimachinery v0.36.0 h1:jZyPzhd5Z+3h9vJLt0z9XdzW9VzNzWAUw+P1xZ9PXtQ=
79+
k8s.io/apimachinery v0.36.0/go.mod h1:FklypaRJt6n5wUIwWXIP6GJlIpUizTgfo1T/As+Tyxc=
7980
k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=
8081
k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0=
81-
k8s.io/kube-openapi v0.0.0-20251125145642-4e65d59e963e h1:iW9ChlU0cU16w8MpVYjXk12dqQ4BPFBEgif+ap7/hqQ=
82-
k8s.io/kube-openapi v0.0.0-20251125145642-4e65d59e963e/go.mod h1:kdmbQkyfwUagLfXIad1y2TdrjPFWp2Q89B3qkRwf/pQ=
82+
k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a h1:xCeOEAOoGYl2jnJoHkC3hkbPJgdATINPMAxaynU2Ovg=
83+
k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a/go.mod h1:uGBT7iTA6c6MvqUvSXIaYZo9ukscABYi2btjhvgKGZ0=
8384
k8s.io/utils v0.0.0-20260319190234-28399d86e0b5 h1:kBawHLSnx/mYHmRnNUf9d4CpjREbeZuxoSGOX/J+aYM=
8485
k8s.io/utils v0.0.0-20260319190234-28399d86e0b5/go.mod h1:xDxuJ0whA3d0I4mf/C4ppKHxXynQ+fxnkmQH0vTHnuk=
85-
sigs.k8s.io/controller-runtime v0.23.3 h1:VjB/vhoPoA9l1kEKZHBMnQF33tdCLQKJtydy4iqwZ80=
86-
sigs.k8s.io/controller-runtime v0.23.3/go.mod h1:B6COOxKptp+YaUT5q4l6LqUJTRpizbgf9KSRNdQGns0=
8786
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=
8887
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
8988
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
9089
sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
91-
sigs.k8s.io/structured-merge-diff/v6 v6.3.2-0.20260122202528-d9cc6641c482 h1:2WOzJpHUBVrrkDjU4KBT8n5LDcj824eX0I5UKcgeRUs=
92-
sigs.k8s.io/structured-merge-diff/v6 v6.3.2-0.20260122202528-d9cc6641c482/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
90+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2 h1:kwVWMx5yS1CrnFWA/2QHyRVJ8jM6dBA80uLmm0wJkk8=
91+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
9392
sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
9493
sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=

‎pkg/api/v1/backup_types.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,3 @@ type BackupList struct {
364364
// List of backups
365365
Items []Backup `json:"items"`
366366
}
367-
368-
func init() {
369-
SchemeBuilder.Register(&Backup{}, &BackupList{})
370-
}

‎pkg/api/v1/cluster_types.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2733,7 +2733,3 @@ type ConfigMapResourceVersion struct {
27332733
// +optional
27342734
Metrics map[string]string `json:"metrics,omitempty"`
27352735
}
2736-
2737-
func init() {
2738-
SchemeBuilder.Register(&Cluster{}, &ClusterList{})
2739-
}

‎pkg/api/v1/clusterimagecatalog_types.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,3 @@ type ClusterImageCatalogList struct {
4848
// List of ClusterImageCatalogs
4949
Items []ClusterImageCatalog `json:"items"`
5050
}
51-
52-
func init() {
53-
SchemeBuilder.Register(&ClusterImageCatalog{}, &ClusterImageCatalogList{})
54-
}

‎pkg/api/v1/database_types.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,3 @@ type DatabaseList struct {
402402
metav1.ListMeta `json:"metadata,omitempty"`
403403
Items []Database `json:"items"`
404404
}
405-
406-
func init() {
407-
SchemeBuilder.Register(&Database{}, &DatabaseList{})
408-
}

‎pkg/api/v1/failoverquorum_types.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,3 @@ type FailoverQuorumStatus struct {
7777
// +optional
7878
Primary string `json:"primary,omitempty"`
7979
}
80-
81-
func init() {
82-
SchemeBuilder.Register(&FailoverQuorum{}, &FailoverQuorumList{})
83-
}

‎pkg/api/v1/groupversion_info.go‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ SPDX-License-Identifier: Apache-2.0
2020
package v1
2121

2222
import (
23+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
24+
"k8s.io/apimachinery/pkg/runtime"
2325
"k8s.io/apimachinery/pkg/runtime/schema"
24-
"sigs.k8s.io/controller-runtime/pkg/scheme"
2526
)
2627

2728
const (
@@ -55,8 +56,31 @@ var (
5556
SchemeGroupVersion = schema.GroupVersion{Group: "postgresql.cnpg.io", Version: "v1"}
5657

5758
// SchemeBuilder is used to add go types to the GroupVersionKind scheme
58-
SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
59+
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
5960

6061
// AddToScheme adds the types in this group-version to the given scheme.
6162
AddToScheme = SchemeBuilder.AddToScheme
6263
)
64+
65+
func addKnownTypes(scheme *runtime.Scheme) error {
66+
scheme.AddKnownTypes(SchemeGroupVersion,
67+
// Main types
68+
&Backup{}, &BackupList{},
69+
&Cluster{}, &ClusterList{},
70+
71+
// Helper types
72+
&ClusterImageCatalog{}, &ClusterImageCatalogList{},
73+
&Database{}, &DatabaseList{},
74+
&FailoverQuorum{}, &FailoverQuorumList{},
75+
&ImageCatalog{}, &ImageCatalogList{},
76+
77+
// Util types
78+
&Pooler{}, &PoolerList{},
79+
&Publication{}, &PublicationList{},
80+
&ScheduledBackup{}, &ScheduledBackupList{},
81+
&Subscription{}, &SubscriptionList{},
82+
)
83+
84+
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
85+
return nil
86+
}

‎pkg/api/v1/imagecatalog_types.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,3 @@ type ImageCatalogList struct {
7171
// List of ImageCatalogs
7272
Items []ImageCatalog `json:"items"`
7373
}
74-
75-
func init() {
76-
SchemeBuilder.Register(&ImageCatalog{}, &ImageCatalogList{})
77-
}

‎pkg/api/v1/pooler_types.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,3 @@ type PoolerList struct {
336336
metav1.ListMeta `json:"metadata,omitempty"`
337337
Items []Pooler `json:"items"`
338338
}
339-
340-
func init() {
341-
SchemeBuilder.Register(&Pooler{}, &PoolerList{})
342-
}

0 commit comments

Comments
 (0)