Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
Helm charts for swh packages
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Platform
Infrastructure
CI CD
Helm charts for swh packages
Commits
16251b02
Verified
Commit
16251b02
authored
1 year ago
by
Antoine R. Dumont
Browse files
Options
Downloads
Patches
Plain Diff
production/deposit: Add instance to dynamic infra
Refs.
swh/infra/sysadm-environment#5191
parent
aaf1c973
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
swh/values/production/default.yaml
+4
-0
4 additions, 0 deletions
swh/values/production/default.yaml
swh/values/production/swh.yaml
+73
-0
73 additions, 0 deletions
swh/values/production/swh.yaml
with
77 additions
and
0 deletions
swh/values/production/default.yaml
+
4
−
0
View file @
16251b02
...
...
@@ -24,6 +24,10 @@ externalAuthorizedNetworkRanges:
-
213.135.60.146
-
37.187.96.121
keycloakConfiguration
:
server_url
:
https://auth.softwareheritage.org/auth/
realm_name
:
SoftwareHeritageStaging
memcached
:
enabled
:
true
...
...
This diff is collapsed.
Click to expand it.
swh/values/production/swh.yaml
+
73
−
0
View file @
16251b02
...
...
@@ -54,6 +54,17 @@ readOnlyStorageConfiguration:
storageConfigurationRef
:
postgresqlROStorageConfiguration
objstorageConfigurationRef
:
roObjstorageConfiguration
postgresqlDepositConfiguration
:
host
:
db.internal.staging.swh.network
port
:
5432
db
:
softwareheritage-deposit
user
:
swhstorage
pass
:
${POSTGRESQL_PASSWORD}
secrets
:
POSTGRESQL_PASSWORD
:
secretKeyRef
:
swh-postgresql-deposit-secrets
secretKeyName
:
postgres-swh-deposit-password
azureCacheConfiguration
:
cls
:
azure
connection_string
:
"
DefaultEndpointsProtocol=https;AccountName=swhvaultstorage;AccountKey=${ACCOUNT_KEY};EndpointSuffix=core.windows.net"
...
...
@@ -170,6 +181,22 @@ scrubberROStoragePrimaryConfiguration:
scrubberROStorageSecondaryConfiguration
:
storageConfigurationRef
:
secondaryPostgresqlROStorageConfiguration
djangoDepositConfiguration
:
secrets
:
DJANGO_SECRET_KEY
:
secretKeyRef
:
swh-deposit-django-secret
secretKeyName
:
deposit-django-secret-key
azureDepositConfiguration
:
connection_string
:
"
DefaultEndpointsProtocol=https;AccountName=swhdepositstoragestaging;AccountKey=${ACCOUNT_KEY};EndpointSuffix=core.windows.net"
container_name
:
deposit-tarballs
content_type
:
application/octet-stream
content_encoding
:
"
"
secrets
:
ACCOUNT_KEY
:
secretKeyRef
:
swh-deposit-azure-secret
secretKeyName
:
azure-swh-deposit-key
graphql
:
enabled
:
true
deployments
:
...
...
@@ -1122,3 +1149,49 @@ web:
matomo
:
url
:
https://piwik.inria.fr/
site_id
:
59
deposit
:
enabled
:
true
logLevel
:
INFO
requestedCpu
:
500m
requestedMemory
:
500Mi
migrationsEnabled
:
false
replicas
:
2
ingress
:
enabled
:
true
secretName
:
swh-deposit-crt
extraAnnotations
:
cert-manager.io/cluster-issuer
:
letsencrypt-production-gandi
kubernetes.io/ingress.class
:
nginx
kubernetes.io/tls-acme
:
"
true"
# The default behavior is true (when tls is enabled). We don't want that behavior
# since the rp is in charge of this
# https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/annotations/#server-side-https-enforcement-through-redirect
nginx.ingress.kubernetes.io/ssl-redirect
:
"
false"
tlsEnabled
:
true
endpoints
:
default
:
paths
:
-
path
:
/
-
path
:
/static
port
:
80
authenticated
:
paths
:
-
path
:
/1/private/
# auth-file with authentication
authentication
:
swh/deposit-auth-secrets
databaseConfigurationRef
:
postgresqlDepositConfiguration
schedulerConfigurationRef
:
remoteSchedulerConfiguration
storageConfigurationRef
:
remoteStorageConfiguration
storageMetadataConfigurationRef
:
remoteStorageConfiguration
djangoConfigurationRef
:
djangoDepositConfiguration
blobstorageConfigurationRef
:
azureDepositConfiguration
keycloakConfigurationRef
:
keycloakConfiguration
hosts
:
-
deposit-rpc-ingress
-
deposit.softwareheritage.org
-
deposit-dynamic.internal.softwareheritage.org
extraConfig
:
max_upload_size
:
209715200
extraction_dir
:
"
/tmp/swh-deposit/archive/"
cache_uri
:
memcached:11211
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
register
or
sign in
to comment