[SIS-xxx] switching local deployment to use postgres chart instead

.gitignore

@@ -21,6 +21,8 @@ target/
 *.tar.gz
 *.rar
 
+Chart.lock
+
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 

.tiltignore

@@ -0,0 +1,3 @@
+*.tgz
+tilt/sissi-dev/tmpcharts/
+tilt/sissi-dev/charts/*.tgz

Tiltfile

@@ -38,7 +38,8 @@ docker_build(registry + 'sissi-private-rest-api', 'deployment/image-packaging/sr
 docker_build(registry + 'sissi-template-data', 'deployment/image-packaging/src/main/docker/template-data/')
 
 
-k8s_yaml(helm('deployment/helm/sissi', values=
+local('cd tilt/sissi-dev && helm dep up')
+k8s_yaml(helm('tilt/sissi-dev', values=
 ['./../Sissi-environments/argocd/apps/sissi/values/local/values.yaml',
 'secrets://./../Sissi-environments/argocd/apps/sissi/values/local/values.secrets.yaml']
 ))

application/executable/pom.xml

@@ -136,6 +136,11 @@
             <artifactId>statistic-impl</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>dev.sheldan.abstracto.modules</groupId>
+            <artifactId>sticky-roles-impl</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>dev.sheldan.abstracto.modules</groupId>
             <artifactId>giveaway-impl</artifactId>

application/executable/src/main/resources/application.properties

@@ -2,8 +2,8 @@ spring.datasource.url=jdbc:postgresql://${DB_HOST}:${DB_PORT}/${DB_NAME}
 spring.datasource.username= ${DB_USER}
 spring.datasource.password= ${DB_PASS}
 spring.datasource.hikari.maximum-pool-size=${hikariPoolSize}
-spring.jpa.hibernate.default_schema=abstracto
-spring.jpa.properties.hibernate.default_schema=abstracto
+spring.jpa.hibernate.default_schema=${DB_SCHEMA}
+spring.jpa.properties.hibernate.default_schema=${DB_SCHEMA}
 spring.quartz.jdbc.initialize-schema=never
 management.metrics.tags.application=Sissi
 management.endpoint.health.probes.enabled=true

deployment/helm/sissi/templates/db-config-deployment-job.yaml

@@ -17,7 +17,7 @@ spec:
       {{- end }}
       containers:
         - name: db-config-deployment-job
-          image: "{{ $.Values.dbConfigDeployment.repository }}/{{ $.Values.dbConfigDeployment.image }}:{{ $.Values.dbConfigDeployment.tag | default .Chart.AppVersion}}"
+          image: "{{ $.Values.dbConfigDeployment.repository }}/{{ $.Values.dbConfigDeployment.image }}:{{ $.Values.dbConfigDeployment.tag | default .Chart.Version }}"
           imagePullPolicy: {{ $.Values.dbConfigDeployment.pullPolicy }}
           args:
             - "/var/db-config/"
@@ -48,7 +48,7 @@ spec:
                   name: db-credentials
                   key: dbName
             - name: DB_SCHEME
-              value: "abstracto"
+              value: {{ .Values.dbCredentials.schema }}
           volumeMounts:
             - mountPath: "/var/db-config/"
               name: database-config-mount

deployment/helm/sissi/templates/deployment.yaml

@@ -29,7 +29,7 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.bot.repository }}/{{ .Values.bot.image }}:{{ .Values.bot.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.bot.repository }}/{{ .Values.bot.image }}:{{ .Values.bot.tag | default .Chart.Version }}"
           imagePullPolicy: {{ .Values.bot.pullPolicy }}
           env:
             - name: DB_PASS
@@ -57,6 +57,8 @@ spec:
                 secretKeyRef:
                   name: db-credentials
                   key: dbName
+            - name: DB_SCHEMA
+              value: {{ .Values.dbCredentials.schema }}
             - name: DEBRA_DONATION_NOTIFICATION_SERVER_ID
               value: "297910194841583616"
             - name: TOKEN

deployment/helm/sissi/templates/template-deployment-job.yaml

@@ -17,7 +17,7 @@ spec:
       {{- end }}
       containers:
         - name: template-deployment-job
-          image: "{{ $.Values.templateDeployment.repository }}/{{ $.Values.templateDeployment.image }}:{{ $.Values.templateDeployment.tag | default .Chart.AppVersion }}"
+          image: "{{ $.Values.templateDeployment.repository }}/{{ $.Values.templateDeployment.image }}:{{ $.Values.templateDeployment.tag | default .Chart.Version }}"
           imagePullPolicy: {{ $.Values.templateDeployment.pullPolicy }}
           args:
             - "/var/template-config/"
@@ -48,7 +48,7 @@ spec:
                   name: db-credentials
                   key: dbName
             - name: DB_SCHEME
-              value: "abstracto."
+              value: "{{ .Values.dbCredentials.schema }}."
           volumeMounts:
             - mountPath: "/var/template-config/"
               name: template-config-mount

deployment/helm/sissi/values.yaml

@@ -113,6 +113,7 @@ dbCredentials:
   userName: null
   password: null
   name: null
+  schema: abstracto
 grafanaDeployment:
   repository: harbor.sheldan.dev/grafana-tools
   pullPolicy: Always

deployment/image-packaging/pom.xml

@@ -171,6 +171,17 @@
                                     <destFileName>moderation.zip</destFileName>
                                 </artifactItem>
 
+
+                                <artifactItem>
+                                    <groupId>dev.sheldan.abstracto-templates.templates</groupId>
+                                    <artifactId>sticky-roles</artifactId>
+                                    <version>${abstracto.templates.version}</version>
+                                    <type>zip</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
+                                    <destFileName>sticky-roles.zip</destFileName>
+                                </artifactItem>
+
                                 <artifactItem>
                                     <groupId>dev.sheldan.abstracto-templates.templates</groupId>
                                     <artifactId>entertainment</artifactId>
@@ -316,6 +327,16 @@
                                     <destFileName>experience-tracking.zip</destFileName>
                                 </artifactItem>
 
+                                <artifactItem>
+                                    <groupId>dev.sheldan.abstracto-templates.translations</groupId>
+                                    <artifactId>sticky-roles</artifactId>
+                                    <version>${abstracto.templates.version}</version>
+                                    <type>zip</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
+                                    <destFileName>sticky-roles.zip</destFileName>
+                                </artifactItem>
+
                                 <artifactItem>
                                     <groupId>dev.sheldan.abstracto-templates.translations</groupId>
                                     <artifactId>twitch</artifactId>
@@ -577,6 +598,17 @@
                                     <destFileName>logging.zip</destFileName>
                                 </artifactItem>
 
+                                <artifactItem>
+                                    <groupId>dev.sheldan.abstracto.modules</groupId>
+                                    <artifactId>sticky-roles-impl</artifactId>
+                                    <version>${abstracto.version}</version>
+                                    <classifier>liquibase</classifier>
+                                    <type>zip</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
+                                    <destFileName>sticky-roles.zip</destFileName>
+                                </artifactItem>
+
                                 <artifactItem>
                                     <groupId>dev.sheldan.abstracto.modules</groupId>
                                     <artifactId>starboard-impl</artifactId>

deployment/image-packaging/src/main/docker/db-data/config/artifact_versions.json

@@ -21,6 +21,7 @@
     { "zip": "remind", "file": "remind-changeLog.xml"},
     { "zip": "suggestion", "file": "suggestion-changeLog.xml"},
     { "zip": "modmail", "file": "modMail-changeLog.xml"},
+    { "zip": "sticky-roles", "file": "stickyRoles-changeLog.xml"},
     { "zip": "twitch", "file": "twitch-changeLog.xml"},
     { "zip": "assignable-roles", "file": "assignableRoles-changeLog.xml"},
     { "zip": "moderation-custom", "file": "moderation-custom-changeLog.xml"}

deployment/image-packaging/src/main/docker/template-data/config/artifact_versions.json

@@ -1,7 +1,7 @@
 {
   "template_artifacts": [
     "core","starboard", "link-embed", "moderation", "entertainment", "custom-command", "utility", "webservices", "remind",
-    "suggestion", "modmail", "assignable-roles", "experience-tracking", "logging", "statistic", "twitch", "giveaway",
+    "suggestion", "modmail", "assignable-roles", "experience-tracking", "logging", "statistic", "twitch", "giveaway", "sticky-roles",
     "image-generation",
     "quotes", "meetup", "debra", "rss-news",
     "moderation-custom", "image-generation-custom",
@@ -10,7 +10,7 @@
   "translation_artifacts": [
     "core",
     "starboard", "link-embed", "moderation", "entertainment", "custom-command", "utility", "webservices",
-    "suggestion", "remind", "modmail", "assignable-roles", "experience-tracking", "logging", "statistic", "twitch", "giveaway",
+    "suggestion", "remind", "modmail", "assignable-roles", "experience-tracking", "logging", "statistic", "twitch", "giveaway", "sticky-roles",
     "image-generation",
     "quotes", "meetup", "debra", "rss-news",
     "moderation-custom",

pom.xml

@@ -18,8 +18,8 @@
     <properties>
         <maven.compiler.target>17</maven.compiler.target>
         <maven.compiler.source>17</maven.compiler.source>
-        <abstracto.version>1.5.24</abstracto.version>
-        <abstracto.templates.version>1.4.32</abstracto.templates.version>
+        <abstracto.version>1.5.25-SNAPSHOT</abstracto.version>
+        <abstracto.templates.version>1.4.33-SNAPSHOT</abstracto.templates.version>
         <apache-jena.version>4.9.0</apache-jena.version>
         <rssreader.version>3.5.0</rssreader.version>
     </properties>

tilt/sissi-dev/Chart.yaml

@@ -0,0 +1,11 @@
+apiVersion: v2
+description: sissi dev chart
+name: sissi-dev
+version: 1.0.0
+dependencies:
+  - name: sissi
+    repository: file://../../deployment/helm/sissi
+    version: ">= 0.0.1"
+  - name: postgresql
+    repository: oci://registry-1.docker.io/bitnamicharts
+    version: 12.12.10 # 13.x.x uses postgresql 16.x