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.

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

2024.3.2 #2331

Closed
wants to merge 37 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
74c8614
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Feb 5, 2024
ddbc6cc
[pre-commit.ci] Apply automatic pre-commit fixes
pre-commit-ci[bot] Feb 5, 2024
afec9ae
update max k8s versions and remove depreciated api usage in local deploy
dcmcand Feb 22, 2024
928865c
generate random pass for grafana
aktech Mar 5, 2024
6477b63
Trigger ci run
aktech Mar 5, 2024
89df695
add test for grafana API 401
aktech Mar 5, 2024
aee7fb7
undo branch add
aktech Mar 5, 2024
d1a59ea
add note about pass generation
aktech Mar 5, 2024
029098a
remove extra line
aktech Mar 5, 2024
269154f
Merge branch 'develop' into grafana-security
aktech Mar 5, 2024
bb298e5
[pre-commit.ci] Apply automatic pre-commit fixes
pre-commit-ci[bot] Mar 5, 2024
fb76fd6
make precommit happy
aktech Mar 5, 2024
273d51f
disable ssl verification
aktech Mar 5, 2024
7c99d4f
[pre-commit.ci] Apply automatic pre-commit fixes
pre-commit-ci[bot] Mar 5, 2024
e821a10
use http
aktech Mar 5, 2024
1dcc569
ignore insecure request warning
aktech Mar 5, 2024
eb6155f
Upgrade Actions versions
isumitjha Mar 5, 2024
c05b7d3
update miniconda action, kubectl action as well
isumitjha Mar 6, 2024
2834115
fix upload artifact action name
isumitjha Mar 7, 2024
31cb5e4
fix azure version
isumitjha Mar 7, 2024
6626266
Merge branch 'develop' into update-max-k8s-version
dcmcand Mar 12, 2024
aa69d53
Merge branch 'develop' into pre-commit-ci-update-config
dcmcand Mar 12, 2024
5319447
[pre-commit.ci] pre-commit autoupdate (#2237)
dcmcand Mar 12, 2024
d2b7ff6
update keycloak image repo
Adam-D-Lewis Mar 12, 2024
e116cf9
[pre-commit.ci] Apply automatic pre-commit fixes
pre-commit-ci[bot] Mar 12, 2024
2ed3018
update max k8s versions and remove depreciated api usage in local dep…
dcmcand Mar 12, 2024
cfd4086
Merge branch 'develop' into grafana-security
aktech Mar 12, 2024
a034756
[pre-commit.ci] Apply automatic pre-commit fixes
pre-commit-ci[bot] Mar 12, 2024
a60d008
update keycloak image repo (#2312)
dcmcand Mar 13, 2024
ff38679
Generate random password for Grafana (#2289)
dcmcand Mar 13, 2024
af7790b
update conda store to 2024.3.1 (#2316)
Adam-D-Lewis Mar 13, 2024
6566e4c
add upgrade step (#2318)
Adam-D-Lewis Mar 13, 2024
8c75dfd
Switch PyPI release workflow to use trusted publishing (#2323)
viniciusdc Mar 14, 2024
f73ad97
update CURRENT_RELEASE for 2024.3.2 release (#2324)
Adam-D-Lewis Mar 14, 2024
366d1cd
get default variable value when following a terraform variable (#2322)
Adam-D-Lewis Mar 14, 2024
9c87660
Upgrade Actions versions
isumitjha Mar 15, 2024
a06fcc5
Upgrade Actions versions (#2291)
dcmcand Mar 15, 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
Prev Previous commit
Next Next commit
[pre-commit.ci] Apply automatic pre-commit fixes
pre-commit-ci[bot] committed Feb 5, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit ddbc6cc288a911ab02d66d33a15137edc28b77a5
6 changes: 3 additions & 3 deletions src/_nebari/stages/kubernetes_ingress/__init__.py
Original file line number Diff line number Diff line change
@@ -181,9 +181,9 @@ def input_vars(self, stage_outputs: Dict[str, Dict[str, Any]]):
cert_details["acme-email"] = self.config.certificate.acme_email
cert_details["acme-server"] = self.config.certificate.acme_server
elif cert_type == "existing":
cert_details[
"certificate-secret-name"
] = self.config.certificate.secret_name
cert_details["certificate-secret-name"] = (
self.config.certificate.secret_name
)

return {
**{
8 changes: 6 additions & 2 deletions src/_nebari/stages/kubernetes_services/__init__.py
Original file line number Diff line number Diff line change
@@ -51,8 +51,12 @@ class Storage(schema.Base):
class JupyterHubTheme(schema.Base):
hub_title: str = "Nebari"
hub_subtitle: str = "Your open source data science platform"
welcome: str = """Welcome! Learn about Nebari's features and configurations in <a href="https://www.nebari.dev/docs">the documentation</a>. If you have any questions or feedback, reach the team on <a href="https://www.nebari.dev/docs/community#getting-support">Nebari's support forums</a>."""
logo: str = "https://raw.githubusercontent.com/nebari-dev/nebari-design/main/logo-mark/horizontal/Nebari-Logo-Horizontal-Lockup-White-text.svg"
welcome: str = (
"""Welcome! Learn about Nebari's features and configurations in <a href="https://www.nebari.dev/docs">the documentation</a>. If you have any questions or feedback, reach the team on <a href="https://www.nebari.dev/docs/community#getting-support">Nebari's support forums</a>."""
)
logo: str = (
"https://raw.githubusercontent.com/nebari-dev/nebari-design/main/logo-mark/horizontal/Nebari-Logo-Horizontal-Lockup-White-text.svg"
)
primary_color: str = "#4f4173"
primary_color_dark: str = "#4f4173"
secondary_color: str = "#957da6"
Original file line number Diff line number Diff line change
@@ -208,12 +208,14 @@ def base_profile_extra_mounts():

extra_pod_config = {
"volumes": [
{
"name": volume["name"],
"persistentVolumeClaim": {"claimName": volume["name"]},
}
if volume["kind"] == "persistentvolumeclaim"
else {"name": volume["name"], "configMap": {"name": volume["name"]}}
(
{
"name": volume["name"],
"persistentVolumeClaim": {"claimName": volume["name"]},
}
if volume["kind"] == "persistentvolumeclaim"
else {"name": volume["name"], "configMap": {"name": volume["name"]}}
)
for mount_path, volume in extra_mounts.items()
]
}
@@ -367,9 +369,11 @@ def configure_user(username, groups, uid=1000, gid=100):
# mount the shared directories for user only if there are
# shared folders (groups) that the user is a member of
# else ensure that the `shared` folder symlink does not exist
f"ln -sfn /shared /home/{username}/shared"
if groups
else f"rm -f /home/{username}/shared",
(
f"ln -sfn /shared /home/{username}/shared"
if groups
else f"rm -f /home/{username}/shared"
),
# conda-store environment configuration
f"printf '{condarc}' > /home/{username}/.condarc",
# jupyter configuration