diff --git a/coec/custom/fleet.yaml b/coec/custom/fleet.yaml index d8453dcb4fab3c9ac22e085727dba3ac0f9c4726..bed396cbfdf29e9018f886039e7d8e42b4fdad81 100644 --- a/coec/custom/fleet.yaml +++ b/coec/custom/fleet.yaml @@ -32,6 +32,18 @@ helm: syslog: enabled: true level: 10 + customConfig: + services: + JupyterLab: + defaultOption: "4.3" + "4.3": + allowedLists: + systems: + - JURECA + - JUWELS + - JEDI + - JUSUF + - JSC-Cloud targetCustomizations: - name: jupyter-stag clusterSelector: @@ -50,7 +62,6 @@ targetCustomizations: clusterSelector: matchLabels: stage: production - maintenance: "false" helm: values: global: @@ -69,7 +80,7 @@ targetCustomizations: clusterSelector: matchLabels: stage: production - maintenance: "true" + maintenance: "true-disab" helm: values: ingress: diff --git a/coec/specific-secrets/overlays/production/frontend-git.yaml b/coec/specific-secrets/overlays/production/frontend-git.yaml index abf96805df11e0aac8d7fe354267c5820786f6a3..b759dd619c37bdad557faab2ff591823b340e39f 100644 --- a/coec/specific-secrets/overlays/production/frontend-git.yaml +++ b/coec/specific-secrets/overlays/production/frontend-git.yaml @@ -7,10 +7,14 @@ metadata: namespace: coec spec: encryptedData: - SHARE_BASE_GIT_BRANCH: AgB6j20Q8xXHOnDwwQaIgwGb+1Exsq6ELcX9Caz0oFTGadyBjZF0+9+GCXf8hEh4ORtf1gv3Qtt33tkLsrZnrxtRQKwiCvZVZWpWlUMhPFCIzK6WpyKkvBz1TKcwHjvNXd1MxoHG7UHiHnQIBQekM4020dSmSkMXdLiK6yLqwn5Z/Tu6oqCmqffJtUv9rrxpk9uHXJKOLuCk3Jc+2mp0tbEOIAj4xkChiZw3MnpJ09w85VBWg9UvD427VGNQ7tHr1A6fgVLILylrmk+tyip8TPbnJBF9p8uHzHeZY1HhgzM89NdMYPkke3Q49F78Rz0+3oZPaYfnHxbb+7ejWjdgaBWnsBd92BIBh8GeewETTlt16iD/7iBcBkz08l1fJz4UNUh6I79odpvexkWDAAbmhscKvZB5ktEXbx+3gBMOmPs6vwVXzJtXkRSHObCCfBr4UYXaRkAY73fv55e3xJLRFaDowoKpZR/5B4QvXgHB6UKYToe+pbC7EaxPxfepKKZq9uKqDUU+LRYtfVgDbG9h7T1YPLPvUwxqe3ryv7XjY45uN/t2k2zmnWbwv4aGmjVrQL/1fRZbTrAcGdb+hqIvbevlyyY6eEJ7PHzwN/m3FVY37JJ2EO4nWp4MNNKj3KJ6XTKVqApOc4SsTufmiSQi5mKPCVM/Ud3tMu546iwH3P+2LViF89fu/GBdWZ4dFjqec+7w0AF5yEFL7dXY - SHARE_BASE_GIT_REPO: AgAs9HrVqlAIuhWZm80Sw31yTSkgYjOfZE8WT5nRU6cYGooGHZtlWB7/A0+G7fOFah8K79TZIXnH1kolJbfNV8Ff55ol8jvIf9UKCRbuc/LJkZ8cAj8sMYG2Jc0hosjZJQa++Y0+2/6/IdMxQH9Ytf5YCP73jaJSvckrMS54qezxA+R5hxNSKoxs3T/sN82yAy67bOTtKg7E/B3+z/rR3MGmBYy2XsIDzs47ag2Bu2ny9uARHmK6L9rjSJj2a9Lak3/NB+TJ/gCUEsV4UOFfMLORQbaE9KDTD29b5ejwn4/mp11bSCVfu2CT6bypH72HmjmcdJmzL1EhLPYAklEaE/kBOTe/3d8OaFL78oKok2CAuC/mVGdYpXvDdrCglwgY7scXqZKV1ZzBqMAGc4JRIpERHlyShGYx11RkfMRuDHl4pqjHii1khx6GjszNTJTozULeZp+D7zyrxll97GVl3LVvIPy6Ks69Qia+6dB176WsbjigblnJn47sLCev6YTKePzJPIWJ8clBrkY4mz00roEc2ruC7tVpFPhSABiX0teOSo8WjE+0zTZyqgrWP10/LLnTctzytAXfs11B4EJ4kb9fws/5pq/0AAVxmfovGKLT1x7nis2iEThhgud4+5cUjEMv8eV0nRAH7cbkCJbw0U4zCboiamdTrUTuirO/XEofzrEpgkqXns9rcOujiEo+QzplHiiFcAvNa2dfE8A8toQbhdlGwYFlu8XeXFx+DxN0gnn8l+o6Asd6w/9ddA== - SHARE_OVERLAYS_GIT_BRANCH: AgAnUqu+IVz5yFCqcf4wEFcc3nMU3XJXzyL7QMf9FmMfMZkLhWQIzCaHW+QuI3qesTL7GhMmGGE140n0+lZIzx/cxMpdg+ToahlpM6kqdqwMozN1Azm+RE93Ih7w6qFY/is73XqGloaeNUgZKMfb1kqGuxvAC7WhRBVoMDN123NMemEuYZl2b37yAVKMUtY+3Aqhp7Zf0WBCXdEW83VNxBT3nnNrtk6Yq7Z1/bGVM88EEss6BzDTT9WGZ8qPBpdPin6XOvWFK+ph+SjS9ODCI8WlzHHDyCtmQA4X3mul9HtVFWL20EIhQ7LRgmqY5fCoE1DtFOMUSoziD0MiYT8xLi7Pn3sZGUVtR2FFcKRGGyCgBXJ9JOJUDb6hveFYTSq436MuDuY0pi1Tig4G4ilNN5gT3ABxqw0lVCnHPN5Jcb6W6/HIe69zyzARv/4rLWrgu1IRpFbMEoLD5srgUvwgc1e3imqUbhiaS6jysOIOfYGUlPm//QEvK0G89Ji/eyIKFdC15MuD0mkyIp2gp6w2vvZ9A4bfAZ+UgqVzL/d7Q6lSHgZgbkv2ulqyiUFf8mFjfZUVmmRRaXy1ZnUGQENDnomxEmlkDyWerEjviwWX//kbRKq2Rczbg23q8wj+MT4x1dLYqYTy4ml/mLQ8swY944DHQkQnFC1MhVs//38D3I2XCMnKDhJMg02QU+XxHwLrZA9V80YLEMtYDJyN - SHARE_OVERLAYS_GIT_REPO: AgBCKAXTS7A9GCNuAuYD03PCjKocTcguGK/boIMNw9Fvthmt/Li7wS8sDcfTFJMPA53A01gfeKFFQi7CQLJBedImsAjEfzOUyPVJZ1QliDWk/XKuDHKmdH9m+WC/HSQm8qef8jhI4hY4/0U0IIC/fPBZOtZ3DtLoOFeDElzS178UyS1N2U0YaowMAhDkFpu8elqEkK4+P9I5fHmIHtlncfTyvcl+SS4EPOw+J5Bbq+MWgb4ruh8I/ZoYfcBUW5YeMpNjX8G9PJTYZgankfI7NnqP88NJhwK+MhT+jJcNZNqj2WE6DZTKlbALYDciWSLJZcEG5uSESQWHfg9zlC3OnQul7aTx4i5c7cASvC6o8vtmoHU2/H5QwVJ+nIn4jW1Jez+VitUBvn/DM7oLDT7JSM9wE+iC60StlRIeL4w/o+1hDztvjydXwmD8DWagystvtQTao7ph6YrUUNJrQ8LUhAZod54prCqkASib0I5p8FPmisBQRRscIcsXDV2nrOeTjQdueTr+zZm5lY/OstVPntmOr/p6vm/4uvtvhDrtWoy7RLhe7iBBVz4BTfn3M5cMXd55PlCTGt7xF5sQU1hS3w1b8An2lfW47jCVkRxLjt1ArsW+BC9xE3T4f8tX3+Hni93tYlpF9WawCW+59J9/KyZeuioAni4EUX7Jg3OYh3X4Q+/N9/qVODPtmLP2lEU/sKISUtvYJx2dRxlL3TbpXKMh4aqgYdmSwkR5H1EC1GO7copbwB2O+Zxwwm70Zg== + GIT_BLOCKLIST_BRANCH: AgAzxy+7vl2r0mSFyyKoTokc6kHAb1QvL3/v73NKihEaPc5EfmzOVlgtF/EYRwyO3nGDEhy+w0xPD/6sBeqA73ekxxm1nBrCZjAnSnbGoChyiA5qG/oD0mZ9/rR4KMYKGuZFTsY59WtkLWf5sXvF8UbgTSihwQi/gEY0j9PPQggp/sBtncdjOKgyMuAFT13slWN5gDbCST7DFFZbujqeRAy3lUzclng4bfDkvokKrtjGE38A6cH1IKYz+9WYAavb2BpsM3vFyMGaZb7GP1jlrfFNNu8wYXZRz2LbDFBdCHvwKfyf/7i+ixs/MKCO/vJwQ5Tm7Jg7gTAPFq4j85zt0NKIeqDfeKgE6kECGYMRFa5gdgWmFCRZ5ptGxVnqH2MxI6Mb6F/9agx82t4gu/gWGVON+Rw13u5973EAGGQf7lNxc2RUJPWjKM3iHUl2oUOer4Li8Ax3cpEmRmans+IshMUk55ZsUhmnANxvEdTubIfIBUJtvP03HXOCWsi2zHHRPAxkRQhR7Lb5NiW0lNppKvAeo31bNLD1HzivQHK1OUvAfRFMH/ycBetFyMFEUJe25G08RSmDELxuG8H8Ng+jx8cffw3vXO7+qD65n4rnTiG0DIJ7Hoe2V2Ht+wrZxGDaLoqSirGAPM3iweu3OCS3RpIz2mqNr9bfMPIlyP2EMK3hK+s2XKyXjw1tUCPyizqKM3eQwa2z + GIT_BLOCKLIST_PASSWORD: AgAhAlY5ZA3cji2YOUuYV0XB2H7Iej8gqXOBAz94VfV08L3p1cNv3woLAyMG9qn+cGjO8lYu/VyW5k7+v0iK7c/tuFkq1LhSpGrFum4DJEGwFRsjMg7k7VLgSeakFF0hXa0inze3FmRz2NJ2op3Agc4SaP0wTz7A2601sJC3FdPC9uJ2I9Wj3lc9OkfYzsZkYlNGZAdrb0I4m06QACjDdHZY+HHnGzHRnF2gl+GMxfKW40snWwRKManp2PLvU2jjJxTQPrsiXKBUZp+aGU5kE10Nahy855Ef3Ot0wc4YMaHlbLRgmRO8/Ida/3lYK4zQg2kghpQxj/nwqGGbOcswjMn28JyYO71ZX+X2+sTh9qvf8RzNCvP/VlyqiZ5+6P2I6CrgCOjlCA+kLmSiyxRZ7A4n8icmQZ720W5f95PJuIu/nI3NLDAkeAlGecjFamF5bFxyFq4mUfwLgKsC73q70uz3Hte1mDxUcrmcfHsZz4/L5a143sz3kW9indAi5MKTNqcY4Ws3KVp7ONTqm8TbNK+NM3sSy29pChRN8R6QBASxmVTpH2eSYKNQbTTAFmDu5K1uo11bKCjpYNc9638CyO+QpCXS2znuUo9kZPE11nkO0WJZ1Fy+LXiCnTUnDsya0beG84x6tlyXEiI1gKKbmtcPsbg/dH5NgJGIaorTd4dN+grk7D5zb0Xi6sHiWVWwSAY7IkXmmZD5F7/WnLeWMbMUOz6a6A== + GIT_BLOCKLIST_REPO: AgAU6JgThVouhCQBrI80WuafjPaM95Xd2Kz2zWy40spJvXbesmA5s0NieiAAw606mZsP8vawV91PLaSnrmh5Qp7UGk5LvWwepewB/kIEJBrO7m5AgsOIFEGPcspG4ODdPbTGj6P7wjMkstDBkUyv8U4r3udqlfUbTnvsi2bQYbBnhsrtZwb7GHU1zti117Xx1+zREkVV4/rlNWxsQCdeEj2K4l4d28nm9WAHoYRgCL0Eyda49LHuklBHwAXzEa0uo5vvWe9ZMBFVzA945ni/ewtMRl8lw350jrphdb0Y+5L2bD7zxrW+pcxWIdToGLVm4FwvPG7+1vu30s5OH/CeebouNn57ic59ex4eAO1xqbjzyIqA25C8QGxL3T17alSBt7Hrt7jP58a3jPNxHNFFsydN6Fjrd0N7gdbXL2QX+LraIHWyksnRbm6rJcbec/eKjeik+gccNSEOw5JAIqrHisER6bzPU0Zhd69NUNpm4BoxgKTNQuySHPiK/1J9GCFbRe1h79GxkY7IyztooESK2sL8VqLwTjfKwFnpAu63N3/droo4OcTu+5uPzvPYJObzpEx6V8QoV4kudfLqK0gyGIY+FtIQgLtmO4/ss/x7biJN0towGNkueZqBBk48DYeeMAKFL07qWMpnG1T84T8fD4gTXwJ4pqBpeiyn8IRT9tP2XuSw0uANwnsBFikyXkc5UjERfyt+aZIuHVVjcnZfRKeab0sicJuXMQYMl1QgBr3rhHwKuQq2JVaSp8fKxfXBSGzhkbPDDh8nUbzPQKMR90qITgWj7YM9yEw= + GIT_BLOCKLIST_USERNAME: AgATnnUCO6P8y2YTEWHEjsG1foH7fdHlwzlZOgbrMxYoSEwFU5plfS5S7a4XTpfNeZK81B/JrzopV+ATrPCa4ON4uDiGe8dftGVZi8LNT6K6irhyfgwAUG9kiHEsBiQnD1VKv3PwrVCgcFRUtn4Hjo1fJj+yLnPSA3zgI2GYK5c4sP0QkeqmaOQWvzXgMhYsj/vWJIg3Uhn9uB+naojO9jt/aSbgj8Gr4s950CvGJkmahN+XyJqjaiMEuaWZBXsuUAdAr2P9YOutv+kexcO7h9k8DwMdvW9zyJkM2+xins064yjg/S/npw9uFVTBx3c76e9qbjTznJDEPot0+kHvGyJ8nWsX/5v6Nh90cNzIvomfLCxddg7ybskkrr/QlfEvl/+Bj3FrfcKrPLSrbb0SnUZv9WVTEGMKAOvcaKWe3gJUrNPrbcu0PFEUldcWl3hGy91FpFWHxzjx/19LF3ue4+L5wSM+RMCBF0ZEwYtOkZvg1EXXReQQarxtZ1M5CHLZYyaVPma6ZKhAfQxasA6I3bOEj3BqA0nUnw94FOGJyXFYXEweI25APlJ44ciXvgKhaXIWwVzNN/RJ33RXMDzLM0EuPtkHPiJt6jm1gaN4ITJjRIp2Qh0IWvAw4YDGzhfpd6QBXzaRYLd+shkgulSHUycifE9GaD1962H1YvNCKaIMOChk7E360cLtvGzmHTKQMW5xXXttTYqGkq80Aw== + SHARE_BASE_GIT_BRANCH: AgAJNn/JMvzNIXtJrVjfIRcBT0TLLMBOR692FyAgbTw1iRYa6H9oN69wcK7IpEB5qc766xEl0N9mH6HjRa1dE7qSri+Ggb5BfeoF0IJdKJr5MvkR+z16dxiOy692dnpGfAYwV59MOS2KSSsq0f4lbW3vNrPBnEE4376mDTl62YpjfY6LIAsDVPZEyqSNmfwlgM/zxy5eLZfKEevQ0sXwyF2nkkOkU3wIfecjr1oLasXVa/daiXDVU1oMBRoMRluou3m1+EywNmpAUn3uNBivPvE1JIdbk7fJ0EsPzoOTLbo39dN6OdgJEf2R9IXeqWZsoHmRthp4ZMYXmDuv+JEZ3SDB7+TJ3yA7nU6lL0+6N/1iJDtSUzOuGabv3CI0QTjSA2HryLwIzi5cs8t33cPn665yhYAsgEloj57xcCeGXh8M8UgU5wJg5dcyaGomZHZGoXp3FHm3k2/7b4qCL182BrCHyoZ22u0TvyA1ONN1Na4CbeRoyZpwzc/UnGRYz4RolYKqHyP/N5AAdQR/eOWBkQJS8FN6vIo4sN6HrVrb35EEuc0EkO6kbhjBjl1rw8015QUJ0UwMuYCBFXxp0ILxKlvicRLcQoCsv0KV5g1GdWsrTeJI8aOWTmwkZZZhe2EXqL3UtaA6bkNxxkSVRGD1va8Qm9ZxvDimR0m+uozabiEFu4l8wt0s1k4Bmk8XzJ4jUc6Z4U5GsI3LFbI8 + SHARE_BASE_GIT_REPO: AgCg1nE3Ij70FJvZstCteIDitauKqZAT4vvOnvJ0VA1IZRilEGioFqpi4vcO0cVH+EDy0pn5lShI6fqFYVjvbXeBS86im/+BudTfOPKBh/E9gL7nYqDA2a+cNBiLFyvDZA27q7Soq0qp1arNCXKeXRSeJafcDArB0xchIDaYMnmGQ+XQZhJaQnnBpODcczGS8cN58I+tawk17jYmuzz/eAjqWkIBkk6jbrDiUwJAiX2kRIxAWhZ6y0exx98iDhqq4Mv/5ko1j8uk7GaF0qTLljzj+E981cyhHlME6COlcVgoi9iEqB2V8zPfnuvqyuVSaT+mTCoivxbIH4ePKA+aUNSyX9jbRLo5iZOPkMVbRCn5yCAiU+uN58I9g7V6mKe2SSd2cYZ6Dlwz7hzEropsEYd2SqZti3fLIASYN3bCobTGpQ8IQBdBMG5Aew2hpjoy5EoHCLebTlvgLsSN4oqoP4lVq8iyT/5KqkcO1U1rVxCVZM6ix/OZ471D/pPcQhggtmYUTA9gvEOVoABi29Mc9PyRfdDKyJOeNLLouiu7ZIQsIn8KsQGw4T6C3FfZpL4XotCumu3Y+M7o5ehHIkgL9Pzn3jaRAZMlDB9ipEMjLoqrxwDBnJ0u27vMWhNTGqPxkH9l0hS0A+fkItochr37FeGHuQ6EWsj9TsozenqaHcL0jGJ7Zs5ES9m6Az0CRiC7dXRaPQyZRN6kWJ//n7hCot4YckmSU/UPEHMXtbusXjPTXFGkklNoW9R3Wyr3+Q== + SHARE_OVERLAYS_GIT_BRANCH: AgBf7F5d8YKHQVTIyhg0svgt8L0k78LQ5da5tP6lZOr8CHQTaEH06mQNIw6GHev8mwL/FMS5IkoQKmrLd1EopRiutzNPbiih3JW77sw6HD1T0wQhF92DvtAZtdefSIOUv5SnvkcLjKp1+uOicTV+yf7tyzavolQYbVQWXjo5Txd+GlZisPGlFB0cZVII5/taFJFIqPxasmoqnWmnT8RDOVLiHTWzXqtcjBE7KPbZkq8TP27EQU1CWdyXs54HPCSpAloR7KeXKlP6BvjMmSCVZScPwNtSKH3QXjRpZaMeFnyeQ16P9FkfV/7sbfYP1bKIYdEn+rh+HwwhIwrPfpIzsC9soitjCdlz/wMoVyKWqS8+g+lIM4sTbyAfRQfniz6y+/3jI1UhM5WrU6oxHeAOamkOI2zXKXpbH/6icEQa/P7JJa78AUPg+DPWWs2o4HrWwe4HGQbB82jDInB7su0C1jwBW15XbR8ZFGRYOfdGFzUqV3YiQAFGrv5UiHatBJbzqkjWnl49nRMAdJ1rT7cJX7qh+7JLa2P8Z15B5SXMEol8MuJZwYmR7b+ZQzde7H7HwuK71ZLSGFyTk3cFU/Pb+b/LmrEJBXbudZ1/v5cNuk85wTRZYYRmageMAXQg2JlsOh53377Ke6djgNZXRb+Bz6OikZvQPtWCG5SFSBnRbs4rDA0qIFDiXJH/ykPk21xkKAvk2WbTvr1M5c29 + SHARE_OVERLAYS_GIT_REPO: AgCfuDDxtdNUwJqMlU/L6cjl+IvbRBwYbcNBFi3wCgZme6UhNTaWQwMqrz30djiIgOFM2kEyIyKBf9LnJss4OyigsB4q0dorxicN5Pg1QwTgHy5QVFxns8daR39Y4RfBD6xKOpzN/xeSy82WTKsyu5CzAXoRX3NNTCSGGaHndF3nRiyo03gvUxb5rqLuSI/jBfcRw4SJk8UC7UIw9TUiNCtCFXHjjlDEcrcB67Rp2dRe3jscDl7bXuS6HiHodK4XvD/8/34/PadiyskB6ktDw6NvWKGBhxR3gryf5E95Yi2HDscf/Gy/ecASHio/T4EtaCiGxMbD4bL+heFYfYjSNbPbg4RTGGNXHDlZ6/vX99x7GyLDLiMsPhn6nKY+pZlmuLc0qMqL6vDr8PU/GAAazNDgonlPodSblcqiqAG7qjFMNkU8rYqXgi4a/GtiM8oNsmhLgR6cgJr/FiN7ugO0mzk1aRdfvmu8ITjUx7SnoWaLb/VqbEsIKtFWEuWYX8hPts1FsI2KtdHv1BXPuuufHZfkol+xE3gJxQNERZCiBqTaXatn7AnLq2W7pbeGD0OKeT71JIRZBDMrfS9g1GGlY9qNCo2C6xdQborvfzUfJslD0NtFWouPNOdIy9zZGgce8qPkH4FCl3zUwzBV/4RuMe/jzO4vFtFpX5HhQlqLl4u6VbzyUpMhUQoMB5uDgY/VTm4O+zR2N+BN2IrIeaPVIB4UUvQGZ2Vh6S4WvyivtC5gH3VmO0XvpFoHY1Gg8g== template: metadata: creationTimestamp: null diff --git a/coec/z2jh/kustomize-maint/kustomization.yaml b/coec/z2jh/kustomize-maint/kustomization.yaml deleted file mode 100644 index 07d927ef14978d671898b3403935859579606015..0000000000000000000000000000000000000000 --- a/coec/z2jh/kustomize-maint/kustomization.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# InitContainer list in hub component: -# 0 - prepare-shared-data -# Container list in hub component: -# 0 - check-frontend-files -# 1 - sidecar-nginx -# 2 - hub -patches: -- target: - kind: Deployment - labelSelector: component=hub - patch: |- - - op: add - path: /spec/template/spec/containers/2/envFrom - value: - - secretRef: - name: generics - - op: replace - path: /spec/replicas - value: 0 -- target: - kind: Ingress - group: networking.k8s.io - version: v1 - labelSelector: app=jupyterhub - patch: |- - - op: replace - path: "/spec/rules/0/http/paths/0/backend/service/port/name" - value: https diff --git a/maintenance/values/overlays/production/hosts.yaml b/maintenance/values/overlays/production/hosts.yaml index 120d26bbf719c6c78b778a71dea5c90c0a2b1c86..2823651683bff69a13d0c54b9b49c3737fc749cf 100644 --- a/maintenance/values/overlays/production/hosts.yaml +++ b/maintenance/values/overlays/production/hosts.yaml @@ -12,5 +12,5 @@ ingress: secretName: coeraise-tls # - host: portal.gauss-centre.eu # secretName: portalgauss-tls - - host: jupyter-coec.jsc.fz-juelich.de - secretName: coec-tls \ No newline at end of file + #- host: jupyter-coec.jsc.fz-juelich.de + # secretName: coec-tls \ No newline at end of file