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

[deploy] Set helm resources; Pin workflows to ubuntu-22.04; Fix Docker logging #3405

Merged
merged 168 commits into from
Oct 30, 2024
Merged
Show file tree
Hide file tree
Changes from 166 commits
Commits
Show all changes
168 commits
Select commit Hold shift + click to select a range
3801b0f
pre test otel for word entry
andracc Jun 7, 2024
bd07ade
basic word creating tracing
andracc Jun 11, 2024
15f55cf
fuller tagging
andracc Jun 11, 2024
18065a3
git rebase issue fixed and initial metric setup
andracc Jun 12, 2024
6379e21
get user location with banner
andracc Jun 24, 2024
f0c02d1
handle null context and exceptions
andracc Jun 24, 2024
9dc3639
OtelKernel formatting
andracc Jun 25, 2024
84d9cb4
draft location in OtelKernel
andracc Jun 25, 2024
3b08cef
draft location caching
andracc Jul 1, 2024
b9d18c4
draft LocationEnricher
andracc Jul 2, 2024
ab41fa4
upgrade language version
andracc Jul 3, 2024
2a591d7
LocationEnricher only works once
andracc Jul 5, 2024
64f8266
address BannerControllerTests
andracc Jul 5, 2024
f5bd9fc
send to honeycomb
andracc Jul 8, 2024
b7e01b4
location cache fixed
andracc Jul 18, 2024
9f07b71
introducing telemetry helm chart
andracc Aug 8, 2024
bcb6319
Fix get_release() to convert '/' to '-' characters
jmgrady Aug 9, 2024
c0a13bc
Update deployment variables for external image
jmgrady Aug 9, 2024
26cc132
profile helm charts
andracc Aug 12, 2024
7617888
enable telemetry dependency
andracc Aug 13, 2024
9e5e47e
Merge branch 'master' into otel/initial-instrumentation
andracc Aug 13, 2024
53825e4
suppressed warning was resolved
andracc Aug 13, 2024
d65c3e5
Revert "suppressed warning was resolved"
andracc Aug 13, 2024
c8e1f9b
remove warning suppression
andracc Aug 13, 2024
ca544ba
install telemetry chart once as dependency
andracc Aug 15, 2024
247da4d
added otel service
andracc Aug 19, 2024
3b19691
Merge branch 'master' into otel/initial-instrumentation
andracc Aug 19, 2024
9cf971c
send OTEL to HC without collector
andracc Aug 20, 2024
474e141
send OTEL to HC without collector (fixed header)
andracc Aug 21, 2024
ec28701
Merge branch 'otel/initial-instrumentation' of https://github.com/sil…
andracc Aug 21, 2024
3ef46fb
moving to telemetry chart - in progress
andracc Aug 21, 2024
f3ce8b1
disable sending to HC from backend deployment
andracc Aug 22, 2024
eec8a8f
external-IP localhost with loadbalancer - undo
andracc Aug 22, 2024
9c3a656
config values for off-shelf chart
andracc Aug 26, 2024
59f1c1c
setup otel chart during cluster setup - in progress
andracc Aug 29, 2024
005b4cf
Add ability to provide secrets to 3rd-party charts
jmgrady Aug 28, 2024
3fb48fe
Replace "secrets" section with "additional_args"
jmgrady Aug 29, 2024
f858bde
Comment out example code
jmgrady Aug 29, 2024
6d647f4
use additional args instead of override for cluster install
andracc Aug 29, 2024
8d18ca2
fix setting secret
andracc Aug 29, 2024
1675cbb
Merge branch 'master' into otel/initial-instrumentation
andracc Aug 30, 2024
10c2e57
use target serverName as otel serviceName
andracc Sep 4, 2024
00ff933
custom otel service name based on target
andracc Sep 4, 2024
aa1f112
variable path in otel chart setup
andracc Sep 5, 2024
6da8ff2
note about reserved variable name
andracc Sep 5, 2024
5a47b27
Updates to setup_cluster.py
jmgrady Sep 5, 2024
8beab56
fix phrasing
andracc Sep 6, 2024
6a2b6c5
Merge remote-tracking branch 'origin/setup-cluster-changes' into otel…
andracc Sep 6, 2024
35f3101
after fmt-backend script
andracc Sep 6, 2024
6e79da7
after tox (remove unused import)
andracc Sep 6, 2024
d519822
provide helm exit status in info
andracc Sep 6, 2024
00c2977
backend serviceName as library.name in split HC charts
andracc Sep 6, 2024
372118d
check cov with tracerprovider
andracc Sep 18, 2024
e69f949
check cov with auth
andracc Sep 18, 2024
7e004b1
remove custom otel helm chart setup
andracc Sep 19, 2024
8867a83
save location test draft
andracc Sep 23, 2024
de9fbc0
change var name for ActivitySource
andracc Sep 23, 2024
f26bc45
one function for activity creation in Otel service
andracc Sep 24, 2024
bd8a3d7
separate code to exclude from testing
andracc Sep 24, 2024
9bf3355
clean Kernel
andracc Sep 24, 2024
0d8b6c5
test adding instrumentation and activity tag
andracc Sep 24, 2024
bd38789
LocationProvider interface and mock
andracc Sep 25, 2024
7c62e41
change location file name to match class
andracc Sep 25, 2024
ad17c22
clean otelservice
andracc Sep 25, 2024
8e54e30
initial otelkernel tests
andracc Sep 25, 2024
315d034
Add session id to frontend and send to backend
imnasnainaec Sep 24, 2024
ccf10aa
gets sessionId that was set in frontend
andracc Sep 26, 2024
8098773
cleaning OtelKernel
andracc Sep 26, 2024
d0329a1
tag is regionName (full) rather than region (abbrev)
andracc Sep 26, 2024
21598c0
redact ip from trace info
andracc Sep 27, 2024
5fa788b
pre combining client mock and test
andracc Sep 30, 2024
c546814
location testing mid memorycache
andracc Sep 30, 2024
4166310
pass along session baggage
andracc Oct 1, 2024
36c47fb
fixed test file names
andracc Oct 7, 2024
9c46644
async method not getting invoked
andracc Oct 7, 2024
b155e27
changes pre missing json token
andracc Oct 8, 2024
0ab03ea
valid json in httpresponsemessage content
andracc Oct 8, 2024
84795e6
cleaner json content
andracc Oct 9, 2024
6f75768
fixed ip mocking
andracc Oct 9, 2024
a119910
caching works
andracc Oct 9, 2024
4aa2403
get mocked ip rather than hard-code
andracc Oct 9, 2024
7e229cc
mock httpclient all within setup method
andracc Oct 9, 2024
3642baf
use real cache rather than mock
andracc Oct 9, 2024
1554c77
clean LP test and code
andracc Oct 9, 2024
5ba2b27
rename LP tests
andracc Oct 9, 2024
2eac403
AddOtelTag returns activity
andracc Oct 9, 2024
3c705ba
Merge branch 'master' into otel/initial-instrumentation
andracc Oct 9, 2024
7214fc3
not yet testing session
andracc Oct 9, 2024
20e5565
removing spaces
andracc Oct 9, 2024
a106f7a
try removing comments for formatting
andracc Oct 9, 2024
168f4db
try removing comments in func
andracc Oct 9, 2024
d6ccbd5
try removing object creation
andracc Oct 9, 2024
8c37dee
separate kernel classes and tmp comment test
andracc Oct 9, 2024
a5a6801
try moving onend from namespace
andracc Oct 9, 2024
ecb29be
try change end of line settings
andracc Oct 9, 2024
1836c65
revert end of line setting
andracc Oct 9, 2024
a9212e8
try remove more spaces
andracc Oct 9, 2024
99f7853
try simple OnEnd
andracc Oct 10, 2024
ee382de
try remove onend
andracc Oct 10, 2024
e5b68fa
try func signature
andracc Oct 10, 2024
3a4883a
try move onend
andracc Oct 10, 2024
c04bbb5
try move onend before otelkernel class
andracc Oct 10, 2024
76de569
formatted with updated dotnet format script
andracc Oct 10, 2024
3da4411
clean files for code review (besides kernel/service)
andracc Oct 10, 2024
5e70834
.59 method coverage
andracc Oct 11, 2024
d2769d1
.44 method coverage
andracc Oct 11, 2024
41415ec
OtelService and test for review
andracc Oct 11, 2024
31b29d1
Merge branch 'master' into otel/initial-instrumentation
andracc Oct 11, 2024
090ff52
proper format should pass test
andracc Oct 11, 2024
3ddb850
tmp save adding session
andracc Oct 12, 2024
9c3f93c
mid cleaning session testing
andracc Oct 12, 2024
f0220ef
basic session, location, ip testing
andracc Oct 12, 2024
b4bde92
address first code review
andracc Oct 13, 2024
d2ae959
address second code review
andracc Oct 14, 2024
1146711
updated license
andracc Oct 14, 2024
ae0ff12
update and clean packages
andracc Oct 14, 2024
1846a51
more descriptive function name
andracc Oct 14, 2024
1c2f890
cleaning unneeded code
andracc Oct 14, 2024
9175c96
Merge branch 'master' into otel/initial-instrumentation
andracc Oct 15, 2024
b46cdc3
addressed status, mem lim, cleaning tests, comments
andracc Oct 15, 2024
21dedca
address test cleaning
andracc Oct 16, 2024
bb87463
DisplayName should specify function
andracc Oct 16, 2024
be738d7
Fix activity tagging per Kevin H's suggestions
imnasnainaec Oct 16, 2024
0e2b718
Merge branch 'otel/initial-instrumentation' of https://github.com/sil…
imnasnainaec Oct 16, 2024
4de8243
remove OtelService method for instrumentation
andracc Oct 16, 2024
32c2569
more specific constants in OtelKernelTests
andracc Oct 16, 2024
59fab9d
use variable locationGetterUri
andracc Oct 16, 2024
be6c6fc
Merge branch 'otel/initial-instrumentation' of https://github.com/sil…
andracc Oct 16, 2024
bd91ef4
useGOMEMLIMIT true
andracc Oct 16, 2024
bd774e6
address more concise OtelKernel and var
andracc Oct 16, 2024
d92afde
api placeholder can be removed
andracc Oct 16, 2024
90f4166
addressed code review helm and test
andracc Oct 16, 2024
931efec
addressed clearer code
andracc Oct 16, 2024
1714201
Fix mismatch with aws-*-credentials
imnasnainaec Oct 16, 2024
c91a7e1
Fix helm stuff
imnasnainaec Oct 17, 2024
031e804
Fix fix
imnasnainaec Oct 17, 2024
23f01e3
Push to qa for testing
imnasnainaec Oct 18, 2024
e40c394
Update ecr repo cleanup
imnasnainaec Oct 18, 2024
806d9f1
Update ecr rem pattern
imnasnainaec Oct 18, 2024
ae03186
Restore only deploy from master
imnasnainaec Oct 18, 2024
d64f001
Revert aws-login change (part1)
imnasnainaec Oct 18, 2024
13d2fa6
Revert aws-login change (part2)
imnasnainaec Oct 18, 2024
78621b7
Extend log presence
imnasnainaec Oct 18, 2024
51bee4c
Merge branch 'aws-ecr' into otel-qa
imnasnainaec Oct 18, 2024
4fc9c86
Deploy to QA
imnasnainaec Oct 18, 2024
a690a90
Update maintenance scripts
imnasnainaec Oct 21, 2024
6a48f0f
More documentation
imnasnainaec Oct 21, 2024
9f44a70
Add comment
imnasnainaec Oct 21, 2024
3fae27e
Fix comment
imnasnainaec Oct 21, 2024
1ce1b0a
Merge branch 'aws-ecr' into otel-qa
imnasnainaec Oct 21, 2024
af49460
Fix aws-ecr-login command and resources
imnasnainaec Oct 22, 2024
3597669
Fix aws-ecr-login command
imnasnainaec Oct 22, 2024
636d8fa
Add resource limits
imnasnainaec Oct 22, 2024
b1ccd48
Merge branch 'master' into otel-qa
imnasnainaec Oct 22, 2024
eb272b6
Build to AWS, but don't deploy to QA
imnasnainaec Oct 22, 2024
3d25f3d
Merge branch 'master' into otel-qa
imnasnainaec Oct 23, 2024
1447459
Revert to named script from sillsdev/aws-kubectl
imnasnainaec Oct 23, 2024
bda3403
Merge branch 'otel-qa' of https://github.com/sillsdev/TheCombine into…
imnasnainaec Oct 23, 2024
aaa7913
Make all resource requests/limits powers of 2 for consistancy
imnasnainaec Oct 28, 2024
63850cf
Change some info to debug
imnasnainaec Oct 29, 2024
4d3d6cd
Fix Docker debugging and GHA ubuntu version
imnasnainaec Oct 29, 2024
6b346a7
Fix resource lower bound
imnasnainaec Oct 29, 2024
bf9c587
Fix Docker logging
imnasnainaec Oct 29, 2024
8d6c424
Re-adjust maint mem request
imnasnainaec Oct 29, 2024
db08454
Merge branch 'master' into otel-qa
imnasnainaec Oct 29, 2024
b57e7b5
Add pre- and post-build info logging
imnasnainaec Oct 29, 2024
ee8c47a
Match requests to limits on all our little jobs
imnasnainaec Oct 30, 2024
23385a5
Update resources based on observed need
imnasnainaec Oct 30, 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
27 changes: 12 additions & 15 deletions .github/workflows/backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,14 @@ jobs:
github.com:443
md-hdd-t032zjxllntc.z26.blob.storage.azure.net:443
objects.githubusercontent.com:443
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- name: Checkout repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- name: Setup dotnet
uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4.0.1
with:
dotnet-version: ${{ matrix.dotnet }}
- name: Install ffmpeg
uses: FedericoCarboni/setup-ffmpeg@36c6454b5a2348e7794ba2d82a21506605921e3d # v3

# Coverage.
- name: Run coverage tests
run: dotnet test Backend.Tests/Backend.Tests.csproj
shell: bash
Expand All @@ -54,19 +53,16 @@ jobs:
name: coverage
path: Backend.Tests/coverage.cobertura.xml
retention-days: 7

# Development build.
- run: dotnet build BackendFramework.sln

# Release build.
- run: dotnet publish BackendFramework.sln

# Fmt.
- run: dotnet format --verify-no-changes
- name: Development build
run: dotnet build BackendFramework.sln
- name: Release build
run: dotnet publish BackendFramework.sln
- name: Format check
run: dotnet format --verify-no-changes

upload_coverage:
needs: test_build
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
# See https://docs.stepsecurity.io/harden-runner/getting-started/ for instructions on
# configuring harden-runner and identifying allowed endpoints.
Expand Down Expand Up @@ -146,8 +142,8 @@ jobs:
uses: github/codeql-action/analyze@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3

docker_build:
if: ${{ github.event.type }} == "PullRequest"
runs-on: ubuntu-22.04
# if: ${{ github.event.type }} == "PullRequest"
steps:
# See https://docs.stepsecurity.io/harden-runner/getting-started/ for instructions on
# configuring harden-runner and identifying allowed endpoints.
Expand All @@ -170,7 +166,8 @@ jobs:
ts-crl.ws.symantec.com:80
# For subfolders, currently a full checkout is required.
# See: https://github.com/marketplace/actions/build-and-push-docker-images#path-context
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- name: Checkout repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
fetch-depth: 0
- name: Build backend
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ name: "CodeQL"

on:
push:
branches: ["master"]
branches: [master]
pull_request:
# The branches below must be a subset of the branches above
branches: ["master"]
branches: [master]
schedule:
- cron: "21 8 * * 3"

Expand All @@ -26,7 +26,7 @@ permissions: # added using https://github.com/step-security/secure-workflows
jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
permissions:
actions: read
contents: read
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/combine_deploy_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ permissions: # added using https://github.com/step-security/secure-workflows

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
# See https://docs.stepsecurity.io/harden-runner/getting-started/ for instructions on
# configuring harden-runner and identifying allowed endpoints.
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ permissions: # added using https://github.com/step-security/secure-workflows
jobs:
docker_build:
if: ${{ github.event.type }} == "PullRequest"
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
# See https://docs.stepsecurity.io/harden-runner/getting-started/ for instructions on
# configuring harden-runner and identifying allowed endpoints.
Expand All @@ -26,7 +26,8 @@ jobs:
registry-1.docker.io:443
# For subfolders, currently a full checkout is required.
# See: https://github.com/marketplace/actions/build-and-push-docker-images#path-context
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- name: Checkout repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
fetch-depth: 0
- name: Build database image
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ permissions:

jobs:
dependency-review:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Harden Runner
uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy_qa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
matrix:
component: [frontend, backend, maintenance, database]

runs-on: ubuntu-latest
runs-on: ubuntu-22.04
outputs:
image_tag: ${{ steps.build_combine.outputs.image_tag }}
steps:
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
build_component: ${{ matrix.component }}
clean_ecr_repo:
needs: build
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
# See https://docs.stepsecurity.io/harden-runner/getting-started/ for instructions on
# configuring harden-runner and identifying allowed endpoints.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
component: [frontend, backend, maintenance, database]
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
outputs:
image_tag: ${{ steps.build_combine.outputs.image_tag }}
steps:
Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ permissions: # added using https://github.com/step-security/secure-workflows

jobs:
lint_build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
node-version: [20]
Expand Down Expand Up @@ -40,7 +40,7 @@ jobs:
- run: npm run build

test_coverage:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
node-version: [20]
Expand All @@ -64,7 +64,8 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
- run: npm ci
- run: npm run test-frontend:coverage
- name: Run tests and generate coverage
run: npm run test-frontend:coverage
env:
CI: true
- name: Upload coverage artifact
Expand All @@ -77,7 +78,7 @@ jobs:

upload_coverage:
needs: test_coverage
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
# See https://docs.stepsecurity.io/harden-runner/getting-started/ for instructions on
# configuring harden-runner and identifying allowed endpoints.
Expand Down Expand Up @@ -110,8 +111,8 @@ jobs:
name: Frontend

docker_build:
runs-on: ubuntu-latest
if: ${{ github.event.type }} == "PullRequest"
runs-on: ubuntu-22.04
steps:
# See https://docs.stepsecurity.io/harden-runner/getting-started/ for instructions on
# configuring harden-runner and identifying allowed endpoints.
Expand All @@ -128,7 +129,8 @@ jobs:
pypi.org:443
registry-1.docker.io:443
registry.npmjs.org:443
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- name: Checkout repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
fetch-depth: 0
- name: Build frontend
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/maintenance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ permissions: # added using https://github.com/step-security/secure-workflows
jobs:
docker_build:
if: ${{ github.event.type }} == "PullRequest"
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
# See https://docs.stepsecurity.io/harden-runner/getting-started/ for instructions on
# configuring harden-runner and identifying allowed endpoints.
Expand All @@ -30,7 +30,8 @@ jobs:
security.ubuntu.com:80
# For subfolders, currently a full checkout is required.
# See: https://github.com/marketplace/actions/build-and-push-docker-images#path-context
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- name: Checkout repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
fetch-depth: 0
- name: Build maintenance image
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ permissions: # added using https://github.com/step-security/secure-workflows

jobs:
deploy:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
# See https://docs.stepsecurity.io/harden-runner/getting-started/ for instructions on
# configuring harden-runner and identifying allowed endpoints.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ permissions: # added using https://github.com/step-security/secure-workflows

jobs:
tox:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
python-version: ["3.12"]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ permissions: read-all
jobs:
analysis:
name: Scorecards analysis
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
permissions:
# Needed to upload the results to code-scanning dashboard.
security-events: write
Expand Down
6 changes: 5 additions & 1 deletion deploy/helm/aws-login/templates/aws-ecr-login-cronjob.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,11 @@ spec:
configMapKeyRef:
key: DOCKER_EMAIL
name: {{ .Values.awsEcr.configName }}
resources: {}
resources:
requests:
memory: 128Mi
limits:
memory: 256Mi
securityContext:
capabilities: {}
terminationMessagePath: /dev/termination-log
Expand Down
6 changes: 5 additions & 1 deletion deploy/helm/aws-login/templates/aws-ecr-login-oneshot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,11 @@ spec:
configMapKeyRef:
key: DOCKER_EMAIL
name: "{{ .Values.awsEcr.configName }}"
resources: {}
resources:
requests:
memory: 128Mi
limits:
memory: 256Mi
securityContext:
capabilities: {}
terminationMessagePath: /dev/termination-log
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,11 @@ spec:
configMapKeyRef:
key: VERBOSE
name: {{ .Values.envName | quote }}
resources: {}
resources:
requests:
memory: 128Mi
limits:
memory: 256Mi
securityContext:
capabilities: {}
terminationMessagePath: /dev/termination-log
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,11 @@ spec:
configMapKeyRef:
key: VERBOSE
name: {{ .Values.envName | quote }}
resources: {}
resources:
requests:
memory: 128Mi
limits:
memory: 256Mi
securityContext:
capabilities: {}
terminationMessagePath: /dev/termination-log
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ spec:
resources:
requests:
cpu: 2m
memory: 100M
memory: 128Mi
limits:
memory: 150M
memory: 256Mi
restartPolicy: Always
{{- if ne .Values.global.pullSecretName "None" }}
imagePullSecrets:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ spec:
resources:
requests:
cpu: 1m
memory: 10M
memory: 128Mi
limits:
memory: 50M
memory: 256Mi
volumeMounts:
- name: nginx-html
mountPath: /usr/share/nginx/html
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,11 @@ spec:
image: {{ include "create-admin-user.containerImage" . }}
imagePullPolicy: {{ .Values.global.imagePullPolicy }}
name: create-admin-user
resources: {}
resources:
requests:
memory: 128Mi
limits:
memory: 256Mi
volumeMounts:
- mountPath: /home/app/.CombineFiles
name: backend-data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ spec:
resources:
requests:
cpu: 5m
memory: 960Mi
memory: 1Gi
{{- if .Values.global.includeResourceLimits }}
limits:
memory: 4Gi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ spec:
resources:
requests:
cpu: 25m
memory: 950Mi
memory: 1Gi
{{- if .Values.global.includeResourceLimits }}
limits:
memory: 2Gi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ spec:
resources:
requests:
cpu: 1m
memory: 15M
memory: 128Mi
{{- if .Values.global.includeResourceLimits }}
limits:
memory: 40M
memory: 256Mi
{{- end }}
volumeMounts:
- mountPath: /usr/share/nginx/fonts
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ spec:
resources:
requests:
cpu: 200m
memory: 150M
memory: 128Mi
limits:
memory: 150M
memory: 256Mi
securityContext:
capabilities: {}
terminationMessagePath: /dev/termination-log
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ spec:
- deployment/maintenance
- --
- get-fonts.sh
resources: {}
resources:
requests:
memory: 128Mi
limits:
memory: 256Mi
securityContext:
capabilities: {}
terminationMessagePath: /dev/termination-log
Expand Down
Loading
Loading