Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added env variable support for maskinporten guardian url for dapla-lab #200

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Added env variable support for maskinporten guardian url for dapla-lab #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
92cb5ae
Added env variable support for maskinporten guardian url for dapla-lab
RupinderKaurSSB Dec 3, 2024
886fdf2
Fix newline error
RupinderKaurSSB Dec 3, 2024
2852c5a
Fix newline error
RupinderKaurSSB Dec 3, 2024
aed4a72
Updated description
RupinderKaurSSB Dec 3, 2024
815bc1d
Added env variable for maskinporten guardian url
RupinderKaurSSB Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/jupyter-playground/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.6.14
version: 0.6.15


dependencies:
Expand Down
2 changes: 2 additions & 0 deletions charts/jupyter-playground/templates/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ spec:
value: {{ .Values.statbankBaseUrl }}
- name: STATBANK_ENCRYPT_URL
value: {{ .Values.statbankEncryptUrl }}
- name: MASKINPORTEN_TOKEN_URL
value: {{ .Values.maskinportenGuardianUrl }}
- name: DAPLA_USER
value: {{ .Values.daplaUser }}
{{- if .Values.init.regionInit }}
Expand Down
8 changes: 8 additions & 0 deletions charts/jupyter-playground/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,6 +570,14 @@
"overwriteSchemaWith": "dapla/statbankEncryptUrl.json"
}
},
"maskinportenGuardianUrl": {
"type": "string",
"description": "Maskinporten-guardian URL",
"x-onyxia": {
"hidden": true,
"overwriteSchemaWith": "dapla/maskinportenGuardianUrl.json"
}
},
"daplaUser": {
"type": "string",
"title": "Current Dapla user",
Expand Down
1 change: 1 addition & 0 deletions charts/jupyter-playground/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,3 +181,4 @@ deployEnvironment: "DEV"
daplaUser: ""
statbankBaseUrl: ""
statbankEncryptUrl: ""
maskinportenGuardianUrl: ""
2 changes: 1 addition & 1 deletion charts/jupyter-pyspark/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.0.28
version: 0.0.29


dependencies:
Expand Down
2 changes: 2 additions & 0 deletions charts/jupyter-pyspark/templates/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,8 @@ spec:
value: {{ .Values.statbankBaseUrl }}
- name: STATBANK_ENCRYPT_URL
value: {{ .Values.statbankEncryptUrl }}
- name: MASKINPORTEN_TOKEN_URL
value: {{ .Values.maskinportenGuardianUrl }}
- name: DAPLA_USER
value: {{ .Values.daplaUser }}
- name: PYSPARK_LOCAL_SUBMIT_ARGS
Expand Down
8 changes: 8 additions & 0 deletions charts/jupyter-pyspark/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,14 @@
"overwriteSchemaWith": "dapla/statbankEncryptUrl.json"
}
},
"maskinportenGuardianUrl": {
"type": "string",
"description": "Maskinporten-guardian URL",
"x-onyxia": {
"hidden": true,
"overwriteSchemaWith": "dapla/maskinportenGuardianUrl.json"
}
},
"daplaUser": {
"type": "string",
"title": "Current Dapla user",
Expand Down
1 change: 1 addition & 0 deletions charts/jupyter-pyspark/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,3 +181,4 @@ deployEnvironment: "DEV"
daplaUser: ""
statbankBaseUrl: ""
statbankEncryptUrl: ""
maskinportenGuardianUrl: ""
2 changes: 1 addition & 1 deletion charts/jupyter/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.7.14
version: 0.7.15


dependencies:
Expand Down
2 changes: 2 additions & 0 deletions charts/jupyter/templates/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ spec:
value: {{ .Values.statbankBaseUrl }}
- name: STATBANK_ENCRYPT_URL
value: {{ .Values.statbankEncryptUrl }}
- name: MASKINPORTEN_TOKEN_URL
value: {{ .Values.maskinportenGuardianUrl }}
- name: DAPLA_USER
value: {{ .Values.daplaUser }}
{{- if .Values.init.regionInit }}
Expand Down
8 changes: 8 additions & 0 deletions charts/jupyter/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,14 @@
"overwriteSchemaWith": "dapla/statbankEncryptUrl.json"
}
},
"maskinportenGuardianUrl": {
"type": "string",
"description": "Maskinporten-guardian URL",
"x-onyxia": {
"hidden": true,
"overwriteSchemaWith": "dapla/maskinportenGuardianUrl.json"
}
},
"daplaUser": {
"type": "string",
"title": "Current Dapla user",
Expand Down
1 change: 1 addition & 0 deletions charts/jupyter/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,3 +181,4 @@ deployEnvironment: "DEV"
daplaUser: ""
statbankBaseUrl: ""
statbankEncryptUrl: ""
maskinportenGuardianUrl: ""
2 changes: 1 addition & 1 deletion charts/rstudio/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.6.14
version: 0.6.15


dependencies:
Expand Down
2 changes: 2 additions & 0 deletions charts/rstudio/templates/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ spec:
value: {{ .Values.statbankBaseUrl }}
- name: STATBANK_ENCRYPT_URL
value: {{ .Values.statbankEncryptUrl }}
- name: MASKINPORTEN_TOKEN_URL
value: {{ .Values.maskinportenGuardianUrl }}
- name: DAPLA_USER
value: {{ .Values.daplaUser }}
{{- if .Values.init.regionInit }}
Expand Down
8 changes: 8 additions & 0 deletions charts/rstudio/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,14 @@
"overwriteSchemaWith": "dapla/statbankEncryptUrl.json"
}
},
"maskinportenGuardianUrl": {
"type": "string",
"description": "Maskinporten-guardian URL",
"x-onyxia": {
"hidden": true,
"overwriteSchemaWith": "dapla/maskinportenGuardianUrl.json"
}
},
"daplaUser": {
"type": "string",
"title": "Current Dapla user",
Expand Down
1 change: 1 addition & 0 deletions charts/rstudio/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,3 +165,4 @@ deployEnvironment: "DEV"
daplaUser: ""
statbankBaseUrl: ""
statbankEncryptUrl: ""
maskinportenGuardianUrl: ""
2 changes: 1 addition & 1 deletion charts/vscode-python/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.7.25
version: 0.7.26


dependencies:
Expand Down
2 changes: 2 additions & 0 deletions charts/vscode-python/templates/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,8 @@ spec:
value: {{ .Values.statbankBaseUrl }}
- name: STATBANK_ENCRYPT_URL
value: {{ .Values.statbankEncryptUrl }}
- name: MASKINPORTEN_TOKEN_URL
value: {{ .Values.maskinportenGuardianUrl }}
- name: DAPLA_USER
value: {{ .Values.daplaUser }}
envFrom:
Expand Down
8 changes: 8 additions & 0 deletions charts/vscode-python/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,14 @@
"overwriteSchemaWith": "dapla/statbankEncryptUrl.json"
}
},
"maskinportenGuardianUrl": {
"type": "string",
"description": "Maskinporten-guardian URL",
"x-onyxia": {
"hidden": true,
"overwriteSchemaWith": "dapla/maskinportenGuardianUrl.json"
}
},
"daplaUser": {
"type": "string",
"title": "Current Dapla user",
Expand Down
1 change: 1 addition & 0 deletions charts/vscode-python/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,3 +168,4 @@ deployEnvironment: "DEV"
daplaUser: ""
statbankBaseUrl: ""
statbankEncryptUrl: ""
maskinportenGuardianUrl: ""
Loading