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

Remove cloudshell #330

Merged
merged 1 commit into from
Dec 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion docs/region-configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ Users can work on Onyxia as a User or as a Group to which they belong. Each user
| `authenticationMode` | serviceAccount | serviceAccount, impersonate or tokenPassthrough : on serviceAccount mode Onyxia API uses its own serviceAccount (by default admin or cluster-admin), with impersonate mode Onyxia requests the API with user's permissions (helm option `--kube-as-user`). With tokenPassthrough, the authentication token is passed to the API server. | |
| `expose` | | When users request to expose their service, only subdomain of this object domain are allowed | See [Expose properties](#expose-properties) |
| `monitoring` | | Define the URL pattern of the monitoring service that is to be launched with each service. Only for client purposes. | {URLPattern: "https://$NAMESPACE-$INSTANCE.mymonitoring.sspcloud.fr"} |
| `cloudshell` | | Define the catalog and package name where to fetch the cloudshell in the helm catalog. | {catalogId: "inseefrlab-helm-charts-datascience", packageName: "cloudshell"} |
| `initScript` | | Define where to fetch a script that will be launched on some service on startup. | "https://inseefrlab.github.io/onyxia/onyxia-init.sh" |
| `allowedURIPattern` | "^https://" | Init scripts set by the user have to respect this pattern. | |
| `server` | | Define the configuration of the services provider API server, this value is not served on the API as it contains credentials for the API. | See [Server properties](#server-properties) |
Expand Down

This file was deleted.

4 changes: 0 additions & 4 deletions onyxia-api/src/main/resources/regions.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,6 @@
},
"monitoring": {
"URLPattern": "https://graphana.kub.example.com/$appIdSlug"
},
"cloudshell": {
"catalogId": "inseefrlab-helm-charts-datascience",
"packageName": "cloudshell"
}
},
"data": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import java.util.Map;

@JsonIgnoreProperties(ignoreUnknown = true)
@Schema(description = "Cloudshell data and health")
@Schema(description = "")
public class Property {
@Schema(description = "")
String type;
Expand Down Expand Up @@ -270,7 +270,7 @@ public void setxGenerated(XGenerated xGenerated) {
}

@JsonIgnoreProperties(ignoreUnknown = true)
@Schema(description = "Cloudshell data and health")
@Schema(description = "")
public static class Media {
String type;

Expand All @@ -284,7 +284,7 @@ public void setType(String type) {
}

@JsonIgnoreProperties(ignoreUnknown = true)
@Schema(description = "Cloudshell data and health")
@Schema(description = "")
public static class Hidden {
Object value;
String path;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"urls",
"version"
})
@Schema(description = "Cloudshell data and health")
@Schema(description = "")
public class Chart extends Pkg {

@Schema(description = "")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@ public static class Services {
private Expose expose;
private Server server;
private Monitoring monitoring;
private CloudshellConfiguration cloudshell;
private String initScript;
private String allowedURIPattern = "^https://";
private Quotas quotas = new Quotas();
Expand Down Expand Up @@ -313,14 +312,6 @@ public void setServer(Server server) {
this.server = server;
}

public CloudshellConfiguration getCloudshell() {
return cloudshell;
}

public void setCloudshell(CloudshellConfiguration cloudshell) {
this.cloudshell = cloudshell;
}

public Monitoring getMonitoring() {
return monitoring;
}
Expand Down Expand Up @@ -728,7 +719,7 @@ public void setUrlPattern(String urlPattern) {
}
}

@Schema(description = "Cloudshell data and health")
@Schema(description = "")
public static class Data {

private Atlas atlas;
Expand Down Expand Up @@ -1211,7 +1202,7 @@ public void setAuth(Auth auth) {
}

public static class OnyxiaAPI {
@Schema(description = "Cloudshell data and health")
@Schema(description = "")
private String baseURL;

public String getBaseURL() {
Expand Down Expand Up @@ -1340,7 +1331,7 @@ public void setPypiProxyUrl(String pypiProxyUrl) {
}
}

@Schema(description = "Cloudshell data and health")
@Schema(description = "")
public static class Location {

private double lat;
Expand Down Expand Up @@ -1375,27 +1366,6 @@ public void setName(String name) {
}
}

public static class CloudshellConfiguration {

private String catalogId, packageName;

public String getCatalogId() {
return catalogId;
}

public void setCatalogId(String catalogId) {
this.catalogId = catalogId;
}

public String getPackageName() {
return packageName;
}

public void setPackageName(String packageName) {
this.packageName = packageName;
}
}

public static class Auth {
private String token;
private String username, password;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -253,19 +253,19 @@ public String getPostInstallInstructions() {
return postInstallInstructions;
}

@Schema(description = "Cloudshell data and health")
@Schema(description = "")
public static enum ServiceStatus {
DEPLOYING,
RUNNING,
STOPPED;
}

@Schema(description = "Cloudshell data and health")
@Schema(description = "")
public static enum ServiceType {
KUBERNETES
}

@Schema(description = "Cloudshell data and health")
@Schema(description = "")
public static class Monitoring {
private String url;

Expand Down