Skip to content

Commit 490938f

Browse files
authored
chore: update to Kubernetes 0.36.0 (cloudnative-pg#10593)
Bump k8s.io/* to v0.36.0. That version preserves API compatibility, which keeps the migration small (kubernetes/kubernetes#137298). controller-runtime v0.24.0 deprecated its SchemeBuilder in favor of the apimachinery one (kubernetes-sigs/controller-runtime#3461), so api/v1 is migrated accordingly. The Go directive moves to 1.26.0 because controller-runtime v0.24.0 requires it. The k8s.io/streaming migration is test-only. The regenerated Pooler CRD picks up the upstream PodSpec rename workloadRef -> schedulingGroup; both shapes are alpha and have no user-visible impact. Closes cloudnative-pg#10592 Signed-off-by: Jonathan Gonzalez V. <jonathan.gonzalez@enterprisedb.com>
1 parent 6a3a85b commit 490938f

17 files changed

Lines changed: 122 additions & 142 deletions

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-
}

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-
}

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-
}

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-
}

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-
}

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+
}

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-
}

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-
}

api/v1/publication_types.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,3 @@ type PublicationList struct {
159159
metav1.ListMeta `json:"metadata,omitempty"`
160160
Items []Publication `json:"items"`
161161
}
162-
163-
func init() {
164-
SchemeBuilder.Register(&Publication{}, &PublicationList{})
165-
}

api/v1/scheduledbackup_types.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,3 @@ type ScheduledBackupList struct {
133133
// List of clusters
134134
Items []ScheduledBackup `json:"items"`
135135
}
136-
137-
func init() {
138-
SchemeBuilder.Register(&ScheduledBackup{}, &ScheduledBackupList{})
139-
}

0 commit comments

Comments
 (0)