@@ -636,32 +636,37 @@ export class Message {
636636 }
637637 cli . _logger . debug ( "[" + cli . user . username + "] GetIngress useringress" ) ;
638638 var ingress = await KubeUtil . instance ( ) . GetIngress ( namespace , "useringress" ) ;
639- // console.log(ingress);
640- var rule = null ;
641- for ( var i = 0 ; i < ingress . spec . rules . length ; i ++ ) {
642- if ( ingress . spec . rules [ i ] . host == hostname ) {
643- rule = ingress . spec . rules [ i ] ;
639+ if ( ingress !== null ) {
640+ // console.log(ingress);
641+ var rule = null ;
642+ for ( var i = 0 ; i < ingress . spec . rules . length ; i ++ ) {
643+ if ( ingress . spec . rules [ i ] . host == hostname ) {
644+ rule = ingress . spec . rules [ i ] ;
645+ }
644646 }
645- }
646- if ( rule == null ) {
647- cli . _logger . debug ( "[" + cli . user . username + "] ingress " + hostname + " not found in useringress creating it" ) ;
648- rule = {
649- host : hostname ,
650- http : {
651- paths : [ {
652- path : "/" ,
653- backend : {
654- serviceName : name ,
655- servicePort : "www"
656- }
657- } ]
647+ if ( rule == null ) {
648+ cli . _logger . debug ( "[" + cli . user . username + "] ingress " + hostname + " not found in useringress creating it" ) ;
649+ rule = {
650+ host : hostname ,
651+ http : {
652+ paths : [ {
653+ path : "/" ,
654+ backend : {
655+ serviceName : name ,
656+ servicePort : "www"
657+ }
658+ } ]
659+ }
658660 }
661+ delete ingress . metadata . creationTimestamp ;
662+ delete ingress . status ;
663+ ingress . spec . rules . push ( rule ) ;
664+ cli . _logger . debug ( "[" + cli . user . username + "] replaceNamespacedIngress" ) ;
665+ await KubeUtil . instance ( ) . ExtensionsV1beta1Api . replaceNamespacedIngress ( "useringress" , namespace , ingress ) ;
659666 }
660- delete ingress . metadata . creationTimestamp ;
661- delete ingress . status ;
662- ingress . spec . rules . push ( rule ) ;
663- cli . _logger . debug ( "[" + cli . user . username + "] replaceNamespacedIngress" ) ;
664- await KubeUtil . instance ( ) . ExtensionsV1beta1Api . replaceNamespacedIngress ( "useringress" , namespace , ingress ) ;
667+ } else {
668+ cli . _logger . error ( "[" + cli . user . username + "] failed locating useringress" ) ;
669+ msg . error = "failed locating useringress" ;
665670 }
666671 } catch ( error ) {
667672 this . data = "" ;
@@ -722,16 +727,21 @@ export class Message {
722727 // }
723728 // }
724729 var ingress = await KubeUtil . instance ( ) . GetIngress ( namespace , "useringress" ) ;
725- var updated = false ;
726- for ( var i = ingress . spec . rules . length - 1 ; i >= 0 ; i -- ) {
727- if ( ingress . spec . rules [ i ] . host == hostname ) {
728- ingress . spec . rules . splice ( i , 1 ) ;
729- updated = true ;
730+ if ( ingress !== null ) {
731+ var updated = false ;
732+ for ( var i = ingress . spec . rules . length - 1 ; i >= 0 ; i -- ) {
733+ if ( ingress . spec . rules [ i ] . host == hostname ) {
734+ ingress . spec . rules . splice ( i , 1 ) ;
735+ updated = true ;
736+ }
730737 }
731- }
732- if ( updated ) {
733- delete ingress . metadata . creationTimestamp ;
734- await KubeUtil . instance ( ) . ExtensionsV1beta1Api . replaceNamespacedIngress ( "useringress" , namespace , ingress ) ;
738+ if ( updated ) {
739+ delete ingress . metadata . creationTimestamp ;
740+ await KubeUtil . instance ( ) . ExtensionsV1beta1Api . replaceNamespacedIngress ( "useringress" , namespace , ingress ) ;
741+ }
742+ } else {
743+ cli . _logger . error ( "[" + cli . user . username + "] failed locating useringress" ) ;
744+ msg . error = "failed locating useringress" ;
735745 }
736746 } catch ( error ) {
737747 this . data = "" ;
0 commit comments