Skip to content

Commit d669b6e

Browse files
committed
Merge branch 'main' into release/v1.6.0
2 parents 43954dc + 6b9e74f commit d669b6e

File tree

4 files changed

+18
-12
lines changed

4 files changed

+18
-12
lines changed

config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
kubero:
22
context: kind-kubero
33
namespace: kubero
4-
port: 3000
4+
port: 2000
55
buildpacks:
66
- name: NodeJS
77
language: JavaScript
@@ -85,7 +85,7 @@ buildpacks:
8585
repository: webdevops/nginx
8686
tag: alpine
8787
command: "supervisord"
88-
podSizeList:
88+
podSizeList:
8989
- name: small
9090
description: 'Small (CPU: 0.25, Memory: 0.5Gi)'
9191
default: true

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "kubero",
3-
"version": "1.5.0",
3+
"version": "1.5.3",
44
"description": "Heroku clone on Kubernetes",
55
"main": "dist/index.js",
66
"author": "Gianni Carafa",

src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ debug('app:server')
1212

1313
const app: Express = express();
1414
const server = http.createServer(app)
15-
const port: String = process.env.PORT || "3000";
15+
const port: String = process.env.PORT || "2000";
1616

1717
// API
1818
before(app);

src/modules/kubectl.ts

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -307,15 +307,21 @@ export class Kubectl {
307307

308308
public async getOperators() {
309309
// TODO list operators from all clusters
310-
let response = await this.customObjectsApi.listNamespacedCustomObject(
311-
'operators.coreos.com',
312-
'v1alpha1',
313-
'operators',
314-
'clusterserviceversions'
315-
)
310+
let operators = { items: [] };
311+
try {
312+
let response = await this.customObjectsApi.listNamespacedCustomObject(
313+
'operators.coreos.com',
314+
'v1alpha1',
315+
'operators',
316+
'clusterserviceversions'
317+
)
318+
//let operators = response.body as KubernetesListObject<KubernetesObject>;
319+
operators = response.body as any // TODO : fix type. This is a hacky way to get the type to work
320+
} catch (error) {
321+
debug.log(error);
322+
debug.log("error getting operators");
323+
}
316324

317-
//let operators = response.body as KubernetesListObject<KubernetesObject>;
318-
let operators = response.body as any // TODO : fix type. This is a hacky way to get the type to work
319325
return operators.items;
320326
}
321327

0 commit comments

Comments
 (0)