Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
DBRepo
Manage
Activity
Members
Labels
Plan
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
FAIR Data Austria DB Repository
DBRepo
Commits
e3fc2099
Commit
e3fc2099
authored
11 months ago
by
Manuel Esberger
Browse files
Options
Downloads
Patches
Plain Diff
fix upload-deployment
parent
c6b1d296
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
helm/dbrepo/templates/upload-deployment.yaml
+0
-17
0 additions, 17 deletions
helm/dbrepo/templates/upload-deployment.yaml
helm/dbrepo/values.yaml
+25
-44
25 additions, 44 deletions
helm/dbrepo/values.yaml
with
25 additions
and
61 deletions
helm/dbrepo/templates/upload-deployment.yaml
+
0
−
17
View file @
e3fc2099
...
@@ -24,23 +24,6 @@ spec:
...
@@ -24,23 +24,6 @@ spec:
spec
:
spec
:
securityContext
:
securityContext
:
runAsNonRoot
:
true
runAsNonRoot
:
true
initContainers
:
-
name
:
init-permissions
image
:
busybox
command
:
[
'
sh'
,
'
-c'
,
'
mkdir
-p
/srv/tusd-data/data
&&
chown
-R
1001:1001
/srv/tusd-data'
]
volumeMounts
:
-
name
:
tusd-data
mountPath
:
/srv/tusd-data
securityContext
:
runAsNonRoot
:
true
readOnlyRootFilesystem
:
true
allowPrivilegeEscalation
:
false
seccompProfile
:
type
:
{{
.Values.uploadservice.securityContext.seccompProfile.type | default "RuntimeDefault"
}}
capabilities
:
drop
:
-
ALL
resources
:
{{
- toYaml .Values.resources | nindent 12
}}
containers
:
containers
:
-
name
:
upload-service
-
name
:
upload-service
image
:
"
{{
.Values.uploadservice.image.repository
}}:{{
.Values.uploadservice.image.tag
}}"
image
:
"
{{
.Values.uploadservice.image.repository
}}:{{
.Values.uploadservice.image.tag
}}"
...
...
This diff is collapsed.
Click to expand it.
helm/dbrepo/values.yaml
+
25
−
44
View file @
e3fc2099
...
@@ -13,11 +13,9 @@ global:
...
@@ -13,11 +13,9 @@ global:
## @param global.storageClass Global StorageClass for Persistent Volume(s)
## @param global.storageClass Global StorageClass for Persistent Volume(s)
storageClass
:
"
rbd-storagepool-cluster"
storageClass
:
"
rbd-storagepool-cluster"
## resource limits required by ares cluster
## resource limits required by ares cluster
resources
:
resources
:
limits
:
limits
:
# cpu: 500m
memory
:
756Mi
memory
:
756Mi
requests
:
requests
:
cpu
:
50m
cpu
:
50m
...
@@ -25,7 +23,6 @@ resources:
...
@@ -25,7 +23,6 @@ resources:
resourcesWStorage
:
resourcesWStorage
:
limits
:
limits
:
cpu
:
500m
ephemeral-storage
:
50Mi
ephemeral-storage
:
50Mi
memory
:
756Mi
memory
:
756Mi
requests
:
requests
:
...
@@ -35,7 +32,6 @@ resourcesWStorage:
...
@@ -35,7 +32,6 @@ resourcesWStorage:
resourcesLittle
:
resourcesLittle
:
limits
:
limits
:
cpu
:
100m
memory
:
512Mi
memory
:
512Mi
requests
:
requests
:
cpu
:
25m
cpu
:
25m
...
@@ -124,7 +120,6 @@ metadatadb:
...
@@ -124,7 +120,6 @@ metadatadb:
ephemeral-storage
:
10Mi
ephemeral-storage
:
10Mi
memory
:
512Mi
memory
:
512Mi
limits
:
limits
:
cpu
:
250m
ephemeral-storage
:
20Mi
ephemeral-storage
:
20Mi
memory
:
768Mi
memory
:
768Mi
## @section Auth Service
## @section Auth Service
...
@@ -189,7 +184,6 @@ authservice:
...
@@ -189,7 +184,6 @@ authservice:
ephemeral-storage
:
10Mi
ephemeral-storage
:
10Mi
memory
:
512Mi
memory
:
512Mi
limits
:
limits
:
cpu
:
250m
ephemeral-storage
:
10Mi
ephemeral-storage
:
10Mi
memory
:
768Mi
memory
:
768Mi
replicaCount
:
2
replicaCount
:
2
...
@@ -220,7 +214,6 @@ datadb:
...
@@ -220,7 +214,6 @@ datadb:
ephemeral-storage
:
10Mi
ephemeral-storage
:
10Mi
memory
:
512Mi
memory
:
512Mi
limits
:
limits
:
cpu
:
100m
ephemeral-storage
:
10Mi
ephemeral-storage
:
10Mi
memory
:
768Mi
memory
:
768Mi
## @skip datadb.primary
## @skip datadb.primary
...
@@ -231,7 +224,6 @@ datadb:
...
@@ -231,7 +224,6 @@ datadb:
ephemeral-storage
:
10Mi
ephemeral-storage
:
10Mi
memory
:
512Mi
memory
:
512Mi
limits
:
limits
:
cpu
:
200m
ephemeral-storage
:
10Mi
ephemeral-storage
:
10Mi
memory
:
768Mi
memory
:
768Mi
service
:
service
:
...
@@ -260,7 +252,6 @@ datadb:
...
@@ -260,7 +252,6 @@ datadb:
ephemeral-storage
:
10Mi
ephemeral-storage
:
10Mi
memory
:
512Mi
memory
:
512Mi
limits
:
limits
:
cpu
:
100m
ephemeral-storage
:
10Mi
ephemeral-storage
:
10Mi
memory
:
768Mi
memory
:
768Mi
ports
:
ports
:
...
@@ -303,7 +294,6 @@ datadb:
...
@@ -303,7 +294,6 @@ datadb:
ephemeral-storage
:
10Mi
ephemeral-storage
:
10Mi
memory
:
512Mi
memory
:
512Mi
limits
:
limits
:
cpu
:
100m
ephemeral-storage
:
10Mi
ephemeral-storage
:
10Mi
memory
:
768Mi
memory
:
768Mi
## @skip datadb.secondary
## @skip datadb.secondary
...
@@ -341,7 +331,6 @@ searchdb:
...
@@ -341,7 +331,6 @@ searchdb:
cpu
:
50m
cpu
:
50m
memory
:
512Mi
memory
:
512Mi
limits
:
limits
:
cpu
:
300m
memory
:
1Gi
memory
:
1Gi
livenessProbe
:
livenessProbe
:
initialDelaySeconds
:
300
initialDelaySeconds
:
300
...
@@ -352,7 +341,6 @@ searchdb:
...
@@ -352,7 +341,6 @@ searchdb:
cpu
:
50m
cpu
:
50m
memory
:
512Mi
memory
:
512Mi
limits
:
limits
:
cpu
:
300m
memory
:
1Gi
memory
:
1Gi
livenessProbe
:
livenessProbe
:
initialDelaySeconds
:
200
initialDelaySeconds
:
200
...
@@ -360,10 +348,9 @@ searchdb:
...
@@ -360,10 +348,9 @@ searchdb:
ingest
:
ingest
:
resources
:
resources
:
requests
:
requests
:
cpu
:
5
0m
cpu
:
2
0m
memory
:
256Mi
memory
:
256Mi
limits
:
limits
:
cpu
:
25m
memory
:
512Mi
memory
:
512Mi
livenessProbe
:
livenessProbe
:
initialDelaySeconds
:
200
initialDelaySeconds
:
200
...
@@ -381,7 +368,6 @@ searchdb:
...
@@ -381,7 +368,6 @@ searchdb:
initialDelaySeconds
:
200
initialDelaySeconds
:
200
timeoutSeconds
:
8
timeoutSeconds
:
8
## @section Upload Service
## @section Upload Service
uploadservice
:
uploadservice
:
...
@@ -497,7 +483,6 @@ brokerservice:
...
@@ -497,7 +483,6 @@ brokerservice:
ephemeral-storage
:
10Mi
ephemeral-storage
:
10Mi
memory
:
512Mi
memory
:
512Mi
limits
:
limits
:
cpu
:
300m
ephemeral-storage
:
50Mi
ephemeral-storage
:
50Mi
memory
:
768Mi
memory
:
768Mi
replicaCount
:
1
replicaCount
:
1
...
@@ -506,7 +491,7 @@ brokerservice:
...
@@ -506,7 +491,7 @@ brokerservice:
analyseservice
:
analyseservice
:
## @param analyseservice.enabled Enable the Broker Service.
## @param analyseservice.enabled Enable the Broker Service.
enabled
:
fals
e
enabled
:
tru
e
image
:
image
:
## @skip analyseservice.image.name
## @skip analyseservice.image.name
name
:
registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.4.5
name
:
registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.4.5
...
@@ -553,7 +538,6 @@ analyseservice:
...
@@ -553,7 +538,6 @@ analyseservice:
cpu
:
50m
cpu
:
50m
memory
:
512Mi
memory
:
512Mi
limits
:
limits
:
cpu
:
250m
memory
:
2048Mi
memory
:
2048Mi
## @param analyseservice.endpoint The url of the endpoint.
## @param analyseservice.endpoint The url of the endpoint.
...
@@ -614,7 +598,6 @@ metadataservice:
...
@@ -614,7 +598,6 @@ metadataservice:
cpu
:
50m
cpu
:
50m
memory
:
512Mi
memory
:
512Mi
limits
:
limits
:
cpu
:
250m
memory
:
1024Mi
memory
:
1024Mi
## @param metadataservice.endpoint The Metadata Service endpoint.
## @param metadataservice.endpoint The Metadata Service endpoint.
endpoint
:
http://metadata-service
endpoint
:
http://metadata-service
...
@@ -788,7 +771,6 @@ searchservice:
...
@@ -788,7 +771,6 @@ searchservice:
cpu
:
50m
cpu
:
50m
memory
:
512Mi
memory
:
512Mi
limits
:
limits
:
cpu
:
250m
memory
:
1024Mi
memory
:
1024Mi
## @skip searchservice.init
## @skip searchservice.init
init
:
init
:
...
@@ -914,7 +896,6 @@ ui:
...
@@ -914,7 +896,6 @@ ui:
cpu
:
50m
cpu
:
50m
memory
:
512Mi
memory
:
512Mi
limits
:
limits
:
cpu
:
250m
memory
:
1024Mi
memory
:
1024Mi
public
:
public
:
api
:
api
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment