[OPB-xxx] updating abstracto version

enabling giveaway and image generation feature
2026-03-11 03:06:24 +00:00 · 2023-12-25 19:04:22 +01:00
parent e77c448824
commit fe50e1331b
16 changed files with 228 additions and 27 deletions
--- a/deployment/helm/oneplus-bot/templates/deployment.yaml
+++ b/deployment/helm/oneplus-bot/templates/deployment.yaml
@@ -71,6 +71,10 @@ spec:
                secretKeyRef:
                  name: api-keys
                  key: youtubeApiKey
+            - name: PRIVATE_REST_API_HOST
+              value: "{{ .Values.privateRestApi.service.name }}.{{ .Release.Namespace }}.svc.cluster.local"
+            - name: PRIVATE_REST_API_PORT
+              value: "{{ .Values.privateRestApi.service.targetPort }}"
            {{- range $key, $value := .Values.bot.propertyConfig }}
            - name: {{ $key | quote }}
              value: {{ $value | quote}}
--- a/deployment/helm/oneplus-bot/templates/private-rest-api-deployment.yaml
+++ b/deployment/helm/oneplus-bot/templates/private-rest-api-deployment.yaml
@@ -0,0 +1,65 @@
+{{- if .Values.privateRestApi.enabled -}}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "oneplusBot.fullname" . }}-private-rest-api
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: private-rest-api
+  template:
+    metadata:
+      {{- with .Values.privateRestApi.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        app: private-rest-api
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "oneplusBot.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.privateRestApi.podSecurityContext | nindent 8 }}
+      containers:
+        - name: {{ .Chart.Name }}-private-rest-api
+          securityContext:
+            {{- toYaml .Values.privateRestApi.securityContext | nindent 12 }}
+          image: "{{ .Values.privateRestApi.repository }}/{{ .Values.privateRestApi.image }}:{{ .Values.privateRestApi.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.privateRestApi.pullPolicy }}
+          ports:
+            - name: {{ .Values.privateRestApi.service.name }}
+              containerPort: {{ .Values.privateRestApi.service.port }}
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /
+              port: {{ .Values.privateRestApi.service.port }}
+            initialDelaySeconds: {{ $.Values.privateRestApi.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ $.Values.privateRestApi.livenessProbe.periodSeconds }}
+            failureThreshold: {{ $.Values.privateRestApi.livenessProbe.failureThreshold }}
+          readinessProbe:
+            httpGet:
+              path: /
+              port: {{ .Values.privateRestApi.service.port }}
+            initialDelaySeconds: {{ $.Values.privateRestApi.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ $.Values.privateRestApi.readinessProbe.periodSeconds }}
+            failureThreshold: {{ $.Values.privateRestApi.readinessProbe.failureThreshold }}
+          resources:
+            {{- toYaml .Values.privateRestApi.resources | nindent 12 }}
+      {{- with .Values.privateRestApi.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.privateRestApi.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.privateRestApi.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+{{- end }}
--- a/deployment/helm/oneplus-bot/templates/private-rest-api-service.yaml
+++ b/deployment/helm/oneplus-bot/templates/private-rest-api-service.yaml
@@ -0,0 +1,12 @@
+{{- if .Values.privateRestApi.enabled -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.privateRestApi.service.name }}
+spec:
+  selector:
+    app: private-rest-api
+  ports:
+    - port: {{ .Values.privateRestApi.service.targetPort }}
+      targetPort: {{ .Values.privateRestApi.service.port }}
+{{- end }}
--- a/deployment/helm/oneplus-bot/values.yaml
+++ b/deployment/helm/oneplus-bot/values.yaml
@@ -27,7 +27,7 @@ templateDeployment:
  repository: harbor.sheldan.dev/abstracto
  pullPolicy: Always
  image: abstracto-template-deployment
-  tag: 1.5.12
+  tag: 1.5.18

 templateDeploymentData:
  repository: harbor.sheldan.dev/oneplus-bot
@@ -40,7 +40,7 @@ dbConfigDeployment:
  repository: harbor.sheldan.dev/abstracto
  pullPolicy: Always
  image: abstracto-db-deployment
-  tag: 1.5.12
+  tag: 1.5.18

 dbConfigDeploymentData:
  repository: harbor.sheldan.dev/oneplus-bot
@@ -55,6 +55,38 @@ dbCredentials:
  password:
  name:

+privateRestApi:
+  enabled: true
+  repository: harbor.sheldan.dev/oneplus-bot
+  pullPolicy: Always
+  image: oneplus-bot-private-rest-api
+  tag: 1.6.12
+  podAnnotations: {}
+  podSecurityContext: {}
+  securityContext: {}
+  livenessProbe:
+    initialDelaySeconds: 2
+    periodSeconds: 5
+    failureThreshold: 3
+  readinessProbe:
+    initialDelaySeconds: 2
+    periodSeconds: 5
+    failureThreshold: 3
+  service:
+    port: 8080
+    targetPort: 80
+    name: private-restapi # must be less than 16 chars
+  resources:
+    limits:
+      cpu:
+      memory:
+    requests:
+      cpu:
+      memory:
+  nodeSelector: {}
+  tolerations: []
+  affinity: {}
+
 grafanaDeployment:
  repository: harbor.sheldan.dev/grafana-tools
  pullPolicy: Always
--- a/deployment/image-packaging/pom.xml
+++ b/deployment/image-packaging/pom.xml
@@ -200,6 +200,26 @@
                            <destFileName>statistic.zip</destFileName>
                        </artifactItem>

+                        <artifactItem>
+                            <groupId>dev.sheldan.abstracto-templates.templates</groupId>
+                            <artifactId>giveaway</artifactId>
+                            <version>${abstracto.templates.version}</version>
+                            <type>zip</type>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
+                            <destFileName>giveaway.zip</destFileName>
+                        </artifactItem>
+
+                        <artifactItem>
+                            <groupId>dev.sheldan.abstracto-templates.templates</groupId>
+                            <artifactId>image-generation</artifactId>
+                            <version>${abstracto.templates.version}</version>
+                            <type>zip</type>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
+                            <destFileName>image-generation.zip</destFileName>
+                        </artifactItem>
+
                        <artifactItem>
                            <groupId>dev.sheldan.abstracto-templates.templates</groupId>
                            <artifactId>logging</artifactId>
@@ -442,6 +462,26 @@
                            <destFileName>logging.zip</destFileName>
                        </artifactItem>

+                        <artifactItem>
+                            <groupId>dev.sheldan.abstracto-templates.translations</groupId>
+                            <artifactId>giveaway</artifactId>
+                            <version>${abstracto.templates.version}</version>
+                            <type>zip</type>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
+                            <destFileName>giveaway.zip</destFileName>
+                        </artifactItem>
+
+                        <artifactItem>
+                            <groupId>dev.sheldan.abstracto-templates.translations</groupId>
+                            <artifactId>image-generation</artifactId>
+                            <version>${abstracto.templates.version}</version>
+                            <type>zip</type>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
+                            <destFileName>image-generation.zip</destFileName>
+                        </artifactItem>
+
                        <artifactItem>
                            <groupId>dev.sheldan.oneplus.bot.templates.translations.customizations</groupId>
                            <artifactId>starboard-customization-translations</artifactId>
@@ -745,6 +785,28 @@
                            <destFileName>logging.zip</destFileName>
                        </artifactItem>

+                        <artifactItem>
+                            <groupId>dev.sheldan.abstracto.modules</groupId>
+                            <artifactId>giveaway-impl</artifactId>
+                            <version>${abstracto.version}</version>
+                            <classifier>liquibase</classifier>
+                            <type>zip</type>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
+                            <destFileName>giveaway.zip</destFileName>
+                        </artifactItem>
+
+                        <artifactItem>
+                            <groupId>dev.sheldan.abstracto.modules</groupId>
+                            <artifactId>image-generation-impl</artifactId>
+                            <version>${abstracto.version}</version>
+                            <classifier>liquibase</classifier>
+                            <type>zip</type>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
+                            <destFileName>image-generation.zip</destFileName>
+                        </artifactItem>
+
                        <!-- customizations -->
                        <artifactItem>
                            <groupId>dev.sheldan.oneplus.bot.application.custom</groupId>
--- a/deployment/image-packaging/src/main/docker/.env
+++ b/deployment/image-packaging/src/main/docker/.env
@@ -1,2 +0,0 @@
-REGISTRY_PREFIX=harbor.sheldan.dev/oneplus-bot/
-VERSION=1.6.12
--- a/deployment/image-packaging/src/main/docker/db-data/config/artifact_versions.json
+++ b/deployment/image-packaging/src/main/docker/db-data/config/artifact_versions.json
@@ -9,6 +9,8 @@
    { "zip": "starboard", "file": "starboard-changeLog.xml"},
    { "zip": "remind", "file": "remind-changeLog.xml"},
    { "zip": "logging", "file": "logging-changeLog.xml"},
+    { "zip": "giveaway", "file": "giveaway-changeLog.xml"},
+    { "zip": "image-generation", "file": "imageGeneration-changeLog.xml"},
    { "zip": "suggestion", "file": "suggestion-changeLog.xml"},
    { "zip": "invite-filter", "file": "inviteFilter-changeLog.xml"},
    { "zip": "profanity-filter", "file": "profanityFilter-changeLog.xml"},
--- a/deployment/image-packaging/src/main/docker/docker-compose.yml
+++ b/deployment/image-packaging/src/main/docker/docker-compose.yml
@@ -1,15 +0,0 @@
-version: "3.7"
-
-services:
-  bot:
-    build:
-      context: oneplusbot
-    image: ${REGISTRY_PREFIX}oneplus-bot-image:${VERSION:-latest}
-  db-data:
-    build:
-      context: db-data
-    image: ${REGISTRY_PREFIX}oneplus-bot-db-data:${VERSION:-latest}
-  template-data:
-    build:
-      context: template-data
-    image: ${REGISTRY_PREFIX}oneplus-bot-template-data:${VERSION:-latest}
--- a/deployment/image-packaging/src/main/docker/private-rest-api/Dockerfile
+++ b/deployment/image-packaging/src/main/docker/private-rest-api/Dockerfile
@@ -0,0 +1,6 @@
+ARG REGISTRY_PREFIX
+ARG ABSTRACTO_VERSION
+FROM ${REGISTRY_PREFIX}abstracto-rest-api-image-gen:${ABSTRACTO_VERSION:-latest} AS image-gen-api
+
+FROM ${REGISTRY_PREFIX}abstracto-rest-api:${ABSTRACTO_VERSION:-latest} AS running-image
+COPY --from=image-gen-api /python /python
--- a/deployment/image-packaging/src/main/docker/template-data/config/artifact_versions.json
+++ b/deployment/image-packaging/src/main/docker/template-data/config/artifact_versions.json
@@ -1,14 +1,14 @@
 {
  "template_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "webservices", "remind", "logging",
    "suggestion", "invite-filter", "profanity-filter", "statistic", "experience-tracking", "moderation", "modmail", "assignable-roles",
-    "voice-channel-context", "anti-raid",
+    "voice-channel-context", "anti-raid", "giveaway", "image-generation",
    "starboard-custom",
    "overrides-templates-webservices", "overrides-templates-core", "overrides-templates-logging", "overrides-templates-statistic",
    "overrides-templates-modmail", "overrides-templates-moderation",
    "news", "referral", "faq"],
  "translation_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "webservices", "suggestion",
    "remind", "logging", "invite-filter", "profanity-filter", "statistic", "experience-tracking", "moderation", "modmail", "assignable-roles",
-    "voice-channel-context", "anti-raid",
+    "voice-channel-context", "anti-raid", "giveaway", "image-generation",
    "starboard-custom", "dynamic-activity-custom-translations", "moderation-custom",
    "overrides-translation-moderation",
    "news", "setup", "referral", "faq", "seasonal"]