Skip to content

Commit

Permalink
Merge pull request #945 from RedHatInsights/pgsql16
Browse files Browse the repository at this point in the history
RHCLOUD-31123: Add support for pgsql16 in local db provider
  • Loading branch information
psav authored Feb 28, 2024
2 parents a618416 + 351e3c5 commit afa5816
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion apis/cloud.redhat.com/v1alpha1/clowdapp_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ type InitContainer struct {
// DatabaseSpec is a struct defining a database to be exposed to a ClowdApp.
type DatabaseSpec struct {
// Defines the Version of the PostGreSQL database, defaults to 12.
// +kubebuilder:validation:Enum:=10;12;13;14;15
// +kubebuilder:validation:Enum:=10;12;13;14;15;16
Version *int32 `json:"version,omitempty"`

// Defines the Name of the database used by this app. This will be used as the
Expand Down
1 change: 1 addition & 0 deletions config/crd/bases/cloud.redhat.com_clowdapps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ spec:
- 13
- 14
- 15
- 16
format: int32
type: integer
type: object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ func GetDatabase(c *p.Provider) (p.ClowderProvider, error) {
func init() {
p.ProvidersRegistration.Register(GetDatabase, 5, ProvName)
imageList = map[int32]string{
16: provutils.DefaultImageDatabasePG16,
15: provutils.DefaultImageDatabasePG15,
14: provutils.DefaultImageDatabasePG14,
13: provutils.DefaultImageDatabasePG13,
Expand Down
1 change: 1 addition & 0 deletions controllers/cloud.redhat.com/providers/utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ var DefaultImageDatabasePG12 = "quay.io/cloudservices/postgresql-rds:12-2318dee"
var DefaultImageDatabasePG13 = "quay.io/cloudservices/postgresql-rds:13-2318dee"
var DefaultImageDatabasePG14 = "quay.io/cloudservices/postgresql-rds:14-2318dee"
var DefaultImageDatabasePG15 = "quay.io/cloudservices/postgresql-rds:15-2318dee"
var DefaultImageDatabasePG16 = "quay.io/cloudservices/postgresql-rds:16-f145533"

// MakeLocalDB populates the given deployment object with the local DB struct.
func MakeLocalDB(dd *apps.Deployment, nn types.NamespacedName, baseResource obj.ClowdObject, extraLabels *map[string]string, cfg *config.DatabaseConfig, image string, usePVC bool, dbName string, res *core.ResourceRequirements) {
Expand Down
1 change: 1 addition & 0 deletions deploy-mutate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ objects:
- 13
- 14
- 15
- 16
format: int32
type: integer
type: object
Expand Down
1 change: 1 addition & 0 deletions deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ objects:
- 13
- 14
- 15
- 16
format: int32
type: integer
type: object
Expand Down

0 comments on commit afa5816

Please sign in to comment.