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.

Sign up for GitHub

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

Jump to bottom

chore: test PR subsequent commits #1858

Merged
merged 7 commits into from
Mar 7, 2024
Merged

chore: test PR subsequent commits #1858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c6420c8
chore: test PR subsequent commits
mishraomp Mar 6, 2024
2fffa35
revert ID
mishraomp Mar 6, 2024
6271740
ALways pull
mishraomp Mar 6, 2024
0e64e5d
test
mishraomp Mar 6, 2024
0f59ba2
Roll deployments every time
DerekRoberts Mar 7, 2024
d51c59c
revert to caps
mishraomp Mar 7, 2024
715c72a
Tiny change to test rollouts
DerekRoberts Mar 7, 2024
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
5 changes: 3 additions & 2 deletions charts/app/templates/backend/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ spec:
template:
metadata:
annotations:
rollme: {{ randAlphaNum 5 | quote }}
prometheus.io/scrape: 'true'
prometheus.io/port: '3000'
prometheus.io/path: '/api/metrics'
Expand All @@ -30,7 +31,7 @@ spec:
initContainers:
- name: {{ include "backend.fullname" . }}-init
image: "{{.Values.global.registry}}/{{.Values.global.repository}}/migrations:{{ .Values.global.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ default "IfNotPresent" .Values.backend.imagePullPolicy }}
imagePullPolicy: {{ default "Always" .Values.backend.imagePullPolicy }}
envFrom:
- secretRef:
name: {{.Release.Name}}
Expand All @@ -55,7 +56,7 @@ spec:
{{- toYaml .Values.backend.securityContext | nindent 12 }}
{{- end }}
image: "{{.Values.global.registry}}/{{.Values.global.repository}}/backend:{{ .Values.global.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ default "IfNotPresent" .Values.backend.imagePullPolicy }}
imagePullPolicy: {{ default "Always" .Values.backend.imagePullPolicy }}
envFrom:
- secretRef:
name: {{.Release.Name}}
Expand Down
3 changes: 2 additions & 1 deletion charts/app/templates/frontend/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ spec:
template:
metadata:
annotations:
rollme: {{ randAlphaNum 5 | quote }}
prometheus.io/scrape: 'true'
prometheus.io/port: '3003'
prometheus.io/path: '/metrics'
Expand All @@ -33,7 +34,7 @@ spec:
capabilities:
add: [ "NET_BIND_SERVICE" ]
image: "{{.Values.global.registry}}/{{.Values.global.repository}}/frontend:{{ .Values.global.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ default "IfNotPresent" .Values.frontend.imagePullPolicy }}
imagePullPolicy: {{ default "Always" .Values.frontend.imagePullPolicy }}
env:
- name: BACKEND_URL
value: "http://{{ .Release.Name }}-backend"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Dashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import TableCell from '@mui/material/TableCell'
import TableRow from '@mui/material/TableRow'
import { DataGrid, GridToolbar } from '@mui/x-data-grid'
import { useEffect, useState } from 'react'
import { AxiosResponse } from '~/axios'
import type { AxiosResponse } from '~/axios'

const columns = [
{
Expand Down