diff --git a/dst_dashboard/k8s/backend.yaml b/dst_dashboard/k8s/backend.yaml index 4019d83a..07c0daab 100644 --- a/dst_dashboard/k8s/backend.yaml +++ b/dst_dashboard/k8s/backend.yaml @@ -1,3 +1,4 @@ +# Prod is deployed by Fleet from iftech/vaclab-2 (fleet/dst-dashboard, branch mamoutou/system_workload_migration); keep this copy in sync. apiVersion: v1 kind: ConfigMap metadata: @@ -7,6 +8,7 @@ data: config.yaml: | # DST Explorer Configuration # Global datasources - defined once, referenced by all experiments + # Do not use to load experiments (deprecated) datasources: - name: victoria-logs @@ -32,6 +34,7 @@ spec: metadata: labels: app: dst-dashboard-backend + app.kubernetes.io/name: dst-dashboard-backend spec: affinity: nodeAffinity: @@ -49,7 +52,7 @@ spec: effect: "PreferNoSchedule" containers: - name: dst-dashboard-backend - image: mamoutoudiarra/dst-dashboard-backend:v0.5 + image: mamoutoudiarra/dst-dashboard-backend:v1.4 imagePullPolicy: IfNotPresent ports: - containerPort: 8000 @@ -58,7 +61,7 @@ spec: - name: DST_MONGO_URI valueFrom: secretKeyRef: - name: dst-mongo-dev-credentials + name: dst-mongo-prod-credentials key: uri - name: DST_JWT_SECRET valueFrom: @@ -67,6 +70,8 @@ spec: key: secret - name: DST_CONFIG_PATH value: /app/config/config.yaml + - name: DST_ALLOWED_ORIGINS + value: "https://dashboard.lab.vac.dev,https://dev.dashboard.lab.vac.dev" volumeMounts: - name: config mountPath: /app/config @@ -74,7 +79,7 @@ spec: resources: requests: memory: "4Gi" - cpu: "4" + cpu: "1" limits: memory: "16Gi" cpu: "8" diff --git a/dst_dashboard/k8s/frontend-dev.yaml b/dst_dashboard/k8s/frontend-dev.yaml new file mode 100644 index 00000000..d1bba8ac --- /dev/null +++ b/dst_dashboard/k8s/frontend-dev.yaml @@ -0,0 +1,86 @@ +# Not in Fleet; applied by hand. +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: dst-dashboard-frontend-dev + namespace: dst-dashboard +spec: + serviceName: dst-dashboard-frontend-dev + replicas: 2 + selector: + matchLabels: + app: dst-dashboard-frontend-dev + template: + metadata: + labels: + app: dst-dashboard-frontend-dev + app.kubernetes.io/name: dst-dashboard-frontend-dev + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/hostname + operator: In + values: + - metal-01.he-eu-hel1.misc.vacdst + tolerations: + - key: "dedicated" + operator: "Equal" + value: "monitoring" + effect: "PreferNoSchedule" + containers: + - name: frontend-dev + image: mamoutoudiarra/dst-dashboard-frontend:dev-v1.0 + imagePullPolicy: IfNotPresent + ports: + - containerPort: 80 + name: http + resources: + requests: + memory: "512Mi" + cpu: "500m" + limits: + memory: "2Gi" + cpu: "2" +--- +apiVersion: v1 +kind: Service +metadata: + name: dst-dashboard-frontend-dev + namespace: dst-dashboard +spec: + selector: + app: dst-dashboard-frontend-dev + ports: + - protocol: TCP + port: 80 + targetPort: 80 + type: ClusterIP +--- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: dst-dashboard-frontend-dev-ingress + namespace: dst-dashboard + annotations: + traefik.ingress.kubernetes.io/router.middlewares: default-redirect-https@kubernetescrd + cert-manager.io/cluster-issuer: letsencrypt-prod +spec: + ingressClassName: traefik + tls: + - hosts: + - dev.dashboard.lab.vac.dev + secretName: dashboard-frontend-dev-tls + rules: + - host: dev.dashboard.lab.vac.dev + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: dst-dashboard-frontend-dev + port: + number: 80 diff --git a/dst_dashboard/k8s/frontend.yaml b/dst_dashboard/k8s/frontend.yaml index ebf1fdcf..926c3e26 100644 --- a/dst_dashboard/k8s/frontend.yaml +++ b/dst_dashboard/k8s/frontend.yaml @@ -1,3 +1,4 @@ +# Prod is deployed by Fleet from iftech/vaclab-2 (fleet/dst-dashboard, branch mamoutou/system_workload_migration); keep this copy in sync. apiVersion: apps/v1 kind: StatefulSet metadata: @@ -13,6 +14,7 @@ spec: metadata: labels: app: dst-dashboard-frontend + app.kubernetes.io/name: dst-dashboard-frontend spec: affinity: nodeAffinity: @@ -30,7 +32,7 @@ spec: effect: "PreferNoSchedule" containers: - name: frontend - image: mamoutoudiarra/dst-dashboard-frontend:v0.5 + image: mamoutoudiarra/dst-dashboard-frontend:v0.6 imagePullPolicy: IfNotPresent ports: - containerPort: 80 diff --git a/dst_dashboard/k8s/mongodb-dev.yaml b/dst_dashboard/k8s/mongodb-dev.yaml index d668d28d..59985b5c 100644 --- a/dst_dashboard/k8s/mongodb-dev.yaml +++ b/dst_dashboard/k8s/mongodb-dev.yaml @@ -1,3 +1,4 @@ +# Not in Fleet; applied by hand. Needs the dst-mongo-dev-root-credentials Secret (keys username, password). apiVersion: v1 kind: PersistentVolumeClaim metadata: @@ -75,7 +76,7 @@ metadata: name: mongodb-dev namespace: dst-dashboard spec: - type: LoadBalancer + type: ClusterIP selector: app: mongodb-dev ports: diff --git a/dst_dashboard/k8s/mongodb-prod.yaml b/dst_dashboard/k8s/mongodb-prod.yaml index 5c22dd37..c9babc12 100644 --- a/dst_dashboard/k8s/mongodb-prod.yaml +++ b/dst_dashboard/k8s/mongodb-prod.yaml @@ -1,3 +1,4 @@ +# Prod is deployed by Fleet from iftech/vaclab-2 (fleet/dst-dashboard, branch mamoutou/system_workload_migration); keep this copy in sync. apiVersion: v1 kind: PersistentVolumeClaim metadata: @@ -53,12 +54,12 @@ spec: - name: MONGO_INITDB_ROOT_USERNAME valueFrom: secretKeyRef: - name: dst-mongo-prod-root-credentials + name: dst-mongo-prod-credentials key: username - name: MONGO_INITDB_ROOT_PASSWORD valueFrom: secretKeyRef: - name: dst-mongo-prod-root-credentials + name: dst-mongo-prod-credentials key: password volumeMounts: - name: mongo-data-prod