Skip to content

Commit

Permalink
Refactoring mistakes cleanup (#23)
Browse files Browse the repository at this point in the history
  • Loading branch information
lazyoldbear authored Aug 21, 2024
1 parent d917929 commit bac8f0f
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 42 deletions.
30 changes: 7 additions & 23 deletions charts/document-engine/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
# Changelog

- [Changelog](#changelog)
- [3.0.2 (2024-08-20)](#302-2024-08-20)
- [Fixed](#fixed)
- [3.0.1 (2024-08-20)](#301-2024-08-20)
- [Fixed](#fixed-1)
- [3.0.0 (2024-08-20)](#300-2024-08-20)
- [3.0.3 (2024-08-20)](#303-2024-08-20)
- [Changed](#changed)
- [Added](#added)
- [2.9.3 (2024-08-16)](#293-2024-08-16)
- [Fixed](#fixed-2)
- [Fixed](#fixed)
- [2.9.2 (2024-08-13)](#292-2024-08-13)
- [Changed](#changed-1)
- [2.9.1 (2024-08-10)](#291-2024-08-10)
Expand All @@ -18,16 +14,16 @@
- [2.9.0 (2024-08-01)](#290-2024-08-01)
- [Added](#added-2)
- [Changed](#changed-3)
- [Fixed](#fixed-3)
- [Fixed](#fixed-1)
- [2.8.0](#280)
- [Added](#added-3)
- [Changed](#changed-4)
- [Fixed](#fixed-4)
- [Fixed](#fixed-2)
- [2.7.3](#273)
- [Changed](#changed-5)
- [Fixed](#fixed-5)
- [Fixed](#fixed-3)
- [2.7.2](#272)
- [Fixed](#fixed-6)
- [Fixed](#fixed-4)
- [2.7.0](#270)
- [Changed](#changed-6)
- [2.6.2](#262)
Expand All @@ -46,19 +42,7 @@
- [2.0.0](#200)
- [Changed](#changed-9)

## 3.0.2 (2024-08-20)

### Fixed

* Refactoring mistakes cleanup.

## 3.0.1 (2024-08-20)

### Fixed

* Refactoring mistakes cleanup.

## 3.0.0 (2024-08-20)
## 3.0.3 (2024-08-20)

> [!WARNING]
> Breaking changes.
Expand Down
2 changes: 1 addition & 1 deletion charts/document-engine/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: document-engine
description: Document Engine
icon: data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTAwMCIgaGVpZ2h0PSIxMDAwIiB2aWV3Qm94PSIwIDAgMTAwMCAxMDAwIiBmaWxsPSJub25lIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNMzQyLjU2NyA2NTguNjEyTDMyOS40OTYgNjY1LjkxNUwzMzguNzk5IDY1NC4yODZDMzk5LjMxIDU3OS44NDIgNDMzLjAyNiA0ODcuMjExIDQzNC41MjggMzkxLjI4OEw0MzQuNzYgMzc2LjMxTDQ0MC4xMSAzOTAuMjY1QzQ3NC40MDUgNDc5LjkzMiA1MzcuODc4IDU1NS40NDggNjIwLjMxIDYwNC42NTRMNjMzLjE0OCA2MTIuMzI5TDYxOC4zNTYgNjA5Ljk1N0M1MjMuNTcxIDU5NC43NTYgNDI2LjQyOCA2MTEuODk0IDM0Mi41NjcgNjU4LjYxMloiIGZpbGw9IiMxOTBEOTQiLz4KPHBhdGggZD0iTTU1NC41MTkgNTU2LjM2N0M0NzMuMzk2IDQ0Mi4wMzMgNDg3LjMwNCAzNzYuODY1IDUwOS44NjQgMjg5Ljc4OEM1MzYuNjExIDE4Ni41MjQgNDczLjM1IDg0LjA1MDUgMzYyLjU5NyAxMTQuNDI1QzMxMy41MjMgMTI3LjkxNCAyOTYuMTczIDE2MS4zMTIgMjkwLjAzMyAxODQuNzU2QzI1OS45ODQgMjk3Ljc4OSA0MzguMjMxIDQ2Ni4xNzQgNTU0LjUxOSA1NTYuMzY3WiIgZmlsbD0iIzVFNUNFQiIvPgo8cGF0aCBkPSJNMjE3LjEwMyA2NDQuMTg2QzExNC4zMDQgNjcyLjY1NCA1Ny4xODM1IDc3OC43NTUgMTM4Ljg2NSA4NTkuNDEzQzE3NS4wNTMgODk1LjEzNyAyMTIuNjM4IDg5My40NjIgMjM2LjAzNSA4ODcuMzIyQzM0OC45MjggODU2Ljc2MiA0MDUuNjMgNjE4LjE4NCA0MjUuNjMyIDQ3Mi40MDVDMzY3LjE2MiA1OTkuNjI1IDMwMy45OTQgNjIwLjE4NCAyMTcuMTAzIDY0NC4xODZaIiBmaWxsPSIjNUU1Q0VCIi8+CjxwYXRoIGQ9Ik04NzEuNDggNTgyLjY1MUM3ODguNTQzIDUwMC4xNzkgNTUzLjU5NCA1NzAuMzI0IDQxNy4zNSA2MjUuOTFDNTU2Ljg5NiA2MTIuODM5IDYwNi4zODkgNjU3LjQ0OCA2NzAuNTMzIDcyMC41MjJDNzQ2LjU4NiA3OTUuMzE5IDg2Ni45NjggNzkxLjczNyA4OTYuMDQgNjgwLjY1OUM5MDguNjkyIDYzMS40NDUgODg4LjQ1OCA1OTkuNzIyIDg3MS40OCA1ODIuNjUxWiIgZmlsbD0iIzVFNUNFQiIvPgo8L3N2Zz4K
type: application
version: 3.0.2
version: 3.0.3
appVersion: "1.4.1"

maintainers:
Expand Down
18 changes: 9 additions & 9 deletions charts/document-engine/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
{{- end }}
{{- if .Values.updateStrategy }}
strategy:
{{ toYaml .Values.updateStrategy | nindent 4 }}
{{- toYaml .Values.updateStrategy | nindent 4 }}
{{- end }}
selector:
matchLabels:
Expand Down Expand Up @@ -52,7 +52,7 @@ spec:
- secretRef:
name: {{ include "document-engine.fullname" . }}
{{- if and .Values.database.enabled
.Values.database.postgres.externalSecretName }}
.Values.database.postgres.externalSecretName }}
- secretRef:
name: {{ .Values.database.postgres.externalSecretName }}
{{- end }}
Expand Down Expand Up @@ -90,38 +90,38 @@ spec:
name: {{ .Values.documentEngineLicense.externalSecret.name }}
key: {{ .Values.documentEngineLicense.externalSecret.key }}
{{- end }}
{{- if .Values.apiAuth.externalSecret.name -}}
{{- with .Values.apiAuth -}}
{{- if .externalSecret.apiTokenKey -}}
{{- if .Values.apiAuth.externalSecret.name }}
{{- with .Values.apiAuth }}
{{- if .externalSecret.apiTokenKey }}
- name: API_AUTH_TOKEN
valueFrom:
secretKeyRef:
name: {{ .externalSecret.name }}
key: {{ .externalSecret.apiTokenKey }}
{{- end }}
{{- if .externalSecret.secretKeyBaseKey -}}
{{- if .externalSecret.secretKeyBaseKey }}
- name: SECRET_KEY_BASE
valueFrom:
secretKeyRef:
name: {{ .externalSecret.name }}
key: {{ .externalSecret.secretKeyBaseKey }}
{{- end }}
{{- if and .jwt.enabled .externalSecret.jwtPublicKeyKey -}}
{{- if and .jwt.enabled .externalSecret.jwtPublicKeyKey }}
- name: JWT_PUBLIC_KEY
valueFrom:
secretKeyRef:
name: {{ .externalSecret.name }}
key: {{ .externalSecret.jwtPublicKeyKey }}
{{- end }}
{{- if and .jwt.enabled .externalSecret.jwtAlgorithmKey -}}
{{- if and .jwt.enabled .externalSecret.jwtAlgorithmKey }}
- name: JWT_ALGORITHM
valueFrom:
secretKeyRef:
name: {{ .externalSecret.name }}
key: {{ .externalSecret.jwtAlgorithmKey }}
{{- end }}
{{- end }}
{{- end -}}
{{- end }}
{{- if and .Values.dashboard.enabled
.Values.dashboard.auth.externalSecret.name}}
- name: DASHBOARD_USERNAME
Expand Down
8 changes: 4 additions & 4 deletions charts/document-engine/templates/storage-migration.Job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,17 +73,17 @@ spec:
value: 'true'
- name: EXIT_AFTER_DATABASE_MIGRATIONS
value: 'true'
{{- if .Values.apiAuth.externalSecret.name -}}
{{- with .Values.apiAuth.externalSecret -}}
{{- if .secretKeyBaseKey -}}
{{- if .Values.apiAuth.externalSecret.name }}
{{- with .Values.apiAuth.externalSecret }}
{{- if .secretKeyBaseKey }}
- name: SECRET_KEY_BASE
valueFrom:
secretKeyRef:
name: {{ .name }}
key: {{ .secretKeyBaseKey }}
{{- end }}
{{- end }}
{{- end -}}
{{- end }}
{{- with .Values.extraEnvs }}
{{- toYaml .| nindent 12 }}
{{- end }}
Expand Down
8 changes: 4 additions & 4 deletions charts/document-engine/templates/tests/test-api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ spec:
- secretRef:
name: {{ include "document-engine.fullname" . }}
env:
{{- if .Values.apiAuth.externalSecret.name -}}
{{- with .Values.apiAuth.externalSecret -}}
{{- if .apiTokenKey -}}
{{- if .Values.apiAuth.externalSecret.name }}
{{- with .Values.apiAuth.externalSecret }}
{{- if .apiTokenKey }}
- name: API_AUTH_TOKEN
valueFrom:
secretKeyRef:
name: {{ .name }}
key: {{ .apiTokenKey }}
{{- end }}
{{- end }}
{{- end -}}
{{- end }}
command: ['curl']
args:
- '-X'
Expand Down
2 changes: 1 addition & 1 deletion charts/document-engine/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@ postgresql:
persistence:
enabled: false
extendedConfiguration: |
log_statement = ddl
log_statement = none
pgHbaConfiguration: |
local all all trust
host all all 127.0.0.1/32 trust
Expand Down

0 comments on commit bac8f0f

Please sign in to comment.