From bbaee9a47a1d55a00a7ba6450a8544ffce28cb1c Mon Sep 17 00:00:00 2001 From: Sheldan <5037282+Sheldan@users.noreply.github.com> Date: Thu, 7 Sep 2023 21:16:17 +0200 Subject: [PATCH] [SIS-xxx] preparing for new release and upgrade of abstracto --- Tiltfile | 5 +++-- .../sissi/module/meetup/commands/CreateMeetup.java | 1 + deployment/helm/sissi/Chart.yaml | 4 ++-- deployment/helm/sissi/templates/deployment.yaml | 3 +++ deployment/helm/sissi/values.yaml | 10 +++++----- deployment/image-packaging/src/main/docker/.env | 2 +- pom.xml | 4 ++-- 7 files changed, 17 insertions(+), 12 deletions(-) diff --git a/Tiltfile b/Tiltfile index c22aec48..a6fa7f33 100644 --- a/Tiltfile +++ b/Tiltfile @@ -17,7 +17,7 @@ local_resource( docker_build_with_restart( registry + 'sissi-bot', './application/executable/target/jar', - entrypoint=['java', '-noverify', '-cp', '.:./lib/*', 'dev.sheldan.sissi.executable.Application'], + entrypoint=['java', '-noverify', '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005', '-cp', '.:./lib/*', 'dev.sheldan.sissi.executable.Application'], dockerfile='./application/executable/Dockerfile', live_update=[ sync('./application/executable/target/jar/BOOT-INF/lib', '/app/lib'), @@ -36,4 +36,5 @@ k8s_yaml(helm('deployment/helm/sissi', values= 'secrets://./../Sissi-environments/argocd/apps/sissi/values/local/values.secrets.yaml'] )) -local_resource('fetch-packages', 'mvn install -f deployment/image-packaging/pom.xml', auto_init=False, trigger_mode = TRIGGER_MODE_MANUAL) \ No newline at end of file +local_resource('fetch-packages', 'mvn install -f deployment/image-packaging/pom.xml', auto_init=False, trigger_mode = TRIGGER_MODE_MANUAL) +k8s_resource('chart-sissi', port_forwards='5005:5005') \ No newline at end of file diff --git a/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/commands/CreateMeetup.java b/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/commands/CreateMeetup.java index 18e85753..2be17020 100644 --- a/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/commands/CreateMeetup.java +++ b/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/commands/CreateMeetup.java @@ -5,6 +5,7 @@ import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand import dev.sheldan.abstracto.core.command.config.CommandConfiguration; import dev.sheldan.abstracto.core.command.config.HelpInfo; import dev.sheldan.abstracto.core.command.config.Parameter; +import dev.sheldan.abstracto.core.command.config.validator.MaxStringLengthValidator; import dev.sheldan.abstracto.core.command.execution.CommandContext; import dev.sheldan.abstracto.core.command.execution.CommandResult; import dev.sheldan.abstracto.core.config.FeatureDefinition; diff --git a/deployment/helm/sissi/Chart.yaml b/deployment/helm/sissi/Chart.yaml index ac993406..02fda46f 100644 --- a/deployment/helm/sissi/Chart.yaml +++ b/deployment/helm/sissi/Chart.yaml @@ -15,10 +15,10 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.4.15 +version: 1.4.16 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.4.15" +appVersion: "1.4.16" diff --git a/deployment/helm/sissi/templates/deployment.yaml b/deployment/helm/sissi/templates/deployment.yaml index 118d82d3..423ffc61 100644 --- a/deployment/helm/sissi/templates/deployment.yaml +++ b/deployment/helm/sissi/templates/deployment.yaml @@ -88,6 +88,9 @@ spec: - name: http containerPort: {{ .Values.service.port }} protocol: TCP + - name: debug + containerPort: 5005 + protocol: TCP livenessProbe: httpGet: path: /actuator/health/liveness diff --git a/deployment/helm/sissi/values.yaml b/deployment/helm/sissi/values.yaml index 605dabb3..d76bf2b0 100644 --- a/deployment/helm/sissi/values.yaml +++ b/deployment/helm/sissi/values.yaml @@ -8,7 +8,7 @@ bot: repository: harbor.sheldan.dev/sissi pullPolicy: IfNotPresent image: sissi-bot - tag: 1.4.15 + tag: 1.4.16 livenessProbe: initialDelaySeconds: 60 periodSeconds: 5 @@ -23,26 +23,26 @@ templateDeployment: repository: harbor.sheldan.dev/abstracto pullPolicy: Always image: abstracto-template-deployment - tag: 1.5.6 + tag: 1.5.7 templateDeploymentData: repository: harbor.sheldan.dev/sissi pullPolicy: Always image: sissi-template-data - tag: 1.4.15 + tag: 1.4.16 dbConfigDeployment: enabled: true repository: harbor.sheldan.dev/abstracto pullPolicy: Always image: abstracto-db-deployment - tag: 1.5.6 + tag: 1.5.7 dbConfigDeploymentData: repository: harbor.sheldan.dev/sissi pullPolicy: Always image: sissi-db-data - tag: 1.4.15 + tag: 1.4.16 dbCredentials: host: diff --git a/deployment/image-packaging/src/main/docker/.env b/deployment/image-packaging/src/main/docker/.env index 1b608c3a..c8c271f5 100644 --- a/deployment/image-packaging/src/main/docker/.env +++ b/deployment/image-packaging/src/main/docker/.env @@ -1,2 +1,2 @@ REGISTRY_PREFIX=harbor.sheldan.dev/sissi/ -VERSION=1.4.15 \ No newline at end of file +VERSION=1.4.16 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 4e7ee2c3..30270a0d 100644 --- a/pom.xml +++ b/pom.xml @@ -20,8 +20,8 @@ 17 - 1.5.7 - 1.4.19 + 1.5.8 + 1.4.20