-
Notifications
You must be signed in to change notification settings - Fork 30
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #810 from at88mph/cascade-cleanup
Cascade cleanup
- Loading branch information
Showing
12 changed files
with
481 additions
and
123 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
106 changes: 106 additions & 0 deletions
106
skaha/src/main/java/org/opencadc/skaha/KubernetesJob.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| /* | ||
| ************************************************************************ | ||
| ******************* CANADIAN ASTRONOMY DATA CENTRE ******************* | ||
| ************** CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES ************** | ||
| * | ||
| * (c) 2025. (c) 2025. | ||
| * Government of Canada Gouvernement du Canada | ||
| * National Research Council Conseil national de recherches | ||
| * Ottawa, Canada, K1A 0R6 Ottawa, Canada, K1A 0R6 | ||
| * All rights reserved Tous droits réservés | ||
| * | ||
| * NRC disclaims any warranties, Le CNRC dénie toute garantie | ||
| * expressed, implied, or énoncée, implicite ou légale, | ||
| * statutory, of any kind with de quelque nature que ce | ||
| * respect to the software, soit, concernant le logiciel, | ||
| * including without limitation y compris sans restriction | ||
| * any warranty of merchantability toute garantie de valeur | ||
| * or fitness for a particular marchande ou de pertinence | ||
| * purpose. NRC shall not be pour un usage particulier. | ||
| * liable in any event for any Le CNRC ne pourra en aucun cas | ||
| * damages, whether direct or être tenu responsable de tout | ||
| * indirect, special or general, dommage, direct ou indirect, | ||
| * consequential or incidental, particulier ou général, | ||
| * arising from the use of the accessoire ou fortuit, résultant | ||
| * software. Neither the name de l'utilisation du logiciel. Ni | ||
| * of the National Research le nom du Conseil National de | ||
| * Council of Canada nor the Recherches du Canada ni les noms | ||
| * names of its contributors may de ses participants ne peuvent | ||
| * be used to endorse or promote être utilisés pour approuver ou | ||
| * products derived from this promouvoir les produits dérivés | ||
| * software without specific prior de ce logiciel sans autorisation | ||
| * written permission. préalable et particulière | ||
| * par écrit. | ||
| * | ||
| * This file is part of the Ce fichier fait partie du projet | ||
| * OpenCADC project. OpenCADC. | ||
| * | ||
| * OpenCADC is free software: OpenCADC est un logiciel libre ; | ||
| * you can redistribute it and/or vous pouvez le redistribuer ou le | ||
| * modify it under the terms of modifier suivant les termes de | ||
| * the GNU Affero General Public la “GNU Affero General Public | ||
| * License as published by the License” telle que publiée | ||
| * Free Software Foundation, par la Free Software Foundation | ||
| * either version 3 of the : soit la version 3 de cette | ||
| * License, or (at your option) licence, soit (à votre gré) | ||
| * any later version. toute version ultérieure. | ||
| * | ||
| * OpenCADC is distributed in the OpenCADC est distribué | ||
| * hope that it will be useful, dans l’espoir qu’il vous | ||
| * but WITHOUT ANY WARRANTY; sera utile, mais SANS AUCUNE | ||
| * without even the implied GARANTIE : sans même la garantie | ||
| * warranty of MERCHANTABILITY implicite de COMMERCIALISABILITÉ | ||
| * or FITNESS FOR A PARTICULAR ni d’ADÉQUATION À UN OBJECTIF | ||
| * PURPOSE. See the GNU Affero PARTICULIER. Consultez la Licence | ||
| * General Public License for Générale Publique GNU Affero | ||
| * more details. pour plus de détails. | ||
| * | ||
| * You should have received Vous devriez avoir reçu une | ||
| * a copy of the GNU Affero copie de la Licence Générale | ||
| * General Public License along Publique GNU Affero avec | ||
| * with OpenCADC. If not, see OpenCADC ; si ce n’est | ||
| * <http://www.gnu.org/licenses/>. pas le cas, consultez : | ||
| * <http://www.gnu.org/licenses/>. | ||
| * | ||
| ************************************************************************ | ||
| */ | ||
| package org.opencadc.skaha; | ||
|
|
||
| /** Simple class to represent a Kubernetes Job. This is just a clean way to encompass elements that it has access to. */ | ||
| public class KubernetesJob { | ||
| private final String name; | ||
| private final String uid; | ||
| private final String sessionID; | ||
| private final SessionType sessionType; | ||
|
|
||
| /** | ||
| * Constructor for a Job. Can be created from a single call to kubectl. | ||
| * | ||
| * @param name Name of the job | ||
| * @param uid Unique ID of the job | ||
| * @param sessionID Unique Session ID, provided by Skaha | ||
| * @param sessionType Session Type provided by the user | ||
| */ | ||
| public KubernetesJob(final String name, final String uid, final String sessionID, final SessionType sessionType) { | ||
| this.name = name; | ||
| this.uid = uid; | ||
| this.sessionID = sessionID; | ||
| this.sessionType = sessionType; | ||
| } | ||
|
|
||
| public SessionType getSessionType() { | ||
| return sessionType; | ||
| } | ||
|
|
||
| public String getSessionID() { | ||
| return sessionID; | ||
| } | ||
|
|
||
| public String getName() { | ||
| return name; | ||
| } | ||
|
|
||
| public String getUID() { | ||
| return uid; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| package org.opencadc.skaha; | ||
|
|
||
| import java.nio.file.Path; | ||
|
|
||
| public enum SessionType { | ||
| CARTA(true, true, "carta"), | ||
| CONTRIBUTED(true, true, "contributed"), | ||
| DESKTOP(true, true, "desktop"), | ||
| NOTEBOOK(true, true, "notebook"), | ||
| HEADLESS(false, false, "headless"), | ||
| DESKTOP_APP(false, false, "desktop-app"); | ||
|
|
||
| private final boolean supportsIngress; | ||
| private final boolean supportsService; | ||
| private final String applicationName; | ||
|
|
||
| SessionType(final boolean supportsIngress, final boolean supportsService, final String applicationName) { | ||
| this.supportsIngress = supportsIngress; | ||
| this.supportsService = supportsService; | ||
| this.applicationName = applicationName; | ||
| } | ||
|
|
||
| /** | ||
| * Obtain a Session Type from the requested string (type parameter). | ||
| * | ||
| * @param applicationStringType The requested session type | ||
| * @return SessionType The session type | ||
| * @throws IllegalArgumentException if the session type is invalid | ||
| */ | ||
| public static SessionType fromApplicationStringType(final String applicationStringType) { | ||
| for (SessionType type : SessionType.values()) { | ||
| if (type.applicationName.equalsIgnoreCase(applicationStringType)) { | ||
| return type; | ||
| } | ||
| } | ||
| throw new IllegalArgumentException("Invalid session type: " + applicationStringType); | ||
| } | ||
|
|
||
| public Path getIngressConfigPath() { | ||
| return Path.of(String.format( | ||
| "%s/config/ingress-%s.yaml", | ||
| K8SUtil.getWorkingDirectory(), this.name().toLowerCase())); | ||
| } | ||
|
|
||
| public Path getServiceConfigPath() { | ||
| return Path.of(String.format( | ||
| "%s/config/service-%s.yaml", | ||
| K8SUtil.getWorkingDirectory(), this.name().toLowerCase())); | ||
| } | ||
|
|
||
| public Path getJobConfigPath() { | ||
| return Path.of(String.format( | ||
| "%s/config/launch-%s.yaml", | ||
| K8SUtil.getWorkingDirectory(), this.name().toLowerCase())); | ||
| } | ||
|
|
||
| public String getServiceName(final String sessionID) { | ||
| return String.format("skaha-%s-svc-%s", this.name().toLowerCase(), sessionID); | ||
| } | ||
|
|
||
| public String getIngressName(final String sessionID) { | ||
| return String.format("skaha-%s-ingress-%s", this.name().toLowerCase(), sessionID); | ||
| } | ||
|
|
||
| public String getMiddlewareName(final String sessionID) { | ||
| return String.format("skaha-%s-middleware-%s", this.name().toLowerCase(), sessionID); | ||
| } | ||
|
|
||
| public boolean supportsIngress() { | ||
| return this.supportsIngress; | ||
| } | ||
|
|
||
| public boolean supportsService() { | ||
| return this.supportsService; | ||
| } | ||
|
|
||
| public boolean isHeadless() { | ||
| return this == HEADLESS; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.