Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • xeruf/dashboard
  • stackspin/dashboard
2 results
Show changes
Showing
with 626 additions and 368 deletions
apiVersion: {{ template "common.capabilities.deployment.apiVersion" . }}
kind: Deployment
metadata:
name: {{ template "common.names.fullname" . }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
component: dashboard
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
component: dashboard
{{- if .Values.updateStrategy }}
strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
{{- end }}
template:
metadata:
labels: {{- include "common.labels.standard" . | nindent 8 }}
component: dashboard
{{- if .Values.podLabels }}
{{- include "common.tplvalues.render" (dict "value" .Values.podLabels "context" $) | nindent 8 }}
{{- end }}
{{- if .Values.podAnnotations }}
annotations: {{- include "common.tplvalues.render" (dict "value" .Values.podAnnotations "context" $) | nindent 8 }}
{{- end }}
spec:
{{- include "dashboard.imagePullSecrets" . | nindent 6 }}
{{- if .Values.hostAliases }}
hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.hostAliases "context" $) | nindent 8 }}
{{- end }}
{{- if .Values.affinity }}
affinity: {{- include "common.tplvalues.render" (dict "value" .Values.affinity "context" $) | nindent 8 }}
{{- else }}
affinity:
podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.podAffinityPreset "context" $) | nindent 10 }}
podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.podAntiAffinityPreset "context" $) | nindent 10 }}
nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.nodeAffinityPreset.type "key" .Values.nodeAffinityPreset.key "values" .Values.nodeAffinityPreset.values) | nindent 10 }}
{{- end }}
{{- if .Values.nodeSelector }}
nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.nodeSelector "context" $) | nindent 8 }}
{{- end }}
{{- if .Values.tolerations }}
tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.tolerations "context" $) | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "dashboard.serviceAccountName" . }}
securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }}
initContainers:
{{- if .Values.initContainers }}
{{- include "common.tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }}
{{- end }}
containers:
- name: dashboard
securityContext: {{- toYaml .Values.dashboard.containerSecurityContext | nindent 12 }}
image: {{ template "dashboard.image" . }}
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
{{- if .Values.dashboard.command }}
command: {{- include "common.tplvalues.render" (dict "value" .Values.dashboard.command "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.dashboard.args }}
args: {{- include "common.tplvalues.render" (dict "value" .Values.dashboard.args "context" $) | nindent 12 }}
{{- end }}
env:
{{- if .Values.dashboard.extraEnvVars }}
{{- include "common.tplvalues.render" (dict "value" .Values.dashboard.extraEnvVars "context" $) | nindent 12 }}
{{- end }}
envFrom:
- configMapRef:
name: {{ include "common.names.fullname" . }}
{{- if .Values.dashboard.extraEnvVarsCM }}
- configMapRef:
name: {{ .Values.dashboard.extraEnvVarsCM }}
{{- end }}
{{- if .Values.dashboard.extraEnvVarsSecret }}
- secretRef:
name: {{ .Values.dashboard.extraEnvVarsSecret }}
{{- end }}
ports:
- name: dashboard-http
containerPort: 80
protocol: TCP
{{- if .Values.dashboard.livenessProbe.enabled }}
livenessProbe:
httpGet:
path: /
port: dashboard-http
initialDelaySeconds: {{ .Values.dashboard.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.dashboard.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.dashboard.livenessProbe.timeoutSeconds }}
successThreshold: {{ .Values.dashboard.livenessProbe.successThreshold }}
failureThreshold: {{ .Values.dashboard.livenessProbe.failureThreshold }}
{{- else if .Values.dashboard.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.dashboard.customLivenessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.dashboard.readinessProbe.enabled }}
readinessProbe:
httpGet:
path: /
port: dashboard-http
initialDelaySeconds: {{ .Values.dashboard.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.dashboard.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.dashboard.readinessProbe.timeoutSeconds }}
successThreshold: {{ .Values.dashboard.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.dashboard.readinessProbe.failureThreshold }}
{{- else if .Values.dashboard.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.dashboard.customReadinessProbe "context" $) | nindent 12 }}
{{- end }}
volumeMounts:
{{- if .Values.dashboard.extraVolumeMounts }}
{{- include "common.tplvalues.render" (dict "value" .Values.dashboard.extraVolumeMounts "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.dashboard.resources }}
resources: {{- toYaml .Values.dashboard.resources | nindent 12 }}
{{- end }}
- name: backend
securityContext: {{- toYaml .Values.backend.containerSecurityContext | nindent 12 }}
image: {{ template "backend.image" . }}
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
{{- if .Values.backend.command }}
command: {{- include "common.tplvalues.render" (dict "value" .Values.backend.command "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.backend.args }}
args: {{- include "common.tplvalues.render" (dict "value" .Values.backend.args "context" $) | nindent 12 }}
{{- end }}
env:
- name: DASHBOARD_PASSWORD
valueFrom:
secretKeyRef:
name: {{ include "backend.secretName" . }}
key: backend-password
- name: HYDRA_CLIENT_SECRET
valueFrom:
secretKeyRef:
name: {{ include "backend.secretName" . }}
key: oidc-client-secret
- name: KRATOS_URL
value: {{ .Values.backend.kratos.adminUrl }}
{{- if (include "backend.smtp.password.enabled" .) }}
- name: DASHBOARD_SMTP_PASSWORD
valueFrom:
secretKeyRef:
name: {{ include "backend.smtp.secretName" . }}
key: smtp-password
{{- end }}
{{- if .Values.backend.extraEnvVars }}
{{- include "common.tplvalues.render" (dict "value" .Values.backend.extraEnvVars "context" $) | nindent 12 }}
{{- end }}
envFrom:
- configMapRef:
name: {{ include "common.names.fullname" . }}
{{- if .Values.backend.extraEnvVarsCM }}
- configMapRef:
name: {{ .Values.backend.extraEnvVarsCM }}
{{- end }}
{{- if .Values.backend.extraEnvVarsSecret }}
- secretRef:
name: {{ .Values.backend.extraEnvVarsSecret }}
{{- end }}
ports:
- name: backend-http
containerPort: 5000
protocol: TCP
{{- if .Values.backend.livenessProbe.enabled }}
livenessProbe:
httpGet:
path: /
port: backend-http
initialDelaySeconds: {{ .Values.backend.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.backend.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.backend.livenessProbe.timeoutSeconds }}
successThreshold: {{ .Values.backend.livenessProbe.successThreshold }}
failureThreshold: {{ .Values.backend.livenessProbe.failureThreshold }}
{{- else if .Values.backend.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.backend.customLivenessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.backend.readinessProbe.enabled }}
readinessProbe:
httpGet:
path: /
port: backend-http
initialDelaySeconds: {{ .Values.backend.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.backend.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.backend.readinessProbe.timeoutSeconds }}
successThreshold: {{ .Values.backend.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.backend.readinessProbe.failureThreshold }}
{{- else if .Values.backend.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.backend.customReadinessProbe "context" $) | nindent 12 }}
{{- end }}
volumeMounts:
{{- if .Values.backend.extraVolumeMounts }}
{{- include "common.tplvalues.render" (dict "value" .Values.backend.extraVolumeMounts "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.backend.resources }}
resources: {{- toYaml .Values.backend.resources | nindent 12 }}
{{- end }}
{{- if .Values.sidecars }}
{{- include "common.tplvalues.render" (dict "value" .Values.sidecars "context" $) | nindent 8 }}
{{- end }}
volumes:
{{- if .Values.extraVolumes }}
{{- include "common.tplvalues.render" (dict "value" .Values.extraVolumes "context" $) | nindent 8 }}
{{- end }}
apiVersion: {{ template "common.capabilities.deployment.apiVersion" . }}
kind: Deployment
metadata:
name: {{ template "common.names.fullname" . }}-frontend
labels:
component: dashboard-frontend
{{- include "common.labels.standard" . | nindent 4 }}
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
component: dashboard-frontend
{{- if .Values.updateStrategy }}
strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
{{- end }}
template:
metadata:
labels:
component: dashboard-frontend
{{- include "common.labels.standard" . | nindent 8 }}
{{- if .Values.podLabels }}
{{- include "common.tplvalues.render" (dict "value" .Values.podLabels "context" $) | nindent 8 }}
{{- end }}
{{- if .Values.podAnnotations }}
annotations: {{- include "common.tplvalues.render" (dict "value" .Values.podAnnotations "context" $) | nindent 8 }}
{{- end }}
spec:
{{- include "dashboard.imagePullSecrets" . | nindent 6 }}
{{- if .Values.hostAliases }}
hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.hostAliases "context" $) | nindent 8 }}
{{- end }}
{{- if .Values.affinity }}
affinity: {{- include "common.tplvalues.render" (dict "value" .Values.affinity "context" $) | nindent 8 }}
{{- else }}
affinity:
podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.podAffinityPreset "context" $) | nindent 10 }}
podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.podAntiAffinityPreset "context" $) | nindent 10 }}
nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.nodeAffinityPreset.type "key" .Values.nodeAffinityPreset.key "values" .Values.nodeAffinityPreset.values) | nindent 10 }}
{{- end }}
{{- if .Values.nodeSelector }}
nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.nodeSelector "context" $) | nindent 8 }}
{{- end }}
{{- if .Values.tolerations }}
tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.tolerations "context" $) | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "dashboard.serviceAccountName" . }}
securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }}
initContainers:
{{- if .Values.initContainers }}
{{- include "common.tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }}
{{- end }}
containers:
- name: dashboard-frontend
securityContext: {{- toYaml .Values.dashboard.containerSecurityContext | nindent 10 }}
image: {{ template "dashboard.image" . }}
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
{{- if .Values.dashboard.command }}
command: {{- include "common.tplvalues.render" (dict "value" .Values.dashboard.command "context" $) | nindent 10 }}
{{- end }}
{{- if .Values.dashboard.args }}
args: {{- include "common.tplvalues.render" (dict "value" .Values.dashboard.args "context" $) | nindent 10 }}
{{- end }}
env:
{{- if .Values.dashboard.extraEnvVars }}
{{- include "common.tplvalues.render" (dict "value" .Values.dashboard.extraEnvVars "context" $) | nindent 10 }}
{{- end }}
envFrom:
- configMapRef:
name: {{ include "common.names.fullname" . }}
{{- if .Values.dashboard.extraEnvVarsCM }}
- configMapRef:
name: {{ .Values.dashboard.extraEnvVarsCM }}
{{- end }}
{{- if .Values.dashboard.extraEnvVarsSecret }}
- secretRef:
name: {{ .Values.dashboard.extraEnvVarsSecret }}
{{- end }}
ports:
- name: dashboard-http
containerPort: 80
protocol: TCP
{{- if .Values.dashboard.livenessProbe.enabled }}
livenessProbe:
httpGet:
path: /
port: dashboard-http
initialDelaySeconds: {{ .Values.dashboard.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.dashboard.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.dashboard.livenessProbe.timeoutSeconds }}
successThreshold: {{ .Values.dashboard.livenessProbe.successThreshold }}
failureThreshold: {{ .Values.dashboard.livenessProbe.failureThreshold }}
{{- else if .Values.dashboard.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.dashboard.customLivenessProbe "context" $) | nindent 10 }}
{{- end }}
{{- if .Values.dashboard.readinessProbe.enabled }}
readinessProbe:
httpGet:
path: /
port: dashboard-http
initialDelaySeconds: {{ .Values.dashboard.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.dashboard.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.dashboard.readinessProbe.timeoutSeconds }}
successThreshold: {{ .Values.dashboard.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.dashboard.readinessProbe.failureThreshold }}
{{- else if .Values.dashboard.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.dashboard.customReadinessProbe "context" $) | nindent 10 }}
{{- end }}
volumeMounts:
{{- if .Values.overlay }}
- name: overlay
mountPath: /overlay
{{- end }}
{{- if .Values.dashboard.extraVolumeMounts }}
{{- include "common.tplvalues.render" (dict "value" .Values.dashboard.extraVolumeMounts "context" $) | nindent 10 }}
{{- end }}
{{- if .Values.dashboard.resources }}
resources: {{- toYaml .Values.dashboard.resources | nindent 10 }}
{{- end }}
{{- if .Values.overlay }}
- name: rsync
image: toelke158/docker-rsync@sha256:277adb5c4080fd0d93c455c9a5db08c595834055234e3948b79dddac5f983d80
volumeMounts:
- name: overlay
mountPath: /overlay
{{- end }}
{{- if .Values.sidecars }}
{{- include "common.tplvalues.render" (dict "value" .Values.sidecars "context" $) | nindent 6 }}
{{- end }}
volumes:
{{- if .Values.overlay }}
- name: overlay
persistentVolumeClaim:
claimName: {{ template "common.names.fullname" . }}-overlay
{{- end }}
{{- if .Values.extraVolumes }}
{{- include "common.tplvalues.render" (dict "value" .Values.extraVolumes "context" $) | nindent 8 }}
{{- end }}
......@@ -40,3 +40,4 @@ spec:
{{- include "common.tplvalues.render" (dict "value" .Values.dashboard.service.extraPorts "context" $) | nindent 4 }}
{{- end }}
selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
component: dashboard-frontend
......@@ -8,7 +8,7 @@ metadata:
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
annotations:
"helm.sh/hook": post-install,post-upgrade
"helm.sh/hook": post-install
"helm.sh/hook-weight": "-5"
"helm.sh/hook-delete-policy": before-hook-creation
{{- if .Values.commonAnnotations }}
......@@ -21,39 +21,32 @@ spec:
component: dashboard
spec:
restartPolicy: Never
serviceAccountName: {{ include "dashboard.serviceAccountName" . }}
containers:
- name: {{ .Chart.Name }}-login-create-admin
image: {{ template "backend.image" . }}
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
envFrom:
- configMapRef:
name: {{ include "common.names.fullname" . }}
{{- if .Values.backend.extraEnvVarsCM }}
- configMapRef:
name: {{ .Values.backend.extraEnvVarsCM }}
{{- end }}
{{- if .Values.backend.extraEnvVarsSecret }}
- secretRef:
name: {{ .Values.backend.extraEnvVarsSecret }}
{{- end }}
- configMapRef:
name: {{ include "common.names.fullname" . }}
{{- if .Values.backend.extraEnvVarsCM }}
- configMapRef:
name: {{ .Values.backend.extraEnvVarsCM }}
{{- end }}
{{- if .Values.backend.extraEnvVarsSecret }}
- secretRef:
name: {{ .Values.backend.extraEnvVarsSecret }}
{{- end }}
env:
- name: SETUP_EMAIL
value: {{ .Values.backend.initialUser.email }}
- name: SETUP_PASSWORD
value: {{ .Values.backend.initialUser.password }}
- name: KRATOS_PUBLIC_URL
value: http://kratos-public:80
- name: SETUP_EMAIL
value: {{ .Values.backend.initialUser.email }}
- name: SETUP_PASSWORD
value: {{ .Values.backend.initialUser.password }}
- name: KRATOS_PUBLIC_URL
value: http://kratos-public:80
command: ["/bin/bash", "-c"]
args:
- flask db upgrade;
{{- if .Release.IsInstall }}
flask cli user create $SETUP_EMAIL;
flask cli user setpassword $SETUP_EMAIL $SETUP_PASSWORD;
flask cli app create dashboard Dashboard;
flask cli user setrole $SETUP_EMAIL dashboard admin;
flask cli user setrole $SETUP_EMAIL nextcloud admin;
flask cli user setrole $SETUP_EMAIL wordpress admin;
flask cli user setrole $SETUP_EMAIL wekan admin;
flask cli user setrole $SETUP_EMAIL zulip admin;
{{- end }}
- flask cli user create $SETUP_EMAIL;
flask cli user setpassword $SETUP_EMAIL $SETUP_PASSWORD;
flask cli app create dashboard Dashboard;
flask cli user setrole $SETUP_EMAIL dashboard admin;
......@@ -22,6 +22,7 @@ rules:
- get
- patch
- create
- watch
- apiGroups:
- helm.toolkit.fluxcd.io
resources:
......@@ -32,6 +33,13 @@ rules:
- get
- patch
- create
- apiGroups:
- source.toolkit.fluxcd.io
resources:
- gitrepositories
verbs:
- list
- get
- apiGroups:
- ""
resources:
......@@ -39,6 +47,7 @@ rules:
- configmaps
verbs:
- list
- watch
- get
- patch
- delete
......
apiVersion: v1
kind: Pod
metadata:
name: {{ template "common.names.fullname" . }}-cypress-test
labels: {{- include "common.labels.standard" . | nindent 4 }}
component: test
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
"helm.sh/hook": test
{{- else }}
annotations:
"helm.sh/hook": test
{{- end }}
spec:
containers:
- name: {{ template "common.names.fullname" . }}-cypress-test
image: {{ .Values.tests.image.registry }}/{{ .Values.tests.image.repository }}:{{ .Values.tests.image.tag }}
imagePullPolicy: {{ .Values.tests.image.pullPolicy }}
env:
- name: CYPRESS_BASE_URL
value: "https://{{ .Values.ingress.hostname }}"
- name: CYPRESS_SSO_USER
value: "{{ .Values.tests.credentials.user }}"
- name: CYPRESS_SSO_PASSWORD
value: "{{ .Values.tests.credentials.password }}"
restartPolicy: Never
......@@ -17,8 +17,8 @@ backend:
kratos:
publicUrl: https://sso.stackspin.example.org/kratos
# Public URL of login panel
loginPanelUrl: https://dashboard.stackspin.example.org/web/
# Public URL of dashboard
dashboardUrl: https://dashboard.stackspin.example.org
# Database connection
# databaseUrl: mysql+pymysql://stackspin:password@single-sign-on-database-mariadb/stackspin
......
......@@ -68,7 +68,7 @@ dashboard:
image:
registry: open.greenhost.net:4567
repository: stackspin/dashboard/dashboard
tag: 0.5.2
tag: 0.14.0
digest: ""
## Optionally specify an array of imagePullSecrets.
## Secrets must be manually created in the namespace.
......@@ -236,7 +236,7 @@ backend:
image:
registry: open.greenhost.net:4567
repository: stackspin/dashboard/dashboard-backend
tag: 0.5.2
tag: 0.14.0
digest: ""
## Optionally specify an array of imagePullSecrets.
## Secrets must be manually created in the namespace.
......@@ -263,8 +263,8 @@ backend:
hydra:
adminUrl: http://hydra-admin:4445
# Public URL of login panel
loginPanelUrl: https://dashboard.stackspin.example.org/web/
# Public URL of dashboard
dashboardUrl: https://dashboard.stackspin.example.org
databaseUrl: mysql+pymysql://stackspin:stackspin@single-sign-on-database-mariadb/stackspin
initialUser:
......@@ -660,8 +660,9 @@ ingress:
##
path: /
## @param ingress.pathType Ingress path type
## Should usually be ImplementationSpecific to allow regex matching.
##
pathType: Prefix
pathType: ImplementationSpecific
## @param ingress.annotations Ingress annotations done as key:value pairs
## For a full list of possible ingress annotations, please see
## ref: https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/nginx-configuration/annotations.md
......@@ -718,3 +719,18 @@ serviceAccount:
## @param backend.serviceAccount.annotations Annotations for service account. Evaluated as a template. Only used if `create` is `true`.
##
annotations: {}
# If true, mount a pvc `dashboard-overlay` into the frontend pod. The
# contents will be served from the root frontend URL, overlaying any existing
# or non-existing files from the docker image.
overlay: false
tests:
image:
registry: open.greenhost.net:4567
repository: stackspin/dashboard/cypress-test
tag: 0.14.0
pullPolicy: IfNotPresent
credentials:
user: ""
password: ""
......@@ -6,10 +6,19 @@ http {
listen [::]:80 default_server;
listen 80;
root /usr/share/nginx/html;
include /etc/nginx/mime.types;
# First try to serve from the overlay, for custom styling, icons etc.
# The directory `/overlay` is expected to be mounted at runtime.
location / {
root /overlay;
try_files $uri @docker;
}
# Default to serving from the directory with files copied into the
# docker image when building.
location @docker {
root /usr/share/nginx/html;
try_files $uri /index.html;
}
}
......
#!/usr/bin/env bash
# TODO:
# * Check that KUBECONFIG is set, maybe load automatically like before?
# * env var for native/docker mode
# * env var for local (or remote) docker image name
set -u
# If KUBECONFIG is not set, we try to find a kubeconfig file in a standard
# location.
if ! [[ -v KUBECONFIG ]]
then
if [ -f "$(pwd)/kubeconfig/kube_config_cluster.yml" ]
then
export KUBECONFIG="$(pwd)/kubeconfig/kube_config_cluster.yml"
elif [ -f "$(pwd)/backend/kubeconfig/kube_config_cluster.yml" ]
then
export KUBECONFIG="$(pwd)/backend/kubeconfig/kube_config_cluster.yml"
fi
if [[ -v KUBECONFIG ]]
then
echo "Local kubeconfig file found."
echo "Setting KUBECONFIG=$KUBECONFIG"
fi
fi
TELEPRESENCE_NOT_RUNNING=0
TELEPRESENCE_NATIVE=1
TELEPRESENCE_DOCKER=2
telepresenceRunning() {
status=$(telepresence status | head -n 1)
if [ "${status#*: }" == "Running" ]
then
echo "telepresence running"
daemonType="${status%%:*}"
echo "daemon type: $daemonType"
if [ "${daemonType##* }" == "container" ]
then
echo "This seems to be a docker-mode daemon."
return $TELEPRESENCE_DOCKER
else
echo "This seems to be a native-mode daemon."
return $TELEPRESENCE_NATIVE
fi
elif [ "${status#*: }" == "Not running" ]
then
echo "telepresence not running"
return $TELEPRESENCE_NOT_RUNNING
else
echo "Unknown telepresence state: $status"
exit 2
fi
}
telepresenceDns() {
telepresence status | grep -i 'Remote IP' | awk -F': ' '{print $2}'
}
prepareDocker() {
telepresenceRunning
case $? in
$TELEPRESENCE_NOT_RUNNING)
echo "Starting telepresence daemon in docker mode."
telepresence connect -n stackspin --docker || exit 3
;;
$TELEPRESENCE_NATIVE)
echo "Error: you want to start a docker-mode intercept, but there is a native telepresence daemon running. This is not currently supported."
exit 3
;;
$TELEPRESENCE_DOCKER)
echo "telepresence daemon already running; connecting to it."
telepresence connect -n stackspin --docker || exit 3
;;
esac
}
prepareNative() {
telepresenceRunning
case $? in
$TELEPRESENCE_NOT_RUNNING)
echo "Starting telepresence daemon in native mode."
telepresence connect -n stackspin || exit 3
;;
$TELEPRESENCE_NATIVE)
echo "telepresence daemon already running; connecting to it."
telepresence connect -n stackspin || exit 3
;;
$TELEPRESENCE_DOCKER)
echo "Error: you want to start a native-mode intercept, but there is a docker telepresence daemon running. This is not currently supported."
exit 3
;;
esac
}
runBackend() {
echo "Running dashboard backend locally and connecting to cluster."
case $mode in
"native")
pushd backend > /dev/null
source venv/bin/activate
echo "Stopping any previous intercept for dashboard-backend..."
telepresence leave dashboard-backend
echo "Starting new intercept for dashboard-backend..."
telepresence intercept dashboard-backend --service=dashboard-backend --port 5000:80 --mount=true --replace --env-file=./backend.env -- env TELEPRESENCE_MODE=native FLASK_DEBUG=1 LOG_LEVEL=DEBUG flask run --reload
deactivate
popd > /dev/null
;;
"docker")
echo "Stopping any previous intercept for dashboard-backend..."
telepresence leave dashboard-backend
telepresence intercept dashboard-backend --service=dashboard-backend --port 5000:80 --mount=true --replace --docker-run -- --dns $(telepresenceDns) -e TELEPRESENCE_MODE=docker dashboard-backend:test
esac
}
runBackendShell() {
echo "Running shell in the local dashboard backend environment."
pushd backend > /dev/null
source venv/bin/activate
env $(xargs <backend.env) bash
deactivate
popd > /dev/null
}
runFrontend() {
echo "Running dashboard frontend locally and connecting to cluster."
case $mode in
"native")
pushd frontend > /dev/null
echo "Stopping any previous intercept for dashboard-frontend..."
telepresence leave dashboard-frontend
telepresence intercept dashboard-frontend --service=dashboard --port 3000:80 --mount=true -- npm start --watch --verbose
popd > /dev/null
;;
"docker")
echo "Stopping any previous intercept for dashboard-frontend..."
telepresence leave dashboard-frontend
telepresence intercept dashboard-frontend --service=dashboard --port 3000:80 --mount=true --docker-run -- dashboard-frontend:test
;;
esac
}
setupFrontend() {
pushd frontend > /dev/null
npm install
popd > /dev/null
}
setupBackend() {
pushd backend > /dev/null
if ! [ -d venv ]
then
python3 -m venv venv
fi
source venv/bin/activate
pip install -r requirements.txt
deactivate
popd > /dev/null
}
setupCluster() {
telepresence helm install -f telepresence-values.yaml
}
cleanCluster() {
telepresence uninstall --all-agents
helm uninstall -n ambassador traffic-manager
}
if [ $# -eq 0 ]
then
echo "No command given. See README.md for help."
exit 1
fi
if [ "$1" == "reset" ]
then
telepresence quit -s
kubectl rollout restart -n ambassador deploy/traffic-manager
exit 0
fi
if [ "$1" == "backend-shell" ]
then
runBackendShell
exit 0
fi
if [ $# -eq 1 ]
then
mode="native"
else
mode=$2
fi
if [ $# -eq 2 ] && [ "$1" == "cluster" ] && [ "$2" == "clean" ]
then
echo "Removing all development modifications from remote cluster..."
cleanCluster
exit 0
fi
if [ $# -eq 2 ] && [ "$2" == "pause" ]
then
case $1 in
"backend")
kubectl set image -n stackspin deploy/dashboard-backend backend=docker.io/rancher/mirrored-pause:3.6
exit 0
;;
*)
echo "Unknown pause command: $1 $2"
exit 4
esac
fi
if [ $# -eq 2 ] && [ "$2" == "setup" ]
then
case $1 in
"backend")
setupBackend
exit 0
;;
"frontend")
setupFrontend
exit 0
;;
"cluster")
setupCluster
exit 0
;;
*)
echo "Unknown setup command: $1 $2"
exit 4
esac
fi
case $mode in
"docker")
prepareDocker
;;
"native")
prepareNative
;;
*)
echo "Unknown mode (should be docker or native): $mode"
exit 4
esac
case $1 in
"backend")
runBackend
;;
"frontend")
runFrontend
;;
*)
echo "Unknown command: $1"
exit 4
esac
version: "3"
services:
frontend:
build:
context: ./frontend
working_dir: "/home/node/app"
env_file: ./frontend/local.env
ports:
- "3000:3000"
# command: "yarn start"
stackspin_proxy:
image: nginx:1.23.2
ports:
- "8081:8081"
volumes:
- ./backend/proxy/default.conf:/etc/nginx/conf.d/default.conf
depends_on:
- kube_port_kratos_public
- flask_app
flask_app:
build:
context: ./backend
environment:
- FLASK_APP=app.py
- FLASK_ENV=development
- HYDRA_CLIENT_ID=dashboard-local
# Domain-specific URL settings
- HYDRA_AUTHORIZATION_BASE_URL=https://sso.$DOMAIN/oauth2/auth
- TOKEN_URL=https://sso.$DOMAIN/oauth2/token
- HYDRA_PUBLIC_URL=https://sso.$DOMAIN
# Local path overrides
- KRATOS_PUBLIC_URL=http://stackspin_proxy:8081/kratos
- KRATOS_ADMIN_URL=http://kube_port_kratos_admin:8000
- HYDRA_ADMIN_URL=http://kube_port_hydra_admin:4445
- LOGIN_PANEL_URL=http://stackspin_proxy:8081/web/
- DATABASE_URL=mysql+pymysql://stackspin:$DATABASE_PASSWORD@kube_port_mysql/stackspin
# ENV variables that are deployment-specific
- SECRET_KEY=$FLASK_SECRET_KEY
- HYDRA_CLIENT_SECRET=$HYDRA_CLIENT_SECRET
- KUBECONFIG=/.kube/config
# Disable loading config from the service account
- LOAD_INCLUSTER_CONFIG=false
ports:
- "5000:5000"
user: "${KUBECTL_UID}:${KUBECTL_GID}"
volumes:
- ./backend:/app
- "$KUBECONFIG:/.kube/config"
depends_on:
- kube_port_mysql
entrypoint: ["bash", "-c", "flask run --host $$(hostname -i)"]
kube_port_kratos_admin:
image: bitnami/kubectl:1.25.4
user: "${KUBECTL_UID}:${KUBECTL_GID}"
expose:
- 8000
volumes:
- "$KUBECONFIG:/.kube/config"
entrypoint: ["bash", "-c", "kubectl -n stackspin port-forward --address $$(hostname -i) service/kratos-admin 8000:80"]
kube_port_hydra_admin:
image: bitnami/kubectl:1.25.4
user: "${KUBECTL_UID}:${KUBECTL_GID}"
expose:
- 4445
volumes:
- "$KUBECONFIG:/.kube/config"
entrypoint: ["bash", "-c", "kubectl -n stackspin port-forward --address $$(hostname -i) service/hydra-admin 4445:4445"]
kube_port_kratos_public:
image: bitnami/kubectl:1.25.4
user: "${KUBECTL_UID}:${KUBECTL_GID}"
ports:
- "8080:8080"
expose:
- 8080
volumes:
- "$KUBECONFIG:/.kube/config"
entrypoint: ["bash", "-c", "kubectl -n stackspin port-forward --address 0.0.0.0 service/kratos-public 8080:80"]
kube_port_mysql:
image: bitnami/kubectl:1.25.4
user: "${KUBECTL_UID}:${KUBECTL_GID}"
expose:
- 3306
volumes:
- "$KUBECONFIG:/.kube/config"
entrypoint: ["bash", "-c", "kubectl -n stackspin port-forward --address $$(hostname -i) service/single-sign-on-database-mariadb 3306:3306"]
......@@ -25,9 +25,11 @@ module.exports = {
project: './tsconfig.json',
tsconfigRootDir: __dirname,
},
root: true,
rules: {
'@typescript-eslint/explicit-function-return-type': 'off',
'@typescript-eslint/explicit-module-boundary-types': 'off',
'@typescript-eslint/default-param-last': 'off',
'no-param-reassign': ['error', { props: false }],
'jsx-a11y/anchor-is-valid': 'off',
'no-console': ['warn', { allow: ['debug', 'info', 'time', 'timeEnd', 'trace', 'error'] }],
......
FROM node:18
FROM node:20
ADD . .
WORKDIR /home/node/app
# First copy only files necessary for installing dependencies, so that we can
# cache that step even when our own source code changes.
COPY package.json yarn.lock ./
RUN yarn install
# Now copy the rest of the source.
COPY . .
ENV NODE_OPTIONS="--openssl-legacy-provider"
CMD yarn start
const webpack = require('webpack')
module.exports = {
style: {
postcss: {
postcssOptions: {
/* eslint-disable global-require */
plugins: [require('tailwindcss'), require('autoprefixer')],
plugins: [
require('tailwindcss'),
require('autoprefixer'),
],
},
},
webpack: {
configure: {
resolve: {
fallback: {
buffer: require.resolve('buffer'),
},
},
plugins: [
new webpack.ProvidePlugin({
Buffer: ['buffer', 'Buffer'],
}),
],
},
},
};
REACT_APP_API_URL=http://stackspin_proxy:8081/api/v1
REACT_APP_HYDRA_PUBLIC_URL=https://sso.init.stackspin.net
......@@ -3,26 +3,35 @@
"version": "0.1.1",
"private": true,
"dependencies": {
"@craco/craco": "^6.2.0",
"@craco/craco": "^7.1.0",
"@headlessui/react": "^1.3.0",
"@headlessui/tailwindcss": "^0.2.0",
"@heroicons/react": "^1.0.3",
"@hookform/resolvers": "^2.6.1",
"@tailwindcss/forms": "^0.3.3",
"@tailwindcss/typography": "^0.4.1",
"@tailwindcss/forms": "^0.5.7",
"@tailwindcss/typography": "^0.5.10",
"@tanstack/match-sorter-utils": "^8.8.4",
"@tanstack/react-table": "^8.9.3",
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10",
"@types/jest": "^26.0.15",
"@types/js-yaml": "^4.0.5",
"@types/md5": "^2.3.5",
"@types/node": "^18.0.0",
"@types/react-dom": "^17.0.2",
"@types/react-tag-autocomplete": "^6.3.3",
"axios": "^0.21.1",
"clsx": "^1.1.1",
"dayjs": "^1.11.10",
"gray-matter": "^4.0.3",
"lint-staged": "^11.1.1",
"lodash": "^4.17.21",
"md5": "^2.3.0",
"node-polyfill-webpack-plugin": "^3.0.0",
"prismjs": "^1.24.1",
"react": "17.0.2",
"react-dom": "^17.0.2",
"react-gauge-component": "^1.1.30",
"react-gravatar": "^2.6.3",
"react-helmet": "^6.1.0",
"react-hook-form": "^7.22.0",
......@@ -31,16 +40,18 @@
"react-redux": "^7.2.4",
"react-router": "6.2.1",
"react-router-dom": "6.2.1",
"react-scripts": "4.0.3",
"react-scripts": "5.0.1",
"react-simple-code-editor": "^0.11.0",
"react-table": "^7.7.0",
"react-tag-autocomplete": "^6.3.0",
"redux": "^4.1.0",
"redux-persist": "^6.0.0",
"redux-thunk": "^2.3.0",
"tailwindcss": "npm:@tailwindcss/postcss7-compat",
"remark-gfm": "^3.0.1",
"typescript": "^4.1.2",
"urlcat": "^2.0.4",
"web-vitals": "^1.0.1",
"yaml": "^2.3.4",
"yup": "^0.32.9"
},
"scripts": {
......@@ -57,45 +68,45 @@
"react-app/jest"
]
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
},
"browserslist": [
">0.2%",
"not dead",
"not op_mini all"
],
"devDependencies": {
"@types/lodash": "^4.14.171",
"@types/lodash": "^4.14.202",
"@types/prismjs": "^1.16.6",
"@types/react": "17.0.2",
"@types/react-gravatar": "^2.6.10",
"@types/react-helmet": "^6.1.2",
"@types/react-router-dom": "^5.3.3",
"@types/react-table": "^7.7.2",
"autoprefixer": "^9",
"autoprefixer": "^9.8.8",
"dotenv": "^10.0.0",
"eslint-config-airbnb": "^18.2.1",
"eslint-config-airbnb-typescript": "^12.3.1",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-cypress": "^2.11.3",
"eslint-plugin-import": "^2.23.4",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-promise": "^5.1.0",
"postcss": "^7",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-airbnb-typescript": "^17.1.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-cypress": "^2.15.1",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-prettier": "^5.1.2",
"eslint-plugin-promise": "^6.1.1",
"postcss": "^8.4.32",
"postcss-flexbugs-fixes": "^5.0.2",
"postcss-preset-env": "^9.3.0",
"pre-commit": "^1.2.2",
"prettier": "^2.3.2",
"sass": "^1.36.0"
"prettier": "^3.1.1",
"sass": "^1.36.0",
"tailwindcss": "^3.4.0"
},
"resolutions": {
"@types/react": "17.0.2",
"@types/react-dom": "17.0.2"
},
"overrides": {
"eslint-config-react-app": {
"@typescript-eslint/eslint-plugin": "6.17.0"
}
},
"pre-commit": "lint-staged",
"lint-staged": {
"*.{js,ts,tsx}": [
......
<svg width="800" height="800" viewBox="0 0 800 800" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0)">
<path fill-rule="evenodd" clip-rule="evenodd" d="M524.983 411.015C535.179 405.936 544.236 398.116 550.046 388.744L550.047 388.923V494.022C550.047 508.307 541.971 521.361 529.197 527.723L338.902 622.499C297.993 642.874 249.956 613.08 249.956 567.331C249.956 555.398 256.703 544.493 267.374 539.178L360.458 492.817C361.91 492.186 363.355 491.513 364.794 490.797L524.983 411.015Z" fill="black"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M440.425 320.391C479.816 300.772 524.639 318.888 542.315 354.745C546.412 363.055 545.592 371.715 541.313 379.739C536.968 387.886 529.109 395.17 519.758 399.827L359.569 479.609C320.179 499.227 275.358 481.111 257.682 445.256C253.585 436.947 254.405 428.286 258.684 420.263C263.029 412.115 270.888 404.831 280.239 400.174L440.425 320.391Z" fill="black"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M275.017 388.985C264.82 394.064 255.764 401.884 249.954 411.256L249.953 411.077L249.953 305.978C249.953 291.693 258.029 278.639 270.803 272.277L461.098 177.501C502.007 157.126 550.044 186.92 550.044 232.669C550.044 244.602 543.297 255.507 532.626 260.822L439.542 307.183C438.09 307.814 436.645 308.487 435.206 309.203L275.017 388.985Z" fill="black"/>
</g>
<defs>
<clipPath id="clip0">
<rect width="800" height="800" fill="white"/>
</clipPath>
</defs>
</svg>
<svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="#157983">
<path d="M2.003 5.884L10 9.882l7.997-3.998A2 2 0 0016 4H4a2 2 0 00-1.997 1.884z" />
<path d="M18 8.118l-8 4-8-4V14a2 2 0 002 2h12a2 2 0 002-2V8.118z" />
</svg>
\ No newline at end of file
<svg viewBox="0 0 212 212" xmlns="http://www.w3.org/2000/svg">
<style type="text/css">
circle {
fill: none;
stroke: #000;
stroke-width: 15;
}
path {
fill: none;
stroke: #000;
stroke-width: 25;
}
.orange {
stroke:#ff6600;
}
.red {
stroke:#d40000;
}
</style>
<g transform="translate(6,6)">
<path d="M58 168 v-98 a50 50 0 0 1 50-50 h20" class="orange" />
<path d="M58 168 v-30 a50 50 0 0 1 50-50 h20" class="red" />
<circle cx="142" cy="20" r="18" class="orange" />
<circle cx="142" cy="88" r="18" class="red" />
<circle cx="58" cy="180" r="18" class="red" />
</g>
</svg>
<?xml version="1.0" encoding="UTF-8"?>
<svg version="1.1" id="main_outline" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 640 640" style="enable-background:new 0 0 640 640;" xml:space="preserve">
<g>
<path id="teabag" style="fill:#FFFFFF" d="M395.9,484.2l-126.9-61c-12.5-6-17.9-21.2-11.8-33.8l61-126.9c6-12.5,21.2-17.9,33.8-11.8 c17.2,8.3,27.1,13,27.1,13l-0.1-109.2l16.7-0.1l0.1,117.1c0,0,57.4,24.2,83.1,40.1c3.7,2.3,10.2,6.8,12.9,14.4 c2.1,6.1,2,13.1-1,19.3l-61,126.9C423.6,484.9,408.4,490.3,395.9,484.2z"/>
<g>
<g>
<path style="fill:#609926" d="M622.7,149.8c-4.1-4.1-9.6-4-9.6-4s-117.2,6.6-177.9,8c-13.3,0.3-26.5,0.6-39.6,0.7c0,39.1,0,78.2,0,117.2 c-5.5-2.6-11.1-5.3-16.6-7.9c0-36.4-0.1-109.2-0.1-109.2c-29,0.4-89.2-2.2-89.2-2.2s-141.4-7.1-156.8-8.5 c-9.8-0.6-22.5-2.1-39,1.5c-8.7,1.8-33.5,7.4-53.8,26.9C-4.9,212.4,6.6,276.2,8,285.8c1.7,11.7,6.9,44.2,31.7,72.5 c45.8,56.1,144.4,54.8,144.4,54.8s12.1,28.9,30.6,55.5c25,33.1,50.7,58.9,75.7,62c63,0,188.9-0.1,188.9-0.1s12,0.1,28.3-10.3 c14-8.5,26.5-23.4,26.5-23.4s12.9-13.8,30.9-45.3c5.5-9.7,10.1-19.1,14.1-28c0,0,55.2-117.1,55.2-231.1 C633.2,157.9,624.7,151.8,622.7,149.8z M125.6,353.9c-25.9-8.5-36.9-18.7-36.9-18.7S69.6,321.8,60,295.4 c-16.5-44.2-1.4-71.2-1.4-71.2s8.4-22.5,38.5-30c13.8-3.7,31-3.1,31-3.1s7.1,59.4,15.7,94.2c7.2,29.2,24.8,77.7,24.8,77.7 S142.5,359.9,125.6,353.9z M425.9,461.5c0,0-6.1,14.5-19.6,15.4c-5.8,0.4-10.3-1.2-10.3-1.2s-0.3-0.1-5.3-2.1l-112.9-55 c0,0-10.9-5.7-12.8-15.6c-2.2-8.1,2.7-18.1,2.7-18.1L322,273c0,0,4.8-9.7,12.2-13c0.6-0.3,2.3-1,4.5-1.5c8.1-2.1,18,2.8,18,2.8 l110.7,53.7c0,0,12.6,5.7,15.3,16.2c1.9,7.4-0.5,14-1.8,17.2C474.6,363.8,425.9,461.5,425.9,461.5z"/>
<path style="fill:#609926" d="M326.8,380.1c-8.2,0.1-15.4,5.8-17.3,13.8c-1.9,8,2,16.3,9.1,20c7.7,4,17.5,1.8,22.7-5.4 c5.1-7.1,4.3-16.9-1.8-23.1l24-49.1c1.5,0.1,3.7,0.2,6.2-0.5c4.1-0.9,7.1-3.6,7.1-3.6c4.2,1.8,8.6,3.8,13.2,6.1 c4.8,2.4,9.3,4.9,13.4,7.3c0.9,0.5,1.8,1.1,2.8,1.9c1.6,1.3,3.4,3.1,4.7,5.5c1.9,5.5-1.9,14.9-1.9,14.9 c-2.3,7.6-18.4,40.6-18.4,40.6c-8.1-0.2-15.3,5-17.7,12.5c-2.6,8.1,1.1,17.3,8.9,21.3c7.8,4,17.4,1.7,22.5-5.3 c5-6.8,4.6-16.3-1.1-22.6c1.9-3.7,3.7-7.4,5.6-11.3c5-10.4,13.5-30.4,13.5-30.4c0.9-1.7,5.7-10.3,2.7-21.3 c-2.5-11.4-12.6-16.7-12.6-16.7c-12.2-7.9-29.2-15.2-29.2-15.2s0-4.1-1.1-7.1c-1.1-3.1-2.8-5.1-3.9-6.3c4.7-9.7,9.4-19.3,14.1-29 c-4.1-2-8.1-4-12.2-6.1c-4.8,9.8-9.7,19.7-14.5,29.5c-6.7-0.1-12.9,3.5-16.1,9.4c-3.4,6.3-2.7,14.1,1.9,19.8 C343.2,346.5,335,363.3,326.8,380.1z"/>
</g>
</g>
</g>
</svg>
\ No newline at end of file