Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
MetaGer
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
56
Issues
56
List
Boards
Labels
Service Desk
Milestones
Merge Requests
9
Merge Requests
9
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
open-source
MetaGer
Commits
09f27965
Commit
09f27965
authored
Nov 06, 2020
by
Dominik Hebeler
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'development' into 932-dark-stylesheet-alternative
parents
1513623e
28ca0eef
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
56 additions
and
23 deletions
+56
-23
.gitlab/development-values.yaml
.gitlab/development-values.yaml
+16
-3
.gitlab/production-values.yaml
.gitlab/production-values.yaml
+23
-7
.gitlab/review-apps-values.yaml
.gitlab/review-apps-values.yaml
+13
-1
chart/templates/deployment.yaml
chart/templates/deployment.yaml
+4
-12
No files found.
.gitlab/development-values.yaml
View file @
09f27965
...
...
@@ -7,13 +7,26 @@ hpa:
enabled
:
true
minReplicas
:
1
maxReplicas
:
5
resources
:
limi
ts
:
resources
Phpfpm
:
reques
ts
:
cpu
:
500m
memory
:
500M
limits
:
resourcesNginx
:
requests
:
cpu
:
100m
memory
:
100M
limits
:
resourcesRedis
:
requests
:
cpu
:
100m
memory
:
1Gi
limits
:
resourcesFetcher
:
requests
:
cpu
:
500m
memory
:
1Gi
memory
:
100M
limits
:
podDisruptionBudget
:
enabled
:
true
minAvailable
:
...
...
.gitlab/production-values.yaml
View file @
09f27965
...
...
@@ -7,13 +7,6 @@ hpa:
enabled
:
true
minReplicas
:
3
maxReplicas
:
100
resources
:
limits
:
cpu
:
500m
memory
:
1Gi
requests
:
cpu
:
500m
memory
:
1Gi
podDisruptionBudget
:
enabled
:
true
minAvailable
:
...
...
@@ -23,6 +16,29 @@ podAnnotations:
prometheus.io/path
:
/metrics
prometheus.io/port
:
"
80"
deploymentApiVersion
:
apps/v1
resources
:
requests
:
limits
:
resourcesPhpfpm
:
requests
:
cpu
:
500m
memory
:
500M
limits
:
resourcesNginx
:
requests
:
cpu
:
100m
memory
:
100M
limits
:
resourcesRedis
:
requests
:
cpu
:
100m
memory
:
1Gi
limits
:
resourcesFetcher
:
requests
:
cpu
:
500m
memory
:
100M
limits
:
ingress
:
annotations
:
cert-manager.io/cluster-issuer
:
letsencrypt-prod
...
...
.gitlab/review-apps-values.yaml
View file @
09f27965
...
...
@@ -24,4 +24,16 @@ service:
commonName
:
"
"
externalPort
:
80
internalPort
:
80
deploymentApiVersion
:
apps/v1
\ No newline at end of file
deploymentApiVersion
:
apps/v1
resourcesPhpfpm
:
requests
:
limits
:
resourcesNginx
:
requests
:
limits
:
resourcesRedis
:
requests
:
limits
:
resourcesFetcher
:
requests
:
limits
:
\ No newline at end of file
chart/templates/deployment.yaml
View file @
09f27965
...
...
@@ -139,9 +139,7 @@ spec:
subPath
:
adBlacklistDomains.txt
readOnly
:
true
resources
:
requests
:
cpu
:
500m
memory
:
500m
{{
toYaml .Values.resourcesPhpfpm | indent 12
}}
# Nginx Container
-
name
:
{{
.Chart.Name
}}
-nginx
image
:
"
{{
.Values.image.repository
}}:{{
.Values.image.tag
}}"
...
...
@@ -187,9 +185,7 @@ spec:
initialDelaySeconds
:
{{
.Values.readinessProbe.initialDelaySeconds
}}
timeoutSeconds
:
{{
.Values.readinessProbe.timeoutSeconds
}}
resources
:
requests
:
cpu
:
100m
memory
:
100m
{{
toYaml .Values.resourcesNginx | indent 12
}}
# Redis Container
-
name
:
{{
.Chart.Name
}}
-redis
image
:
"
redis:5.0.3-alpine"
...
...
@@ -208,9 +204,7 @@ spec:
initialDelaySeconds
:
{{
.Values.readinessProbe.initialDelaySeconds
}}
timeoutSeconds
:
{{
.Values.readinessProbe.timeoutSeconds
}}
resources
:
requests
:
cpu
:
100m
memory
:
1Gi
{{
toYaml .Values.resourcesRedis | indent 12
}}
# Fetcher Container
-
name
:
{{
.Chart.Name
}}
-fetcher
image
:
"
{{
.Values.image.repository
}}:{{
.Values.image.tag
}}"
...
...
@@ -237,7 +231,5 @@ spec:
initialDelaySeconds
:
{{
.Values.readinessProbe.initialDelaySeconds
}}
timeoutSeconds
:
{{
.Values.readinessProbe.timeoutSeconds
}}
resources
:
requests
:
cpu
:
500m
memory
:
100m
{{
toYaml .Values.resourcesFetcher | indent 12
}}
{{
- end -
}}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment