v2.0.0 fixes

src/kube/ingress.ts

@@ -86,7 +86,7 @@ export default class Ingress extends Resource {
  let service = this.prepareResource(definition);
  let templates = this.options.serviceTemplates;
  templates = templates.concat(this.prepareTemplates(definition));
- 
+
  if (this.options.applyServices) {
  await this.icinga.applyServiceGroup(definition.metadata.namespace);
 
@@ -138,14 +138,14 @@ export default class Ingress extends Resource {
 
  /**
  * Delete object
- */ 
+ */
  protected deleteObject(definition: any): Promise<boolean> {
  if (this.options.hostName === null) {
  let hostname = this.getHostname(definition);
  return this.icinga.deleteHost(hostname);
  }
- 
- return this.icinga.deleteServicesByFilter('service.vars.kubernetes.metadata.uid=="'+definition.metadata.uid+'"'); 
+
+ return this.icinga.deleteServicesByFilter('service.vars.kubernetes.metadata.uid=="'+definition.metadata.uid+'"');
  }
 
  /**
@@ -164,9 +164,9 @@ export default class Ingress extends Resource {
 
  if (object.type == 'MODIFIED' || object.type == 'DELETED') {
  await this.deleteObject(object.object).catch((err) => {
- this.logger.error('failed to remove objects', {error: err})
+ this.logger.error('failed to remove objects', {error: err});
  });
-  }
+ }
 
  if (object.type == 'ADDED' || object.type == 'MODIFIED') {
  this.prepareObject(object.object).catch((err) => {

src/kube/service.ts

@@ -183,7 +183,7 @@ export default class Service extends Resource {
 
  /**
  * Delete object
- */ 
+ */
  protected deleteObject(definition: any): Promise<boolean> {
  let serviceType = definition.spec.type;
 
@@ -192,7 +192,7 @@ export default class Service extends Resource {
  return this.icinga.deleteHost(hostname);
  }
 
- return this.icinga.deleteServicesByFilter('service.vars.kubernetes.metadata.uid=="'+definition.metadata.uid+'"'); 
+ return this.icinga.deleteServicesByFilter('service.vars.kubernetes.metadata.uid=="'+definition.metadata.uid+'"');
  }
 
  /**
@@ -216,7 +216,7 @@ export default class Service extends Resource {
 
  if (object.type == 'MODIFIED' || object.type == 'DELETED') {
  await this.deleteObject(object.object).catch((err) => {
- this.logger.error('failed to remove objects', {error: err})
+ this.logger.error('failed to remove objects', {error: err});
  });
  }
 

src/kube/volume.ts

@@ -86,6 +86,7 @@ export default class Volume extends Resource {
 
  if (this.options.applyServices) {
  let groups = [];
+
  if (definition.spec.claimRef.namespace) {
  groups.push(definition.spec.claimRef.namespace);
  await this.icinga.applyServiceGroup(definition.spec.claimRef.namespace);
@@ -125,15 +126,15 @@ export default class Volume extends Resource {
 
  /**
  * Delete object
- */ 
+ */
  protected deleteObject(definition: any): Promise<boolean> {
  if (this.options.hostName === null) {
  let hostname = this.getHostname(definition);
  return this.icinga.deleteHost(hostname);
  }
 
- return this.icinga.deleteServicesByFilter('service.vars.kubernetes.metadata.uid=="'+definition.metadata.uid+'"'); 
- } 
+ return this.icinga.deleteServicesByFilter('service.vars.kubernetes.metadata.uid=="'+definition.metadata.uid+'"');
+ }
 
  /**
  * Start kube listener
@@ -151,7 +152,7 @@ export default class Volume extends Resource {
 
  if (object.type == 'MODIFIED' || object.type == 'DELETED') {
  await this.deleteObject(object.object).catch((err) => {
- this.logger.error('failed to remove objects', {error: err})
+ this.logger.error('failed to remove objects', {error: err});
  });
  }
 

src/main.ts

@@ -23,7 +23,7 @@ async function main() {
  await icinga.deleteServicesByFilter('service.vars._kubernetes == true').catch((err) => {
  logger.error('failed to cleanup icinga services', {error: err});
  });
- 
+
  await icinga.deleteHostsByFilter('host.vars._kubernetes == true').catch((err) => {
  logger.error('failed to cleanup icinga hosts', {error: err});
  });
@@ -46,7 +46,7 @@ async function main() {
  return json;
  });
  }
- 
+
  if (config.kubernetes.volumes.discover) {
  kubeVolume.kubeListener(function() {
  let json = new JSONStream();