Skip to content

Commit 28174db

Browse files
steveblackducknsingh-bd
steveblackduck
and
nsingh-bd
authored
feat: Upgrade to non-Bitnami MariaDB
* feat: Upgrade to MariaDB v1.41.0 - Unpin MariaDB v1.38.0 * feat: Upgrade to MariaDB v1.41.0 --------- Co-authored-by: Neha Singh <nsingh@blackduck.com>
1 parent 305c83f commit 28174db

9 files changed

Lines changed: 77 additions & 48 deletions

File tree

‎.version/Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ pipeline {
112112
}
113113

114114
codeDxVersion = currentVersions[0]
115-
mariaDBVersion = 'v1.38.0' // currentVersions[1]
115+
mariaDBVersion = currentVersions[1]
116116
// Note: v1.34.0 is the most recent TO version that the legacy K8s chart (codedx-kubernetes) supports
117117
toolOrchestrationVersion = 'v1.34.0'
118118
// Note: v1.34.0 is the most recent Workflow version that the legacy K8s chart (codedx-kubernetes) supports

‎setup/core/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ This section describes the setup.ps1 script parameters, which you can specify by
4343
| `minioCPUReservation` | CPU request and limit for MinIO | `2` (example) |
4444
| `workflowCPUReservation` | CPU request and limit for workflow controller | `2` (example) |
4545
| | | |
46-
| `codeDxEphemeralStorageReservation` | storage request and limit for Code Dx | `2868Mi` |
46+
| `codeDxEphemeralStorageReservation` | storage request and limit for Code Dx | `3368Mi` |
4747
| `dbMasterEphemeralStorageReservation` | storage request and limit for the master database | `2Gi` (example) |
4848
| `dbSlaveEphemeralStorageReservation` | storage request and limit for slave databases | `2Gi` (example) |
4949
| `toolServiceEphemeralStorageReservation` | storage request and limit for the tool service | `2Gi` (example) |

‎setup/core/charts/codedx/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ sources:
1717
- https://hub.docker.com/r/bitnami/mariadb
1818
dependencies:
1919
- name: mariadb
20-
version: 7.4.3
21-
repository: https://codedx.github.io/codedx-kubernetes
20+
version: 7.10.0
21+
repository: https://codedx.github.io/srm-k8s
2222
condition: mariadb.enabled
2323
maintainers:
2424
- name: tylercamp

‎setup/core/charts/codedx/values.yaml‎

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -564,31 +564,39 @@ mariadb:
564564
maxUnavailable: 0
565565
config: |-
566566
[mysqld]
567+
init_file=/docker-entrypoint-initdb.d/runalways-setup.sql
567568
skip-name-resolve
568569
explicit_defaults_for_timestamp
569-
basedir=/opt/bitnami/mariadb
570+
basedir=/usr
571+
datadir=/mariadb/data/
570572
port=3306
571-
socket=/opt/bitnami/mariadb/tmp/mysql.sock
572-
tmpdir=/opt/bitnami/mariadb/tmp
573+
socket=/usr/tmp/mysqld.sock
574+
tmpdir=/usr/tmp
573575
max_allowed_packet=16M
574576
bind-address=0.0.0.0
575-
pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid
576-
log-error=/opt/bitnami/mariadb/logs/mysqld.log
577+
pid-file=/usr/tmp/mysqld.pid
577578
character-set-server=utf8mb4
578579
collation-server=utf8mb4_general_ci
579580
optimizer_search_depth=0
580581
lower_case_table_names=1
581582
innodb_flush_log_at_trx_commit=0
583+
log_bin_trust_function_creators=1
584+
expire_logs_days=5
585+
server-id=1
586+
log-bin=mysql-bin
582587
583588
[client]
584589
port=3306
585-
socket=/opt/bitnami/mariadb/tmp/mysql.sock
590+
socket=/usr/tmp/mysqld.sock
586591
587592
[manager]
588593
port=3306
589-
socket=/opt/bitnami/mariadb/tmp/mysql.sock
590-
pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid
594+
socket=/usr/tmp/mysqld.sock
595+
pid-file=/usr/tmp/mysqld.pid
591596
slave:
597+
extraEnvVars:
598+
- name: MARIADB_ROOT_PASSWORD_FILE
599+
value: /usr/secrets/mariadb-root-password
592600
persistence:
593601
# Use default storage class for master/slave PVCs
594602
storageClass:
@@ -606,25 +614,30 @@ mariadb:
606614
[mysqld]
607615
skip-name-resolve
608616
explicit_defaults_for_timestamp
609-
basedir=/opt/bitnami/mariadb
617+
basedir=/usr
618+
datadir=/mariadb/data/
610619
port=3306
611-
socket=/opt/bitnami/mariadb/tmp/mysql.sock
612-
tmpdir=/opt/bitnami/mariadb/tmp
620+
socket=/usr/tmp/mysqld.sock
621+
tmpdir=/usr/tmp
613622
max_allowed_packet=16M
614623
bind-address=0.0.0.0
615-
pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid
616-
log-error=/opt/bitnami/mariadb/logs/mysqld.log
624+
pid-file=/usr/tmp/mysqld.pid
617625
character-set-server=utf8mb4
618626
collation-server=utf8mb4_general_ci
619627
optimizer_search_depth=0
620628
lower_case_table_names=1
621629
innodb_flush_log_at_trx_commit=0
630+
log_bin_trust_function_creators=1
631+
expire_logs_days=5
632+
server-id=2
633+
log-bin=mysql-bin
634+
relay-log=mysql-relay-bin
622635
623636
[client]
624637
port=3306
625-
socket=/opt/bitnami/mariadb/tmp/mysql.sock
638+
socket=/usr/tmp/mysqld.sock
626639
627640
[manager]
628641
port=3306
629-
socket=/opt/bitnami/mariadb/tmp/mysql.sock
630-
pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid
642+
socket=/usr/tmp/mysqld.sock
643+
pid-file=/usr/tmp/mysqld.pid

‎setup/core/common/codedx.ps1‎

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -167,15 +167,15 @@ function New-CodeDxDeploymentValuesFile([string] $codeDxDnsName,
167167
$masterDatabaseTlsConfig = ''
168168
if ('' -ne $dbMasterTlsSecretName) {
169169
$masterDatabaseTlsConfig = @'
170-
ssl_cert=/bitnami/mariadb/tls/cert/tls.crt
171-
ssl_key=/bitnami/mariadb/tls/cert/tls.key
170+
ssl_cert=/mariadb/tls/cert/tls.crt
171+
ssl_key=/mariadb/tls/cert/tls.key
172172
'@
173173
}
174174

175175
$masterDatabaseTlsCaConfig = ''
176176
if ('' -ne $dbMasterTlsCaConfigMapName) {
177177
$masterDatabaseTlsCaConfig = @'
178-
ssl_ca=/bitnami/mariadb/tls/ca/ca.crt
178+
ssl_ca=/mariadb/tls/ca/ca.crt
179179
'@
180180
}
181181

@@ -280,39 +280,45 @@ mariadb:
280280
size: {10}Gi
281281
config: |-
282282
[mysqld]
283+
init_file=/docker-entrypoint-initdb.d/runalways-setup.sql
283284
skip-name-resolve
284285
explicit_defaults_for_timestamp
285-
basedir=/opt/bitnami/mariadb
286+
basedir=/usr
287+
datadir=/mariadb/data/
286288
port=3306
287-
socket=/opt/bitnami/mariadb/tmp/mysql.sock
288-
tmpdir=/opt/bitnami/mariadb/tmp
289+
socket=/usr/tmp/mysqld.sock
290+
tmpdir=/usr/tmp
289291
max_allowed_packet=16M
290292
bind-address=0.0.0.0
291-
pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid
292-
log-error=/opt/bitnami/mariadb/logs/mysqld.log
293+
pid-file=/usr/tmp/mysqld.pid
293294
character-set-server=utf8mb4
294295
collation-server=utf8mb4_general_ci
295296
optimizer_search_depth=0
296297
lower_case_table_names=1
297298
innodb_flush_log_at_trx_commit=0
298299
log_bin_trust_function_creators=1
299300
expire_logs_days=5
301+
server-id=1
302+
log-bin=mysql-bin
300303
{50}
301304
{51}
302305
303306
[client]
304307
port=3306
305-
socket=/opt/bitnami/mariadb/tmp/mysql.sock
308+
socket=/usr/tmp/mysqld.sock
306309
307310
[manager]
308311
port=3306
309-
socket=/opt/bitnami/mariadb/tmp/mysql.sock
310-
pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid
312+
socket=/usr/tmp/mysqld.sock
313+
pid-file=/usr/tmp/mysqld.pid
311314
annotations: {45}
312315
nodeSelector: {32}
313316
tolerations: {35}
314317
{19}
315318
slave:
319+
extraEnvVars:
320+
- name: MARIADB_ROOT_PASSWORD_FILE
321+
value: /usr/secrets/mariadb-root-password
316322
replicas: {15}
317323
persistence:
318324
storageClass: {52}
@@ -323,31 +329,34 @@ mariadb:
323329
[mysqld]
324330
skip-name-resolve
325331
explicit_defaults_for_timestamp
326-
basedir=/opt/bitnami/mariadb
332+
basedir=/usr
333+
datadir=/mariadb/data/
327334
port=3306
328-
socket=/opt/bitnami/mariadb/tmp/mysql.sock
329-
tmpdir=/opt/bitnami/mariadb/tmp
335+
socket=/usr/tmp/mysqld.sock
336+
tmpdir=/usr/tmp
330337
max_allowed_packet=16M
331338
bind-address=0.0.0.0
332-
pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid
333-
log-error=/opt/bitnami/mariadb/logs/mysqld.log
339+
pid-file=/usr/tmp/mysqld.pid
334340
character-set-server=utf8mb4
335341
collation-server=utf8mb4_general_ci
336342
optimizer_search_depth=0
337343
lower_case_table_names=1
338344
innodb_flush_log_at_trx_commit=0
339345
log_bin_trust_function_creators=1
340346
expire_logs_days=5
347+
server-id=2
348+
log-bin=mysql-bin
349+
relay-log=mysql-relay-bin
341350
342351
[client]
343352
port=3306
344-
socket=/opt/bitnami/mariadb/tmp/mysql.sock
353+
socket=/usr/tmp/mysqld.sock
345354
{51}
346355
347356
[manager]
348357
port=3306
349-
socket=/opt/bitnami/mariadb/tmp/mysql.sock
350-
pid-file=/opt/bitnami/mariadb/tmp/mysqld.pid
358+
socket=/usr/tmp/mysqld.sock
359+
pid-file=/usr/tmp/mysqld.pid
351360
annotations: {46}
352361
nodeSelector: {33}
353362
tolerations: {36}

‎setup/core/common/mariadb.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ spec:
4343
command: ["/bin/bash"]
4444
args: ["-c", "/home/sdb/restore"]
4545
volumeMounts:
46-
- mountPath: /bitnami/mariadb
46+
- mountPath: /mariadb
4747
name: data
4848
- mountPath: /home/sdb/cfg
4949
name: rootpwd

‎setup/core/common/velero.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ spec:
8686
command:
8787
- /bin/bash
8888
- -c
89-
- /bitnami/mariadb/scripts/backup.sh && sleep {1}
89+
- /mariadb/scripts/backup.sh && sleep {1}
9090
timeout: '{2}'
9191
'@ -f $codeDxNamespace, `
9292
$backupLagTime, `

‎setup/core/setup.ps1‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<#PSScriptInfo
2-
.VERSION 2.17.1
2+
.VERSION 2.18.0
33
.GUID 47733b28-676e-455d-b7e8-88362f442aa3
44
.AUTHOR Black Duck
55
.COPYRIGHT Copyright 2024 Black Duck Software, Inc. All rights reserved.
@@ -47,7 +47,7 @@ param (
4747
[string] $minioCPUReservation,
4848
[string] $workflowCPUReservation,
4949

50-
[string] $codeDxEphemeralStorageReservation = '2868Mi',
50+
[string] $codeDxEphemeralStorageReservation = '3368Mi',
5151
[string] $dbMasterEphemeralStorageReservation,
5252
[string] $dbSlaveEphemeralStorageReservation,
5353
[string] $toolServiceEphemeralStorageReservation,
@@ -66,7 +66,7 @@ param (
6666
[string] $imagePreDelete = 'codedx/codedx-cleanup:v1.34.0',
6767

6868
[string] $imageCodeDxTomcatInit = 'codedx/codedx-tomcat:v2026.3.3',
69-
[string] $imageMariaDB = 'codedx/codedx-mariadb:v1.38.0',
69+
[string] $imageMariaDB = 'codedx/codedx-mariadb:v1.41.0',
7070
[string] $imageMinio = 'bitnami/minio:2021.4.6-debian-10-r11',
7171
[string] $imageWorkflowController = 'codedx/codedx-workflow-controller:v2.18.0',
7272
[string] $imageWorkflowExecutor = 'codedx/codedx-argoexec:v2.18.0',
@@ -178,6 +178,7 @@ param (
178178
[Tuple`2[string,string]] $toolNoScheduleExecuteToleration,
179179

180180
[switch] $pauseAfterGitClone,
181+
[switch] $skipGitClone,
181182

182183
[switch] $useHelmOperator,
183184
[switch] $useHelmController,
@@ -606,9 +607,15 @@ $repoDirectory,$oldRepoDirectory | ForEach-Object {
606607
}
607608
}
608609

609-
Invoke-GitClone $codedxGitRepo $codedxGitRepoBranch $repoDirectory
610-
if ($pauseAfterGitClone) {
611-
Read-Host -Prompt 'git clone complete, press Enter to continue...' | Out-Null
610+
if ($skipGitClone) {
611+
$localRepoRoot = join-path $PSScriptRoot '../..'
612+
Write-Verbose "Copying local repo from $localRepoRoot to $repoDirectory..."
613+
Copy-Item -Path $localRepoRoot -Destination $repoDirectory -Recurse -Force
614+
} else {
615+
Invoke-GitClone $codedxGitRepo $codedxGitRepoBranch $repoDirectory
616+
if ($pauseAfterGitClone) {
617+
Read-Host -Prompt 'git clone complete, press Enter to continue...' | Out-Null
618+
}
612619
}
613620

614621
$defaultHelmRepo = 'https://codedx.github.io/codedx-kubernetes'

‎setup/steps/ephemeralstorage.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ class CodeDxEphemeralStorage : EphemeralStorageStep {
162162
}
163163

164164
[string]GetDefault() {
165-
return '2868Mi'
165+
return '3368Mi'
166166
}
167167
}
168168

0 commit comments

Comments
 (0)