Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Storage Service
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maksim Gorelik
Storage Service
Commits
47b875b0
Commit
47b875b0
authored
1 year ago
by
Maksim Gorelik
Browse files
Options
Downloads
Patches
Plain Diff
fixed charts and db connection password
parent
5617269d
No related branches found
No related tags found
No related merge requests found
Pipeline
#40151
canceled
1 year ago
Stage: test
Stage: build
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
deployment/helm/templates/deployment.yaml
+2
-4
2 additions, 4 deletions
deployment/helm/templates/deployment.yaml
deployment/helm/values.yaml
+7
-6
7 additions, 6 deletions
deployment/helm/values.yaml
internal/connection/db.go
+1
-1
1 addition, 1 deletion
internal/connection/db.go
with
10 additions
and
11 deletions
deployment/helm/templates/deployment.yaml
+
2
−
4
View file @
47b875b0
...
...
@@ -26,8 +26,6 @@ spec:
spec
:
securityContext
:
{{
- include "app.securitycontext" . | nindent 8
}}
imagePullSecrets
:
-
name
:
{{
.Values.image.pullSecrets
}}
containers
:
-
name
:
{{
.Chart.Name
}}
image
:
"
{{
.Values.image.repository
}}/{{
.Values.image.name
}}:{{
default
.Chart.AppVersion
.Values.image.tag
}}"
...
...
@@ -77,11 +75,11 @@ spec:
-
name
:
"
STORAGESERVICE_CRYPTO_SIGNKEY"
value
:
{{
.Values.config.crypto.signKey
}}
-
name
:
"
STORAGESERVICE_MESSAGING_ENABLED"
value
:
{{
.Values.config.messaging.enabled
}}
value
:
"
{{.Values.config.messaging.enabled}}
"
-
name
:
"
STORAGESERVICE_MESSAGING_STORAGETOPIC"
value
:
{{
.Values.config.messaging.storageTopic
}}
-
name
:
"
CLOUDEVENTPROVIDER_MESSAGING_PROTOCOL"
value
:
"
nats"
value
:
{{
.Values.config.messaging.host
}}
-
name
:
"
CLOUDEVENTPROVIDER_MESSAGING_NATS_URL"
value
:
{{
.Values.config.messaging.protocol
}}
{{
- if .Values.config.vault
}}
...
...
This diff is collapsed.
Click to expand it.
deployment/helm/values.yaml
+
7
−
6
View file @
47b875b0
...
...
@@ -2,10 +2,10 @@ replicaCount: 1
name
:
storage-service
image
:
repository
:
node-654e3bca7fbeeed18f81d7c7.ps-xaas.io/ocm
/storage-service
repository
:
node-654e3bca7fbeeed18f81d7c7.ps-xaas.io/ocm
-wstack
imagePullPolicy
:
Always
name
:
storage-service
tag
:
latest
tag
:
main
podAnnotations
:
{}
...
...
@@ -43,7 +43,7 @@ ingress:
-
path
:
/storage(/|$)(.*)
port
:
8080
tls
:
-
secretName
:
letsencrypt-service-tls
-
secretName
:
xfsc-wildcard
hosts
:
-
ocm.xfsc.dev
security
:
...
...
@@ -53,10 +53,10 @@ security:
config
:
port
:
8080
cassandra
:
hosts
:
cassandra
-dev.development
.svc.cluster.local:9042
hosts
:
cassandra
.cassandra
.svc.cluster.local:9042
keyspace
:
user_space
user
:
cassandra
passwordSecret
:
cassandra
-dev
passwordSecret
:
cassandra
passwordKey
:
cassandra-password
crypto
:
signKey
:
test
...
...
@@ -66,11 +66,12 @@ config:
basedomain
:
http://localhost:8080
country
:
DE
region
:
EU
mode
:
REMOTE
mode
:
DIRECT
messaging
:
enabled
:
true
storageTopic
:
storage
host
:
http://localhost:4222
protocol
:
nats
vault
:
address
:
http://vault.vault.svc.cluster.local:8200
tokenName
:
vault
...
...
This diff is collapsed.
Click to expand it.
internal/connection/db.go
+
1
−
1
View file @
47b875b0
...
...
@@ -78,7 +78,7 @@ func Connection() (SessionInterface, error) {
if
cassandraConfig
.
User
!=
""
&&
cassandraConfig
.
Password
!=
""
{
cluster
.
Authenticator
=
gocql
.
PasswordAuthenticator
{
Username
:
cassandraConfig
.
User
,
Password
:
cassandraConfig
.
User
,
Password
:
cassandraConfig
.
Password
,
}
}
...
...
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