From d22e6cfa4704673a244947789bcc93f049505466 Mon Sep 17 00:00:00 2001 From: Cristian Marquez Russo Date: Sat, 21 Sep 2019 07:57:34 -0300 Subject: [PATCH 1/5] Added Catalyst Cloud and CLVR Servers --- app/providers/catalystcloud.json | 71 ++++++++++++++++++++++++++++++++ app/providers/clvrcloud.json | 35 ++++++++++++++++ 2 files changed, 106 insertions(+) create mode 100644 app/providers/catalystcloud.json create mode 100644 app/providers/clvrcloud.json diff --git a/app/providers/catalystcloud.json b/app/providers/catalystcloud.json new file mode 100644 index 0000000..ed70ffd --- /dev/null +++ b/app/providers/catalystcloud.json @@ -0,0 +1,71 @@ +{ + "beta": false, + "fedramp": false, + "hasBandwidthPricing": true, + "hasDnsPricing": true, + "hasStorageOptions": false, + "hasWebProbe": true, + "hasWebProbeSsl": true, + "name": "CatalystCloud", + "providerId": "catalyst", + "regions": [ + { + "city": "Hamilton", + "country": "NZ", + "estimated": false, + "facilities": 1, + "locationLat": -37.7779, + "locationLong": 175.25975, + "planned": false, + "providerCode": "nz-hlz-1", + "providerCodeApi": "nz-hlz-1", + "regions": [ + "asia", + "asia_apac", + "oceania" + ], + "special": false + }, + { + "city": "Wellington", + "country": "NZ", + "estimated": false, + "facilities": 1, + "locationLat": -41.28664, + "locationLong": 174.77557, + "planned": false, + "providerCode": "nz_wlg_2", + "providerCodeApi": "nz_wlg_2", + "regions": [ + "asia", + "asia_apac", + "oceania" + ], + "special": true + }, + { + "city": "Porirua", + "country": "NZ", + "estimated": false, + "facilities": 1, + "locationLat": -41.104126, + "locationLong": 174.873596, + "planned": false, + "providerCode": "nz-por-1", + "providerCodeApi": "nz-por-1", + "regions": [ + "asia", + "asia_apac", + "oceania" + ], + "special": true + } + ], + "serviceId": "Kubernetes", + "shortName": "Catalyst", + "sla": 99.999, + "slaDescription": "CatalystCloud will guarantee 100% virtual server and network availability to the Customer. The network will be deemed available if UpCloud's routers and switches are available and responding properly. For all unscheduled interruptions in the provision of the Services, which are due to hardware or telecommunications failures that last longer than 5 minutes, UpCloud shall offer compensation to the Customer.", + "slaLink": "https://cloud.catalyst.net.nz", + "website": "https://cloud.catalyst.net.nz", + "type": "compute" +} diff --git a/app/providers/clvrcloud.json b/app/providers/clvrcloud.json new file mode 100644 index 0000000..9ad30d0 --- /dev/null +++ b/app/providers/clvrcloud.json @@ -0,0 +1,35 @@ +{ + "beta": false, + "fedramp": false, + "hasBandwidthPricing": true, + "hasDnsPricing": true, + "hasStorageOptions": false, + "hasWebProbe": true, + "hasWebProbeSsl": true, + "name": "CLVR", + "providerId": "clvr", + "regions": [ + { + "city": "Salta", + "country": "SLA", + "estimated": false, + "facilities": 1, + "locationLat": -24.782932, + "locationLong": -65.412155, + "planned": false, + "providerCode": "ar-sla-1", + "providerCodeApi": "ar-sla-1", + "regions": [ + "america_south", + "america" + ], + "special": true + } + ], + "serviceId": "Kubernetes", + "shortName": "CLVR", + "sla": 99.999, + "slaDescription": "CatalystCloud will guarantee 100% virtual server and network availability to the Customer. The network will be deemed available if UpCloud's routers and switches are available and responding properly. For all unscheduled interruptions in the provision of the Services, which are due to hardware or telecommunications failures that last longer than 5 minutes, UpCloud shall offer compensation to the Customer.", + "slaLink": "https://cloud.catalyst.net.nz", + "type": "compute" +} From 466c57ae805e6495f300b6adef7caad0da463a01 Mon Sep 17 00:00:00 2001 From: Cristian Marquez Russo Date: Sat, 21 Sep 2019 08:01:53 -0300 Subject: [PATCH 2/5] Removed clouds that we are not using and added new ones :) --- app/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/index.js b/app/index.js index 939b15b..96f0f15 100644 --- a/app/index.js +++ b/app/index.js @@ -16,13 +16,15 @@ import interoute from './providers/interoute.json'; import oracle from './providers/oracle.json'; import rackspace from './providers/rackspace.json'; import upcloud from './providers/upcloud.json'; +import catalystcloud from './providers/catalystcloud.json'; +import clvrcloud from './providers/clvrcloud.json'; // ============================== // DEFINE VARIABLES AND CONSTANTS // ============================== let map; -const providers = [alibaba, aws, azure, digitalocean, gc, interoute, oracle, rackspace, upcloud]; +const providers = [aws, azure, digitalocean, gc, catalystcloud, clvrcloud]; const markers = []; let context = ''; const template = Handlebars.compile(`
  • From 566b07c60b37c83acb7f212aed6ffa7e04c2c68e Mon Sep 17 00:00:00 2001 From: Cristian Marquez Russo Date: Sat, 21 Sep 2019 08:02:19 -0300 Subject: [PATCH 3/5] Removed the sidebard --- index.ejs | 34 ++-------------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/index.ejs b/index.ejs index 8c13eca..3e27b67 100644 --- a/index.ejs +++ b/index.ejs @@ -37,10 +37,10 @@
    -
  • diff --git a/index.ejs b/index.ejs index 3e27b67..3829512 100644 --- a/index.ejs +++ b/index.ejs @@ -37,7 +37,7 @@
    -