Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix!: Update cloud dependency to v0.23.0 #518

Merged
merged 1 commit into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/platform/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ maintainers:
- name: yevgenypats
email: [email protected]
version: 0.2.3
appVersion: 0.22.0
appVersion: 0.23.0
annotations:
artifacthub.io/license: MPL-2.0
artifacthub.io/links: |
Expand Down
3 changes: 2 additions & 1 deletion charts/platform/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Helm chart for installing the CloudQuery self-hosted platform

![Version: 0.2.3](https://img.shields.io/badge/Version-0.2.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.21.1](https://img.shields.io/badge/AppVersion-0.21.1-informational?style=flat-square)
![Version: 0.2.3](https://img.shields.io/badge/Version-0.2.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.23.0](https://img.shields.io/badge/AppVersion-0.23.0-informational?style=flat-square)

## Quickstart

Expand Down Expand Up @@ -212,6 +212,7 @@ Kubernetes: `^1.8.0-0`
| ingress.hosts[0].paths[0].path | string | `"/"` | |
| ingress.hosts[0].paths[0].pathType | string | `"ImplementationSpecific"` | |
| ingress.tls | list | `[]` | |
| jwtPrivateKey | string | `""` | JWT private key for the self-hosted platform - if not provided, a new key will be generated |
| livenessProbe.httpGet.path | string | `"/"` | |
| livenessProbe.httpGet.port | string | `"api"` | |
| livenessProbe.periodSeconds | int | `60` | |
Expand Down
41 changes: 5 additions & 36 deletions charts/platform/templates/deployments.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,36 +28,13 @@ spec:
serviceAccountName: {{ include "platform.serviceAccount" . }}
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
initContainers:
- name: {{ .Chart.Name }}-init
image: "{{ include "platform.image" . }}"
command: [ "/backend/localadmin", "init" ]
env:
- name: CQAPI_DB_DSN
valueFrom:
secretKeyRef:
name: {{ include "platform.fullName" . }}-secrets
key: postgresqlDSN
- name: CQAPI_LOCAL_AES_KEY_FILE
value: /shared/encrypted_aes_key.bin
- name: CQAPI_LOCAL_JWT_PRIVATE_KEY_FILE
value: /etc/jwt/jwt-private-key.pem
volumeMounts:
- name: jwt-private-key
mountPath: /etc/jwt/jwt-private-key.pem
subPath: jwtPrivateKey
readOnly: true
- name: shared-data
mountPath: /shared
containers:
- name: {{ .Chart.Name }}
securityContext:
{{- toYaml .Values.containerSecurityContext | nindent 12 }}
image: "{{ include "platform.image" . }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
- name: CQAPI_LOCAL_AES_KEY_FILE
value: /shared/encrypted_aes_key.bin
{{- if .Values.activationKey }}
- name: CQAPI_LOCAL_ACTIVATION_KEY
valueFrom:
Expand All @@ -75,8 +52,11 @@ spec:
secretKeyRef:
name: {{ include "platform.fullName" . }}-secrets
key: clickhouseDSN
- name: CQAPI_LOCAL_JWT_PRIVATE_KEY_FILE
value: /etc/jwt/jwt-private-key.pem
- name: CQAPI_LOCAL_JWT_PRIVATE_KEY
valueFrom:
secretKeyRef:
name: {{ include "platform.fullName" . }}-secrets
key: jwtPrivateKey
- name: CQAPI_REDIS_ADDR
value: redis://{{ .Release.Name }}-redis-master.{{ .Release.Namespace }}.svc.cluster.local:6379
ports:
Expand All @@ -102,21 +82,10 @@ spec:
{{- with .Values.volumeMounts }}
{{- toYaml . | nindent 12 }}
{{- end }}
- name: jwt-private-key
mountPath: /etc/jwt/jwt-private-key.pem
subPath: jwtPrivateKey
readOnly: true
- name: shared-data
mountPath: /shared
volumes:
{{- with .Values.volumes }}
{{- toYaml . | nindent 8 }}
{{- end }}
- name: jwt-private-key
secret:
secretName: {{ include "platform.fullName" . }}-secrets
- name: shared-data
emptyDir: {}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/platform/templates/secrets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ data:
{{- end }}
postgresqlDSN: {{ required "A valid postgres DSN is required" .Values.externalDependencies.postgresql_dsn | b64enc }}
clickhouseDSN: {{ required "A valid clickhouse DSN is required" .Values.externalDependencies.clickhouse_dsn | b64enc }}
jwtPrivateKey: {{ genPrivateKey "rsa" | b64enc }}
jwtPrivateKey: {{ .Values.jwtPrivateKey | default (genPrivateKey "rsa") | b64enc }}
3 changes: 3 additions & 0 deletions charts/platform/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ volumeMounts: []
# -- Activation key for the self-hosted platform
activationKey: ""

# -- JWT private key for the self-hosted platform - if not provided, a new key will be generated
jwtPrivateKey: ""

externalDependencies:
# -- Required: The DSN for the Postgres database
postgresql_dsn: ""
Expand Down
Loading