Skip to content

DEVOPS-32521 - add support for AutoMinorVersionUpgrade flag in db-con… #417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

DEVOPS-32521 - add support for AutoMinorVersionUpgrade flag in db-con… #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e78c88c
DEVOPS-32521 - add support for AutoMinorVersionUpgrade flag in db-con…
LenaRyazanov Apr 9, 2025
576001b
DEVOPS-32521 - fix typo
LenaRyazanov Apr 11, 2025
8df5c18
DEVOPS-32521 - add AutoMinorVersionUpgrade to updateDBClousterAWS fun…
LenaRyazanov Apr 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions api/v1/databaseclaim_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,11 @@ type DatabaseClaimSpec struct {
// +kubebuilder:default:=dsn.txt
DSNName string `json:"dsnName"`

// AutoMinorVersionUpgrade enables automatic minor version upgrades.
// +optional
// +kubebuilder:default=true
AutoMinorVersionUpgrade *bool `json:"autoMinorVersionUpgrade,omitempty"`

// The optional Shape values are arbitrary and help drive instance selection
// +optional
Shape string `json:"shape"`
Expand Down
5 changes: 5 additions & 0 deletions api/v1/zz_generated.deepcopy.go
View file
Open in desktop

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

5 changes: 5 additions & 0 deletions config/crd/bases/persistance.atlas.infoblox.com_databaseclaims.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@ spec:
description: Specifies an indentifier for the application using the
database.
type: string
autoMinorVersionUpgrade:
default: true
description: AutoMinorVersionUpgrade enables automatic minor version
upgrades.
type: boolean
backupPolicy:
description: BackupPolicy specifies the duration at which db backups
are taken
Expand Down
6 changes: 6 additions & 0 deletions pkg/databaseclaim/awsprovider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package databaseclaim
import (
"context"
"fmt"

crossplaneaws "github.com/crossplane-contrib/provider-aws/apis/rds/v1alpha1"
xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
"github.com/go-logr/logr"
Expand Down Expand Up @@ -146,6 +147,7 @@ func (r *DatabaseClaimReconciler) manageDBClusterAWS(ctx context.Context, dbHost
EnableCloudwatchLogsExports: reqInfo.EnableCloudwatchLogsExport,
IOPS: nil,
PreferredMaintenanceWindow: dbClaim.Spec.PreferredMaintenanceWindow,
AutoMinorVersionUpgrade: dbClaim.Spec.AutoMinorVersionUpgrade,
},
ResourceSpec: xpv1.ResourceSpec{
WriteConnectionSecretToReference: &dbSecretCluster,
Expand Down Expand Up @@ -292,6 +294,7 @@ func (r *DatabaseClaimReconciler) managePostgresDBInstanceAWS(ctx context.Contex
StorageType: &params.StorageType,
Port: &params.Port,
PreferredMaintenanceWindow: dbClaim.Spec.PreferredMaintenanceWindow,
AutoMinorVersionUpgrade: dbClaim.Spec.AutoMinorVersionUpgrade,
},
ResourceSpec: xpv1.ResourceSpec{
WriteConnectionSecretToReference: &dbSecretInstance,
Expand Down Expand Up @@ -354,6 +357,7 @@ func (r *DatabaseClaimReconciler) updateDBClusterAWS(ctx context.Context, reqInf
}
dbCluster.Spec.ForProvider.StorageType = &reqInfo.HostParams.StorageType
dbCluster.Spec.DeletionPolicy = reqInfo.HostParams.DeletionPolicy
dbCluster.Spec.ForProvider.AutoMinorVersionUpgrade = dbClaim.Spec.AutoMinorVersionUpgrade

// Compute a json patch based on the changed RDSInstance
dbClusterPatchData, err := patchDBCluster.Data(dbCluster)
Expand Down Expand Up @@ -432,6 +436,7 @@ func (r *DatabaseClaimReconciler) manageAuroraDBInstance(ctx context.Context, re
EnablePerformanceInsights: &reqInfo.EnablePerfInsight,
EnableCloudwatchLogsExports: nil,
PreferredMaintenanceWindow: dbClaim.Spec.PreferredMaintenanceWindow,
AutoMinorVersionUpgrade: dbClaim.Spec.AutoMinorVersionUpgrade,
},
ResourceSpec: xpv1.ResourceSpec{
ProviderConfigReference: &providerConfigReference,
Expand Down Expand Up @@ -864,6 +869,7 @@ func (r *DatabaseClaimReconciler) updateDBInstance(ctx context.Context, reqInfo
// Update DBInstance
dbClaim.Spec.Tags = r.configureBackupPolicy(dbClaim.Spec.BackupPolicy, dbClaim.Spec.Tags)
dbInstance.Spec.ForProvider.Tags = ReplaceOrAddTag(DBClaimTags(dbClaim.Spec.Tags).DBTags(), OperationalStatusTagKey, OperationalStatusActiveValue)
dbInstance.Spec.ForProvider.AutoMinorVersionUpgrade = dbClaim.Spec.AutoMinorVersionUpgrade
params := &reqInfo.HostParams
if dbClaim.Spec.Type == v1.Postgres {
multiAZ := basefun.GetMultiAZEnabled(r.Config.Viper)
Expand Down