Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nmaas Helm Chart
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
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
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
nmaas
nmaas Helm Chart
Commits
538dba4f
Commit
538dba4f
authored
3 months ago
by
Vojdan Kjorveziroski
Browse files
Options
Downloads
Patches
Plain Diff
Resolve "Alfa version of the Helm chart for version 1.7.0"
parent
4cad31da
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!12
Resolve "Alfa version of the Helm chart for version 1.7.0"
Changes
22
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
charts/nmaas/templates/nmaas-sp-service.yaml
+0
-19
0 additions, 19 deletions
charts/nmaas/templates/nmaas-sp-service.yaml
charts/nmaas/values.yaml
+47
-46
47 additions, 46 deletions
charts/nmaas/values.yaml
with
47 additions
and
65 deletions
charts/nmaas/templates/nmaas-sp-service.yaml
deleted
100644 → 0
+
0
−
19
View file @
4cad31da
{{
- if .Values.sp.enabled -
}}
apiVersion
:
v1
kind
:
Service
metadata
:
name
:
{{
.Values.sp.name
}}
labels
:
app
:
{{
.Values.sp.name
}}
chart
:
{{
.Chart.Name
}}
-{{ .Chart.Version }}
heritage
:
{{
.Release.Service
}}
release
:
{{
.Release.Name
}}
spec
:
type
:
{{
.Values.sp.type
}}
ports
:
-
port
:
{{
.Values.sp.port
}}
targetPort
:
{{
.Values.sp.targetPort
}}
protocol
:
TCP
selector
:
app
:
{{
.Values.sp.name
}}
{{
- end -
}}
This diff is collapsed.
Click to expand it.
charts/nmaas/values.yaml
+
47
−
46
View file @
538dba4f
...
@@ -25,6 +25,9 @@ global:
...
@@ -25,6 +25,9 @@ global:
platform
:
platform
:
enabled
:
true
enabled
:
true
name
:
nmaas-platform
name
:
nmaas-platform
serviceAccountName
:
nmaas-platform
clusterRoleName
:
nmaas-shell-role
clusterRoleBindingName
:
nmaas-platform
ingress
:
ingress
:
# -- defaults to .Values.platform.properties.k8s.ingress.controller.ingressClass if not set
# -- defaults to .Values.platform.properties.k8s.ingress.controller.ingressClass if not set
className
:
'
'
className
:
'
'
...
@@ -58,7 +61,7 @@ platform:
...
@@ -58,7 +61,7 @@ platform:
timeoutSeconds
:
10
timeoutSeconds
:
10
image
:
image
:
repository
:
artifactory.software.geant.org/nmaas-docker-local/nmaas-platform
repository
:
artifactory.software.geant.org/nmaas-docker-local/nmaas-platform
tag
:
"
1.
6.5
"
tag
:
"
1.
7.0
"
pullPolicy
:
IfNotPresent
pullPolicy
:
IfNotPresent
port
:
9001
port
:
9001
targetPort
:
9001
targetPort
:
9001
...
@@ -82,11 +85,14 @@ platform:
...
@@ -82,11 +85,14 @@ platform:
enabled
:
true
enabled
:
true
image
:
image
:
repository
:
artifactory.software.geant.org/nmaas-docker-local/nmaas-platform-populate
repository
:
artifactory.software.geant.org/nmaas-docker-local/nmaas-platform-populate
tag
:
"
1.
6.5
"
tag
:
"
1.
7.0
"
pullPolicy
:
Always
pullPolicy
:
Always
properties
:
properties
:
oidcUserLinking
:
true
multiInstanceSupport
:
false
maintenance
:
false
maintenance
:
false
testInstance
:
false
testInstance
:
false
environment
:
prod
defaultLanguage
:
en
defaultLanguage
:
en
serviceDeploymentCheckInterval
:
10
serviceDeploymentCheckInterval
:
10
serviceDeploymentCheckTimeout
:
600
serviceDeploymentCheckTimeout
:
600
...
@@ -101,18 +107,6 @@ platform:
...
@@ -101,18 +107,6 @@ platform:
showDomainRegistrationSelector
:
true
showDomainRegistrationSelector
:
true
# -- if true nmaas will automatically create the corresponding Kubernetes namespace for each new domain
# -- if true nmaas will automatically create the corresponding Kubernetes namespace for each new domain
autoNamespaceCreationForDomains
:
false
autoNamespaceCreationForDomains
:
false
sso
:
enabled
:
false
urlLogin
:
"
"
urlLogout
:
"
"
encryptionSecret
:
# -- leave empty to use existing secret specified below
literal
:
"
"
secret
:
# -- must be created manually if literal is empty
name
:
nmaas-sp-secret
key
:
secret
timeout
:
15
adminEmail
:
admin@example.com
adminEmail
:
admin@example.com
# -- only required if an external postgresql instance is used (when postgresql.install is false)
# -- only required if an external postgresql instance is used (when postgresql.install is false)
postgresql
:
postgresql
:
...
@@ -126,7 +120,6 @@ platform:
...
@@ -126,7 +120,6 @@ platform:
secret
:
secret
:
name
:
nmaas-postgresql-secret
name
:
nmaas-postgresql-secret
key
:
secret
key
:
secret
helm
:
helm
:
address
:
nmaas-helm
address
:
nmaas-helm
username
:
helm
username
:
helm
...
@@ -180,13 +173,35 @@ platform:
...
@@ -180,13 +173,35 @@ platform:
key
:
secret
key
:
secret
# -- expose Prometheus metrics
# -- expose Prometheus metrics
nmaasMetricsEnabled
:
true
nmaasMetricsEnabled
:
true
jwt
:
secretName
:
nmaas-jwt
signingKey
:
secret
:
key
:
jwtSigningKey
# -- leave empty to use existing secret, length at least 96 characters
literal
:
"
"
resetKey
:
secret
:
key
:
jwtResetKey
# -- leave empty to use existing secret, length at least 96 characters
literal
:
"
"
oidc
:
enabled
:
false
secretName
:
nmaas-oidc
clientId
:
"
"
issuerUri
:
"
https://auth.example.com/realms/master"
clientSecret
:
secret
:
key
:
oidcClientSecret
# -- leave empty to use existing secret
literal
:
"
"
portal
:
portal
:
enabled
:
true
enabled
:
true
name
:
nmaas-portal
name
:
nmaas-portal
image
:
image
:
repository
:
artifactory.software.geant.org/nmaas-docker-local/nmaas-portal
repository
:
artifactory.software.geant.org/nmaas-docker-local/nmaas-portal
tag
:
"
1.
6.5
"
tag
:
"
1.
7.0
"
pullPolicy
:
IfNotPresent
pullPolicy
:
IfNotPresent
ingress
:
ingress
:
# -- defaults to .Values.platform.properties.k8s.ingress.controller.ingressClass if not set
# -- defaults to .Values.platform.properties.k8s.ingress.controller.ingressClass if not set
...
@@ -240,33 +255,12 @@ postfix:
...
@@ -240,33 +255,12 @@ postfix:
secret
:
secret
:
key
:
smtpPassword
key
:
smtpPassword
sp
:
enabled
:
false
name
:
nmaas-sp
image
:
repository
:
artifactory.software.geant.org/nmaas-docker-local/nmaas-sp
tag
:
"
1.6.3"
pullPolicy
:
Always
ingress
:
# -- defaults to .Values.platform.properties.k8s.ingress.controller.ingressClass if not set
className
:
'
'
port
:
443
targetPort
:
80
type
:
ClusterIP
tls
:
true
properties
:
idp
:
name
:
edugain
uri
:
https://login.terena.org/wayf/saml2/idp/metadata.php
userId
:
uid
remoteUser
:
email
entityId
:
https://keycloak.example.com/realms/master
metadataUrl
:
https://keycloak.example.com/realms/master/protocol/saml/descriptor
helm
:
helm
:
enabled
:
true
enabled
:
true
name
:
nmaas-helm
name
:
nmaas-helm
serviceAccountName
:
nmaas-helm
serviceAccountName
:
nmaas-helm
clusterRoleBindingName
:
nmaas-helm-admin
clusterRoleName
:
cluster-admin
image
:
image
:
repository
:
artifactory.software.geant.org/nmaas-docker-local/nmaas-helm-3
repository
:
artifactory.software.geant.org/nmaas-docker-local/nmaas-helm-3
tag
:
"
3.9.3"
tag
:
"
3.9.3"
...
@@ -289,19 +283,26 @@ janitor:
...
@@ -289,19 +283,26 @@ janitor:
name
:
nmaas-janitor
name
:
nmaas-janitor
image
:
image
:
repository
:
artifactory.software.geant.org/nmaas-docker-local/nmaas-janitor
repository
:
artifactory.software.geant.org/nmaas-docker-local/nmaas-janitor
tag
:
"
1.
6.1
"
tag
:
"
1.
7.0
"
pullPolicy
:
IfNotPresent
pullPolicy
:
IfNotPresent
port
:
5000
port
:
5000
targetPort
:
5000
targetPort
:
5000
serviceAccountName
:
nmaas-janitor
serviceAccountName
:
nmaas-janitor
clusterRoleName
:
janitor-role
clusterRoleBindingName
:
nmaas-janitor
type
:
ClusterIP
type
:
ClusterIP
# -- settings for in-cluster postgresql
# -- settings for in-cluster postgresql
postgresql
:
postgresql
:
install
:
true
install
:
true
postgresqlUsername
:
nmaas
auth
:
postgresqlPassword
:
nmaas
username
:
nmaas
postgresqlDatabase
:
nmaas
password
:
nmaas
persistence
:
database
:
nmaas
enabled
:
true
postgresPassword
:
nmaas
size
:
8Gi
primary
:
networkPolicy
:
enabled
:
false
persistence
:
enabled
:
true
size
:
8Gi
This diff is collapsed.
Click to expand it.
Prev
1
2
Next
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