ricardozanini commented on code in PR #2790:
URL:
https://github.com/apache/incubator-kie-tools/pull/2790#discussion_r1978304298
##########
packages/sonataflow-operator/internal/controller/platform/db_migrator_job.go:
##########
@@ -229,41 +236,61 @@ func HandleDBMigrationJob(ctx context.Context, client
client.Client, platform *o
return platform, nil
}
-func newQuarkusDataSource(jdbcURL string, userName string, password string,
schema string) *QuarkusDataSource {
+func newQuarkusDataSource(jdbcURL string, secretRefName string, secretUserKey
string, secretPasswordKey string, schema string) *QuarkusDataSource {
return &QuarkusDataSource{
- JdbcUrl: jdbcURL,
- Username: userName,
- Password: password,
- Schema: schema,
+ JdbcUrl: jdbcURL,
+ SecretRefName: secretRefName,
+ SecretUserKey: secretUserKey,
+ SecretPasswordKey: secretPasswordKey,
+ Schema: schema,
}
}
func createJobDBMigration(platform *operatorapi.SonataFlowPlatform, dbmj
*DBMigratorJob) *batchv1.Job {
// In DB Migrator Tool, smallrye will throw error for empty string ""
while initializing properties.
// So use an empty space as a default value. Please see more at:
https://github.com/eclipse/microprofile-config/issues/671
nonEmptyValue := " "
- diQuarkusDataSource := newQuarkusDataSource(nonEmptyValue,
nonEmptyValue, nonEmptyValue, nonEmptyValue)
- jsQuarkusDataSource := newQuarkusDataSource(nonEmptyValue,
nonEmptyValue, nonEmptyValue, nonEmptyValue)
+ diQuarkusDataSource := newQuarkusDataSource(nonEmptyValue,
nonEmptyValue, nonEmptyValue, nonEmptyValue, nonEmptyValue)
+ jsQuarkusDataSource := newQuarkusDataSource(nonEmptyValue,
nonEmptyValue, nonEmptyValue, nonEmptyValue, nonEmptyValue)
if dbmj.MigrateDBDataIndex && dbmj.DataIndexDataSource != nil {
diQuarkusDataSource.JdbcUrl = dbmj.DataIndexDataSource.JdbcUrl
- diQuarkusDataSource.Username = dbmj.DataIndexDataSource.Username
- diQuarkusDataSource.Password = dbmj.DataIndexDataSource.Password
+ diQuarkusDataSource.SecretRefName =
dbmj.DataIndexDataSource.SecretRefName
+ diQuarkusDataSource.SecretUserKey =
dbmj.DataIndexDataSource.SecretUserKey
+ diQuarkusDataSource.SecretPasswordKey =
dbmj.DataIndexDataSource.SecretPasswordKey
diQuarkusDataSource.Schema = dbmj.DataIndexDataSource.Schema
}
if dbmj.MigrateDBJobsService && dbmj.JobsServiceDataSource != nil {
jsQuarkusDataSource.JdbcUrl = dbmj.JobsServiceDataSource.JdbcUrl
- jsQuarkusDataSource.Username =
dbmj.JobsServiceDataSource.Username
- jsQuarkusDataSource.Password =
dbmj.JobsServiceDataSource.Password
+ jsQuarkusDataSource.SecretRefName =
dbmj.JobsServiceDataSource.SecretRefName
+ jsQuarkusDataSource.SecretUserKey =
dbmj.JobsServiceDataSource.SecretUserKey
+ jsQuarkusDataSource.SecretPasswordKey =
dbmj.JobsServiceDataSource.SecretPasswordKey
jsQuarkusDataSource.Schema = dbmj.JobsServiceDataSource.Schema
}
+ diDBSecretRef := corev1.LocalObjectReference{
+ Name: diQuarkusDataSource.SecretRefName,
+ }
+
+ jsDBSecretRef := corev1.LocalObjectReference{
+ Name: jsQuarkusDataSource.SecretRefName,
+ }
+
dbMigrationJobCfg := newDBMigrationJobCfg()
job := &batchv1.Job{
ObjectMeta: metav1.ObjectMeta{
Name: dbMigrationJobCfg.JobName,
Namespace: platform.Namespace,
+ Labels: map[string]string{
+ workflowproj.LabelApp: platform.Name,
+ workflowproj.LabelAppNamespace:
platform.Namespace,
+ workflowproj.LabelK8SComponent:
fmt.Sprintf("%s-%s", platform.Name, dbMigrationJobCfg.JobName),
+ workflowproj.LabelK8SManagedBy:
"sonataflow-operator",
+ workflowproj.LabelK8SName:
dbMigrationJobCfg.JobName,
+ workflowproj.LabelK8SPartOF: platform.Name,
+ workflowproj.LabelService:
fmt.Sprintf("%s-%s", "sonataflow-db-job", dbMigrationJobCfg.JobName),
Review Comment:
Use this instead:
https://github.com/apache/incubator-kie-tools/blob/main/packages/sonataflow-operator/workflowproj/operator.go#L102-L129
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
