Skip to content

Commit cee5d87

Browse files
author
Jason Vigil
committed
fix: Add missing SQLInstance defaults
1 parent f80e52b commit cee5d87

File tree

29 files changed

+109
-0
lines changed

29 files changed

+109
-0
lines changed

‎pkg/controller/direct/sql/sqlinstance_defaults.go

+6
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,18 @@ import (
2121
)
2222

2323
func ApplySQLInstanceGCPDefaults(in *krm.SQLInstance, out *api.DatabaseInstance) {
24+
if in.Spec.InstanceType == nil {
25+
out.InstanceType = "CLOUD_SQL_INSTANCE"
26+
}
2427
if in.Spec.Settings.ActivationPolicy == nil {
2528
out.Settings.ActivationPolicy = "ALWAYS"
2629
}
2730
if in.Spec.Settings.AvailabilityType == nil {
2831
out.Settings.AvailabilityType = "ZONAL"
2932
}
33+
if in.Spec.Settings.ConnectorEnforcement == nil {
34+
out.Settings.ConnectorEnforcement = "NOT_REQUIRED"
35+
}
3036
if in.Spec.Settings.DiskType == nil {
3137
out.Settings.DataDiskType = "PD_SSD"
3238
}

‎pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-activationpolicy-direct/_http.log

+4
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,14 @@ User-Agent: kcc/controller-manager
3434

3535
{
3636
"databaseVersion": "POSTGRES_15",
37+
"instanceType": "CLOUD_SQL_INSTANCE",
3738
"kind": "sql#instance",
3839
"name": "sqlinstance-activationpolicy-direct-${uniqueId}",
3940
"region": "us-central1",
4041
"settings": {
4142
"activationPolicy": "ALWAYS",
4243
"availabilityType": "ZONAL",
44+
"connectorEnforcement": "NOT_REQUIRED",
4345
"dataDiskType": "PD_SSD",
4446
"edition": "ENTERPRISE",
4547
"kind": "sql#settings",
@@ -374,12 +376,14 @@ User-Agent: kcc/controller-manager
374376

375377
{
376378
"databaseVersion": "POSTGRES_15",
379+
"instanceType": "CLOUD_SQL_INSTANCE",
377380
"kind": "sql#instance",
378381
"name": "sqlinstance-activationpolicy-direct-${uniqueId}",
379382
"region": "us-central1",
380383
"settings": {
381384
"activationPolicy": "NEVER",
382385
"availabilityType": "ZONAL",
386+
"connectorEnforcement": "NOT_REQUIRED",
383387
"dataDiskType": "PD_SSD",
384388
"edition": "ENTERPRISE",
385389
"kind": "sql#settings",

‎pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-auditconfig-direct/_http.log

+4
Original file line numberDiff line numberDiff line change
@@ -173,13 +173,15 @@ User-Agent: kcc/controller-manager
173173

174174
{
175175
"databaseVersion": "SQLSERVER_2022_EXPRESS",
176+
"instanceType": "CLOUD_SQL_INSTANCE",
176177
"kind": "sql#instance",
177178
"name": "sqlinstance-auditconfig-direct-${uniqueId}",
178179
"region": "us-central1",
179180
"rootPassword": "1234!@#$asdf",
180181
"settings": {
181182
"activationPolicy": "ALWAYS",
182183
"availabilityType": "ZONAL",
184+
"connectorEnforcement": "NOT_REQUIRED",
183185
"dataDiskType": "PD_SSD",
184186
"edition": "ENTERPRISE",
185187
"kind": "sql#settings",
@@ -557,13 +559,15 @@ User-Agent: kcc/controller-manager
557559

558560
{
559561
"databaseVersion": "SQLSERVER_2022_EXPRESS",
562+
"instanceType": "CLOUD_SQL_INSTANCE",
560563
"kind": "sql#instance",
561564
"name": "sqlinstance-auditconfig-direct-${uniqueId}",
562565
"region": "us-central1",
563566
"rootPassword": "1234!@#$asdf",
564567
"settings": {
565568
"activationPolicy": "ALWAYS",
566569
"availabilityType": "ZONAL",
570+
"connectorEnforcement": "NOT_REQUIRED",
567571
"dataDiskType": "PD_SSD",
568572
"edition": "ENTERPRISE",
569573
"kind": "sql#settings",

‎pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-authorizednetworks-direct/_http.log

+4
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,14 @@ User-Agent: kcc/controller-manager
3434

3535
{
3636
"databaseVersion": "POSTGRES_16",
37+
"instanceType": "CLOUD_SQL_INSTANCE",
3738
"kind": "sql#instance",
3839
"name": "sqlinstance-authorizednetworks-direct-${uniqueId}",
3940
"region": "us-central1",
4041
"settings": {
4142
"activationPolicy": "ALWAYS",
4243
"availabilityType": "ZONAL",
44+
"connectorEnforcement": "NOT_REQUIRED",
4345
"dataDiskType": "PD_SSD",
4446
"edition": "ENTERPRISE",
4547
"ipConfiguration": {
@@ -370,12 +372,14 @@ User-Agent: kcc/controller-manager
370372

371373
{
372374
"databaseVersion": "POSTGRES_16",
375+
"instanceType": "CLOUD_SQL_INSTANCE",
373376
"kind": "sql#instance",
374377
"name": "sqlinstance-authorizednetworks-direct-${uniqueId}",
375378
"region": "us-central1",
376379
"settings": {
377380
"activationPolicy": "ALWAYS",
378381
"availabilityType": "ZONAL",
382+
"connectorEnforcement": "NOT_REQUIRED",
379383
"dataDiskType": "PD_SSD",
380384
"edition": "ENTERPRISE",
381385
"ipConfiguration": {

‎pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-backupconfiguration-binarylog-direct/_http.log

+4
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ User-Agent: kcc/controller-manager
3434

3535
{
3636
"databaseVersion": "MYSQL_5_7",
37+
"instanceType": "CLOUD_SQL_INSTANCE",
3738
"kind": "sql#instance",
3839
"name": "sqlinstance-backupconfiguration-binarylog-direct-${uniqueId}",
3940
"region": "us-central1",
@@ -53,6 +54,7 @@ User-Agent: kcc/controller-manager
5354
"startTime": "12:00",
5455
"transactionLogRetentionDays": 2
5556
},
57+
"connectorEnforcement": "NOT_REQUIRED",
5658
"dataDiskType": "PD_SSD",
5759
"edition": "ENTERPRISE",
5860
"kind": "sql#settings",
@@ -569,6 +571,7 @@ User-Agent: kcc/controller-manager
569571

570572
{
571573
"databaseVersion": "MYSQL_5_7",
574+
"instanceType": "CLOUD_SQL_INSTANCE",
572575
"kind": "sql#instance",
573576
"name": "sqlinstance-backupconfiguration-binarylog-direct-${uniqueId}",
574577
"region": "us-central1",
@@ -588,6 +591,7 @@ User-Agent: kcc/controller-manager
588591
"startTime": "12:00",
589592
"transactionLogRetentionDays": 3
590593
},
594+
"connectorEnforcement": "NOT_REQUIRED",
591595
"dataDiskType": "PD_SSD",
592596
"edition": "ENTERPRISE",
593597
"kind": "sql#settings",

‎pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-backupconfiguration-pitr-direct/_http.log

+4
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ User-Agent: kcc/controller-manager
3434

3535
{
3636
"databaseVersion": "POSTGRES_15",
37+
"instanceType": "CLOUD_SQL_INSTANCE",
3738
"kind": "sql#instance",
3839
"name": "sqlinstance-backupconfiguration-pitr-direct-${uniqueId}",
3940
"region": "us-central1",
@@ -53,6 +54,7 @@ User-Agent: kcc/controller-manager
5354
"startTime": "12:00",
5455
"transactionLogRetentionDays": 2
5556
},
57+
"connectorEnforcement": "NOT_REQUIRED",
5658
"dataDiskType": "PD_SSD",
5759
"edition": "ENTERPRISE",
5860
"kind": "sql#settings",
@@ -393,6 +395,7 @@ User-Agent: kcc/controller-manager
393395

394396
{
395397
"databaseVersion": "POSTGRES_15",
398+
"instanceType": "CLOUD_SQL_INSTANCE",
396399
"kind": "sql#instance",
397400
"name": "sqlinstance-backupconfiguration-pitr-direct-${uniqueId}",
398401
"region": "us-central1",
@@ -412,6 +415,7 @@ User-Agent: kcc/controller-manager
412415
"startTime": "12:00",
413416
"transactionLogRetentionDays": 3
414417
},
418+
"connectorEnforcement": "NOT_REQUIRED",
415419
"dataDiskType": "PD_SSD",
416420
"edition": "ENTERPRISE",
417421
"kind": "sql#settings",

‎pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-clone-minimal-direct/_http.log

+2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ User-Agent: kcc/controller-manager
3434

3535
{
3636
"databaseVersion": "POSTGRES_16",
37+
"instanceType": "CLOUD_SQL_INSTANCE",
3738
"kind": "sql#instance",
3839
"name": "sqlinstance-source-direct-${uniqueId}",
3940
"region": "us-central1",
@@ -45,6 +46,7 @@ User-Agent: kcc/controller-manager
4546
"kind": "sql#backupConfiguration",
4647
"pointInTimeRecoveryEnabled": true
4748
},
49+
"connectorEnforcement": "NOT_REQUIRED",
4850
"dataDiskType": "PD_SSD",
4951
"edition": "ENTERPRISE",
5052
"kind": "sql#settings",

‎pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-connectorenforcement-direct/_http.log

+2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ User-Agent: kcc/controller-manager
3434

3535
{
3636
"databaseVersion": "POSTGRES_15",
37+
"instanceType": "CLOUD_SQL_INSTANCE",
3738
"kind": "sql#instance",
3839
"name": "sqlinstance-connectorenforcement-direct-${uniqueId}",
3940
"region": "us-central1",
@@ -375,6 +376,7 @@ User-Agent: kcc/controller-manager
375376

376377
{
377378
"databaseVersion": "POSTGRES_15",
379+
"instanceType": "CLOUD_SQL_INSTANCE",
378380
"kind": "sql#instance",
379381
"name": "sqlinstance-connectorenforcement-direct-${uniqueId}",
380382
"region": "us-central1",

‎pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-databaseflags-direct/_http.log

+4
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,14 @@ User-Agent: kcc/controller-manager
3434

3535
{
3636
"databaseVersion": "POSTGRES_15",
37+
"instanceType": "CLOUD_SQL_INSTANCE",
3738
"kind": "sql#instance",
3839
"name": "sqlinstance-databaseflags-direct-${uniqueId}",
3940
"region": "us-central1",
4041
"settings": {
4142
"activationPolicy": "ALWAYS",
4243
"availabilityType": "ZONAL",
44+
"connectorEnforcement": "NOT_REQUIRED",
4345
"dataDiskType": "PD_SSD",
4446
"databaseFlags": [
4547
{
@@ -392,12 +394,14 @@ User-Agent: kcc/controller-manager
392394

393395
{
394396
"databaseVersion": "POSTGRES_15",
397+
"instanceType": "CLOUD_SQL_INSTANCE",
395398
"kind": "sql#instance",
396399
"name": "sqlinstance-databaseflags-direct-${uniqueId}",
397400
"region": "us-central1",
398401
"settings": {
399402
"activationPolicy": "ALWAYS",
400403
"availabilityType": "ZONAL",
404+
"connectorEnforcement": "NOT_REQUIRED",
401405
"dataDiskType": "PD_SSD",
402406
"databaseFlags": [
403407
{

‎pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-datacacheconfig-direct/_http.log

+4
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,14 @@ User-Agent: kcc/controller-manager
3434

3535
{
3636
"databaseVersion": "POSTGRES_15",
37+
"instanceType": "CLOUD_SQL_INSTANCE",
3738
"kind": "sql#instance",
3839
"name": "sqlinstance-datacacheconfig-direct-${uniqueId}",
3940
"region": "us-central1",
4041
"settings": {
4142
"activationPolicy": "ALWAYS",
4243
"availabilityType": "ZONAL",
44+
"connectorEnforcement": "NOT_REQUIRED",
4345
"dataCacheConfig": {
4446
"dataCacheEnabled": false
4547
},
@@ -560,12 +562,14 @@ User-Agent: kcc/controller-manager
560562

561563
{
562564
"databaseVersion": "POSTGRES_15",
565+
"instanceType": "CLOUD_SQL_INSTANCE",
563566
"kind": "sql#instance",
564567
"name": "sqlinstance-datacacheconfig-direct-${uniqueId}",
565568
"region": "us-central1",
566569
"settings": {
567570
"activationPolicy": "ALWAYS",
568571
"availabilityType": "ZONAL",
572+
"connectorEnforcement": "NOT_REQUIRED",
569573
"dataCacheConfig": {
570574
"dataCacheEnabled": true
571575
},

‎pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-deletionprotection-direct/_http.log

+4
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,14 @@ User-Agent: kcc/controller-manager
3434

3535
{
3636
"databaseVersion": "POSTGRES_15",
37+
"instanceType": "CLOUD_SQL_INSTANCE",
3738
"kind": "sql#instance",
3839
"name": "sqlinstance-deletionprotection-direct-${uniqueId}",
3940
"region": "us-central1",
4041
"settings": {
4142
"activationPolicy": "ALWAYS",
4243
"availabilityType": "ZONAL",
44+
"connectorEnforcement": "NOT_REQUIRED",
4345
"dataDiskType": "PD_SSD",
4446
"deletionProtectionEnabled": true,
4547
"edition": "ENTERPRISE",
@@ -375,12 +377,14 @@ User-Agent: kcc/controller-manager
375377

376378
{
377379
"databaseVersion": "POSTGRES_15",
380+
"instanceType": "CLOUD_SQL_INSTANCE",
378381
"kind": "sql#instance",
379382
"name": "sqlinstance-deletionprotection-direct-${uniqueId}",
380383
"region": "us-central1",
381384
"settings": {
382385
"activationPolicy": "ALWAYS",
383386
"availabilityType": "ZONAL",
387+
"connectorEnforcement": "NOT_REQUIRED",
384388
"dataDiskType": "PD_SSD",
385389
"deletionProtectionEnabled": false,
386390
"edition": "ENTERPRISE",

‎pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-denymaintenanceperiod-direct/_http.log

+4
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,14 @@ User-Agent: kcc/controller-manager
3434

3535
{
3636
"databaseVersion": "POSTGRES_15",
37+
"instanceType": "CLOUD_SQL_INSTANCE",
3738
"kind": "sql#instance",
3839
"name": "sqlinstance-denymaintenanceperiod-direct-${uniqueId}",
3940
"region": "us-central1",
4041
"settings": {
4142
"activationPolicy": "ALWAYS",
4243
"availabilityType": "ZONAL",
44+
"connectorEnforcement": "NOT_REQUIRED",
4345
"dataDiskType": "PD_SSD",
4446
"denyMaintenancePeriods": [
4547
{
@@ -395,12 +397,14 @@ User-Agent: kcc/controller-manager
395397

396398
{
397399
"databaseVersion": "POSTGRES_15",
400+
"instanceType": "CLOUD_SQL_INSTANCE",
398401
"kind": "sql#instance",
399402
"name": "sqlinstance-denymaintenanceperiod-direct-${uniqueId}",
400403
"region": "us-central1",
401404
"settings": {
402405
"activationPolicy": "ALWAYS",
403406
"availabilityType": "ZONAL",
407+
"connectorEnforcement": "NOT_REQUIRED",
404408
"dataDiskType": "PD_SSD",
405409
"denyMaintenancePeriods": [
406410
{

‎pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-encryptionkey-direct/_http.log

+4
Original file line numberDiff line numberDiff line change
@@ -1030,6 +1030,7 @@ User-Agent: kcc/controller-manager
10301030
"kind": "sql#diskEncryptionConfiguration",
10311031
"kmsKeyName": "projects/${projectId}/locations/us-central1/keyRings/kmskeyring-${uniqueId}/cryptoKeys/kmscryptokey-${uniqueId}"
10321032
},
1033+
"instanceType": "CLOUD_SQL_INSTANCE",
10331034
"kind": "sql#instance",
10341035
"name": "sqlinstance-encryptionkey-direct-${uniqueId}",
10351036
"region": "us-central1",
@@ -1046,6 +1047,7 @@ User-Agent: kcc/controller-manager
10461047
"startTime": "12:00",
10471048
"transactionLogRetentionDays": 5
10481049
},
1050+
"connectorEnforcement": "NOT_REQUIRED",
10491051
"dataDiskSizeGb": "100",
10501052
"dataDiskType": "PD_SSD",
10511053
"databaseFlags": [
@@ -1457,6 +1459,7 @@ User-Agent: kcc/controller-manager
14571459
"kind": "sql#diskEncryptionConfiguration",
14581460
"kmsKeyName": "projects/${projectId}/locations/us-central1/keyRings/kmskeyring-${uniqueId}/cryptoKeys/kmscryptokey-${uniqueId}"
14591461
},
1462+
"instanceType": "CLOUD_SQL_INSTANCE",
14601463
"kind": "sql#instance",
14611464
"name": "sqlinstance-encryptionkey-direct-${uniqueId}",
14621465
"region": "us-central1",
@@ -1473,6 +1476,7 @@ User-Agent: kcc/controller-manager
14731476
"startTime": "12:00",
14741477
"transactionLogRetentionDays": 5
14751478
},
1479+
"connectorEnforcement": "NOT_REQUIRED",
14761480
"dataDiskSizeGb": "100",
14771481
"dataDiskType": "PD_SSD",
14781482
"databaseFlags": [

‎pkg/test/resourcefixture/testdata/basic/sql/v1beta1/sqlinstance/sqlinstance-insightsconfig-direct/_http.log

+4
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,14 @@ User-Agent: kcc/controller-manager
3434

3535
{
3636
"databaseVersion": "POSTGRES_15",
37+
"instanceType": "CLOUD_SQL_INSTANCE",
3738
"kind": "sql#instance",
3839
"name": "sqlinstance-insightsconfig-direct-${uniqueId}",
3940
"region": "us-central1",
4041
"settings": {
4142
"activationPolicy": "ALWAYS",
4243
"availabilityType": "ZONAL",
44+
"connectorEnforcement": "NOT_REQUIRED",
4345
"dataDiskType": "PD_SSD",
4446
"edition": "ENTERPRISE",
4547
"insightsConfig": {
@@ -389,12 +391,14 @@ User-Agent: kcc/controller-manager
389391

390392
{
391393
"databaseVersion": "POSTGRES_15",
394+
"instanceType": "CLOUD_SQL_INSTANCE",
392395
"kind": "sql#instance",
393396
"name": "sqlinstance-insightsconfig-direct-${uniqueId}",
394397
"region": "us-central1",
395398
"settings": {
396399
"activationPolicy": "ALWAYS",
397400
"availabilityType": "ZONAL",
401+
"connectorEnforcement": "NOT_REQUIRED",
398402
"dataDiskType": "PD_SSD",
399403
"edition": "ENTERPRISE",
400404
"insightsConfig": {

0 commit comments

Comments
 (0)