Skip to content

Commit d92f88e

Browse files
viktoriaasviktoriaas
committed
updates: remove broken billing, delete pvc false in defaultdata
1 parent 782c37b commit d92f88e

File tree

5 files changed

+40
-35
lines changed

5 files changed

+40
-35
lines changed

‎create_config_maps.sh‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,10 @@ create_configmap() {
4646
kubectl create configmap $name --from-file=$path --namespace $NAMESPACE
4747
else
4848
# Creating the ConfigMaps locally
49-
kubectl create configmap $name --from-file=$path --dry-run=client -o json > $name.json
50-
kubectl patch --local -f $name.json --type=json -p='[{"op": "remove", "path": "/metadata/creationTimestamp"}]' -o yaml > $name.yaml
51-
rm $name.json
49+
kubectl create configmap $name --from-file=$path --namespace jupyterhub-ns
50+
# --dry-run=client -o json > $name.json
51+
# kubectl patch --local -f $name.json --type=json -p='[{"op": "remove", "path": "/metadata/creationTimestamp"}]' -o yaml > $name.yaml
52+
# rm $name.json
5253
fi
5354
}
5455

‎src/FormPage.jsx‎

Lines changed: 24 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,20 @@ const StepOne = ({ setFormData, defaultFormData }) => {
4949
return
5050
} else {
5151
const key = Object.keys(defaultImagesName).find((key) => defaultImagesName[key] === text);
52+
5253
const dindex = Object.keys(images).indexOf(key);
5354

5455
const flattenedImages = Object.entries(images).flatMap(([category, options]) =>
5556
Object.keys(options).map((key) => ({ category, key }))
5657
);
5758

5859
const image = defaultFormData.notebookImage.selectedOption.value.replace("cerit.io/hubs/", "");
60+
5961
const index = flattenedImages.findIndex((entry) => entry.key === image);
62+
console.log('index:', index);
63+
6064

61-
handleSelect(key, image, index, dindex);
65+
handleSelect(key, image, index, dindex);
6266
}
6367
handleSshCheck(defaultFormData.notebookImage.sshAccess);
6468
setCheckSsh(defaultFormData.notebookImage.sshAccess);
@@ -793,25 +797,25 @@ const StepThree = ({ setFormData, defaultFormData }) => {
793797
</div>
794798
</div>
795799
</FieldHeader>
796-
<FieldHeader
797-
title="Resource Usage"
798-
infoText="This information is for your awareness, showing the estimated cost of running your notebooks, but no payment is required."
799-
>
800-
<div className="GPU-wrapper">
801-
<iframe
802-
src={`https://kuba-mon-int.cloud.e-infra.cz/d-solo/dhl1ujXSz/jupyterhub-personal?orgId=1&from=now-90d&to=now&var-name=${appConfig.userName}&panelId=3&theme=light`}
803-
width="300"
804-
height="200"
805-
frameborder="0"
806-
></iframe>
807-
<iframe
808-
src={`https://kuba-mon-int.cloud.e-infra.cz/d-solo/dhl1ujXSz/jupyterhub-personal?orgId=1&from=now-90d&to=now&var-name=${appConfig.userName}&panelId=4&theme=light`}
809-
width="300"
810-
height="200"
811-
frameborder="0"
812-
></iframe>
813-
</div>
814-
</FieldHeader>
800+
{/*<FieldHeader*/}
801+
{/* title="Resource Usage"*/}
802+
{/* infoText="This information is for your awareness, showing the estimated cost of running your notebooks, but no payment is required."*/}
803+
{/*>*/}
804+
{/* <div className="GPU-wrapper">*/}
805+
{/* <iframe*/}
806+
{/* src={`https://kuba-mon-int.cloud.e-infra.cz/d-solo/dhl1ujXSz/jupyterhub-personal?orgId=1&from=now-90d&to=now&var-name=${appConfig.userName}&panelId=3&theme=light`}*/}
807+
{/* width="300"*/}
808+
{/* height="200"*/}
809+
{/* frameborder="0"*/}
810+
{/* ></iframe>*/}
811+
{/* <iframe*/}
812+
{/* src={`https://kuba-mon-int.cloud.e-infra.cz/d-solo/dhl1ujXSz/jupyterhub-personal?orgId=1&from=now-90d&to=now&var-name=${appConfig.userName}&panelId=4&theme=light`}*/}
813+
{/* width="300"*/}
814+
{/* height="200"*/}
815+
{/* frameborder="0"*/}
816+
{/* ></iframe>*/}
817+
{/* </div>*/}
818+
{/*</FieldHeader>*/}
815819
</>) : <></>}
816820
</div>
817821
);
@@ -1039,15 +1043,6 @@ function FormPage() {
10391043
{/* </li>*/}
10401044
{/* </ul>*/}
10411045
{/*</AnouncmentMessage>*/}
1042-
{/*<AnouncmentMessage style="warning">*/}
1043-
{/* <h2> Scheduled maintenance and reboot on 16th - 18th Dec 2024 </h2>*/}
1044-
{/* <p>*/}
1045-
{/* {" "}*/}
1046-
{/* We will have scheduled maintenance and cluster reboot between 16th and*/}
1047-
{/* 17th of December 2024. All running notebooks will be interrupted and*/}
1048-
{/* have to be started again.{" "}*/}
1049-
{/* </p>*/}
1050-
{/*</AnouncmentMessage>*/}
10511046
<JupyterHubHeader userName={appConfig.userName}></JupyterHubHeader>
10521047
<div className="wrapper">
10531048
<ProgressiveForm

‎src/HomePage.jsx‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,14 @@ function HomePage() {
120120

121121
{/* </ul>*/}
122122
{/*</AnouncmentMessage>*/}
123+
{/*<AnouncmentMessage style="warning">*/}
124+
{/* <h2> Scheduled maintenance and reboot on 25 August 2025 </h2>*/}
125+
{/* <p>*/}
126+
{/* {" "}*/}
127+
{/* We will have scheduled maintenance and cluster reboot on 25 August 2025.*/}
128+
{/* All running notebooks will be restarted. We recommend to finish your work before to avoid losing progress. {" "}*/}
129+
{/* </p>*/}
130+
{/*</AnouncmentMessage>*/}
123131
<JupyterHubHeader userName={appConfig.userName}></JupyterHubHeader>
124132
<div className="wrapper">
125133
<div className="default-server-btns">

‎src/data/formData.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export const selectOptionsStorage = {
1919
export const images = {
2020
simple: {
2121
"minimalnb:02-01-2025-ai": "Minimal NB with AI",
22-
"minimalnb:15-07-2025-intelligence-ai": "Minimal NB with notebook-intelligence",
22+
"minimalnb:01-09-2025-intelligence-ai": "Minimal NB with notebook-intelligence",
2323
"minimalnb:01-02-2025": "Minimal NB with SSH access",
2424
"minimalnb-cs:31-10-2024": "Minimal NB with Integrated VS Code",
2525
"minimalnb-cs:17-11-2024-ai": "Minimal NB with Integrated VS Code and AI",

‎src/scripts/gatherFormData.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,9 @@ function getPersistentHomeSelection() {
7575
const persistentHomeData = { type: checkedHomeRadio.value };
7676

7777
if (checkedHomeRadio.value === 'new') {
78-
const phomeCheck = document.getElementById('phomecheck');
79-
persistentHomeData.eraseIfExists = phomeCheck && phomeCheck.checked;
78+
// const phomeCheck = document.getElementById('phomecheck');
79+
// persistentHomeData.eraseIfExists = phomeCheck && phomeCheck.checked;
80+
persistentHomeData.eraseIfExists = false
8081
} else if (checkedHomeRadio.value === 'existing') {
8182
const persistentHomeSelect = document.getElementById('phid');
8283
if (persistentHomeSelect) {

0 commit comments

Comments
 (0)