Skip to content
Snippets Groups Projects
Commit f1774082 authored by Leah Tacke genannt Unterberg's avatar Leah Tacke genannt Unterberg
Browse files

helm chart is finally deployable

parent 895d78d3
No related branches found
No related tags found
No related merge requests found
Pipeline #571536 passed
...@@ -2,5 +2,5 @@ dependencies: ...@@ -2,5 +2,5 @@ dependencies:
- name: postgresql - name: postgresql
repository: https://charts.bitnami.com/bitnami repository: https://charts.bitnami.com/bitnami
version: 16.5.0 version: 16.5.0
digest: sha256:5d40b9c5bdd615dc56524d8ee9cba1d2d79ff4c711b44f3c5507e378823f1323 digest: sha256:4d3a7a3e13e6cf1645433630c4c9721164bbebdac49984acf9bb76485eb5b40f
generated: "2025-03-17T17:12:51.0781795+01:00" generated: "2025-04-14T12:12:50.190808+02:00"
...@@ -32,6 +32,16 @@ spec: ...@@ -32,6 +32,16 @@ spec:
securityContext: securityContext:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
initContainers:
- name: wait-for-db
image: postgres:17-alpine
command: [ "sh", "-c" ]
args:
- |
until pg_isready -h {{ tpl .Values.mitmDB.mitm_database_host . }} -p {{ .Values.mitmDB.mitm_database_port }}; do
echo "Waiting for postgres DB...";
sleep 2;
done
containers: containers:
- name: {{ .Chart.Name }} - name: {{ .Chart.Name }}
{{- with .Values.securityContext }} {{- with .Values.securityContext }}
......
...@@ -25,9 +25,7 @@ metadata: ...@@ -25,9 +25,7 @@ metadata:
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
type: Opaque type: Opaque
stringData: stringData:
postgres-user: {{.Values.mitmDB.mitm_database_user | quote }} username: {{.Values.mitmDB.mitm_database_user | quote }}
password: {{.Values.mitmDB.mitm_database_password | quote }}
postgres-password: {{.Values.mitmDB.mitm_database_password | quote }} postgres-password: {{.Values.mitmDB.mitm_database_password | quote }}
postgres-database: {{.Values.mitmDB.mitm_database_db | quote }} database: {{.Values.mitmDB.mitm_database_db | quote }}
# POSTGRES_USER: {{.Values.mitmDB.mitm_database_user | quote }}
# POSTGRES_PASSWORD: {{.Values.mitmDB.mitm_database_password | quote }}
# POSTGRES_DATABASE: {{.Values.mitmDB.mitm_database_db | quote }}
...@@ -165,10 +165,18 @@ mitm-postgresql: ...@@ -165,10 +165,18 @@ mitm-postgresql:
# tag: latest-pg16 # tag: latest-pg16
auth: auth:
username: "mitm-pg-user"
database: "mitm_db"
# apparently this does *not* override the username and database setting which is annoying
existingSecret: '{{ .Values.global.postgresql.configPrefix }}-postgresql-auth-env' existingSecret: '{{ .Values.global.postgresql.configPrefix }}-postgresql-auth-env'
serviceAccount:
automountServiceAccountToken: true
primary: primary:
podAnnotations:
sidecar.istio.io/inject: "false"
## ##
## Persistent Volume Storage configuration. ## Persistent Volume Storage configuration.
## ref: https://kubernetes.io/docs/user-guide/persistent-volumes ## ref: https://kubernetes.io/docs/user-guide/persistent-volumes
...@@ -179,15 +187,15 @@ mitm-postgresql: ...@@ -179,15 +187,15 @@ mitm-postgresql:
## ##
## Persistent class ## Persistent class
# storageClass: classname # storageClass: classname
size: 1Gi
## ##
## Access modes: ## Access modes:
accessModes: accessModes:
- ReadWriteOnce - ReadWriteOnce
## PostgreSQL port ## PostgreSQL port
service: service:
ports: ports:
postgresql: 5432 postgresql: "5432"
# initScripts: # initScripts:
# timescaledb: | # timescaledb: |
......
...@@ -24,10 +24,27 @@ down: ...@@ -24,10 +24,27 @@ down:
docker compose down docker compose down
helm-package: helm-package:
helm package helm/superset-mitm-service helm/ cd helm/ && helm package superset-mitm-service
helm-push a: helm-package helm-push a: helm-package
# helm registry login registry-1.docker.io -u leahtgu # helm registry login registry-1.docker.io -u leahtgu
helm push {{a}} oci://registry-1.docker.io/leahtgu cd helm/ && helm push {{a}} oci://registry-1.docker.io/leahtgu
kube: helm-install:
helm --kube-context c4c -n mdata install superset-mitm-service helm/superset-mitm-service
helm-install-dry:
helm --kube-context c4c -n mdata install superset-mitm-service helm/superset-mitm-service --dry-run > dryrun.yaml
helm-uninstall:
helm --kube-context c4c -n mdata uninstall superset-mitm-service
kube-forward:
#! powershell
$POD_NAME = kubectl --context=c4c get pods --namespace mdata -l "app.kubernetes.io/name=superset-mitm-service,app.kubernetes.io/instance=superset-mitm-service" -o jsonpath="{.items[0].metadata.name}"
$CONTAINER_PORT = kubectl --context=c4c get pod --namespace mdata $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}"
Write-Output "Visit http://127.0.0.1:8080 to use your application"
kubectl --context=c4c --namespace mdata port-forward $POD_NAME 8080:$CONTAINER_PORT
kube *arg:
kubectl --context=c4c -n mdata {{arg}}
\ No newline at end of file
...@@ -10,5 +10,9 @@ ...@@ -10,5 +10,9 @@
"superset": { "superset": {
"port": "8180", "port": "8180",
"uuid": "b4004d6a-bcaa-4a48-aa54-271b074109ca" "uuid": "b4004d6a-bcaa-4a48-aa54-271b074109ca"
},
"kubernetes": {
"port": "8080",
"uuid": "b4004d6a-bcaa-4a48-aa54-271b074109ca"
} }
} }
\ No newline at end of file
###
# @name Upload MAED dataset
# @connection-timeout 180
POST http://localhost:{{port}}/mitm_dataset/upload?dataset_name=myname_0&mitm=MAED POST http://localhost:{{port}}/mitm_dataset/upload?dataset_name=myname_0&mitm=MAED
Accept: application/json Accept: application/json
Content-Type: multipart/form-data; boundary=WebAppBoundary Content-Type: multipart/form-data; boundary=WebAppBoundary
...@@ -15,6 +19,7 @@ GET http://localhost:{{port}}/mitm_dataset/ ...@@ -15,6 +19,7 @@ GET http://localhost:{{port}}/mitm_dataset/
### ###
POST http://localhost:{{port}}/mitm_dataset/upload?dataset_name=myname_1&mitm=MAED POST http://localhost:{{port}}/mitm_dataset/upload?dataset_name=myname_1&mitm=MAED
Accept: application/json Accept: application/json
Content-Type: multipart/form-data; boundary=WebAppBoundary Content-Type: multipart/form-data; boundary=WebAppBoundary
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment