From ddd24bb65c59ded9d7513d49beebd71a382c0c4d Mon Sep 17 00:00:00 2001 From: Kilian Schuettler Date: Thu, 16 May 2024 22:03:54 +0200 Subject: [PATCH] RED-8670: integrate table inference from research --- .../v1/processor/entity/ComponentMappingEntity.java | 2 +- .../changelog/tenant/127-add-component-mapping-table.yaml | 2 +- publish-custom-image.sh | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/ComponentMappingEntity.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/ComponentMappingEntity.java index 67f27f504..75cab62bb 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/ComponentMappingEntity.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/ComponentMappingEntity.java @@ -61,7 +61,7 @@ public class ComponentMappingEntity { @NonNull @Builder.Default @ElementCollection(fetch = FetchType.EAGER) - @CollectionTable(name = "component_mapping_column_labels") + @CollectionTable(name = "component_mapping_column_labels", catalog = ) List columnLabels = new ArrayList<>(); @NonNull diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/127-add-component-mapping-table.yaml b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/127-add-component-mapping-table.yaml index f5abbd7da..e9679364e 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/127-add-component-mapping-table.yaml +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/127-add-component-mapping-table.yaml @@ -82,7 +82,7 @@ databaseChangeLog: constraints: nullable: false - column: - name: label + name: column_labels type: VARCHAR(255) constraints: nullable: false diff --git a/publish-custom-image.sh b/publish-custom-image.sh index 82a74219f..4d8cdde10 100755 --- a/publish-custom-image.sh +++ b/publish-custom-image.sh @@ -15,7 +15,9 @@ gradle bootBuildImage --publishImage -PbuildbootDockerHostNetwork=true -Pversion newImageName="nexus.knecon.com:5001/red/${dir}-server-v1:$buildName" +echo "full image name:" echo ${newImageName} +echo "" if [ -z "$1" ]; then exit 0 @@ -32,8 +34,8 @@ if [ "${newImageName}" = "${oldImageName}" ]; then echo "Image tag did not change, redeploying..." rancher kubectl rollout restart deployment ${deployment_name} -n ${namespace} else - echo "upgrading..." + echo "upgrading the image tag..." rancher kubectl set image deployment/${deployment_name} ${deployment_name}=${newImageName} -n ${namespace} fi rancher kubectl rollout status deployment ${deployment_name} -n ${namespace} -echo "Built ${dir} and deployed to ${namespace}" +echo "Built ${deployment_name}:${buildName} and deployed to ${namespace}"