Commit c395e0db authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch '20-refactor-cridge-cr-deletion' into 'develop' 

Merge "20-refactor-cridge-cr-deletion" into "develop"

See merge request !20
parents 847c6263 3ade71cf

src/main/java/org/etsi/osl/cridge/KubernetesClientResource.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -419,7 +419,7 @@ public class KubernetesClientResource { 
      if ( this.watchersForNamespaces.get(nameSpacename) == null ) {

      if ( this.watchersForNamespaces.get(nameSpacename) == null ) {

        

        

        //SharedIndexInformer<Secret> result = createWatchersFornamespace( nameSpacename, headers );

        //SharedIndexInformer<Secret> result = createWatchersFornamespace( nameSpacename, headers );

        NamespaceWatcher result = NamespaceWatcher.getNew( kubernetesClient, catalogClient, nameSpacename, headers);

        NamespaceWatcher result = NamespaceWatcher.getNew( kubernetesClient, catalogClient, nameSpacename, headers, this);

        this.watchersForNamespaces.put(nameSpacename, result);

        this.watchersForNamespaces.put(nameSpacename, result);

      }

      }

src/main/java/org/etsi/osl/cridge/NamespaceWatcher.java

+4 −5
Original line number Original line Diff line number Diff line
@@ -46,17 +46,16 @@ public class NamespaceWatcher { 
  

  

  List< SharedIndexInformer<?>> informers = new ArrayList<>();

  List< SharedIndexInformer<?>> informers = new ArrayList<>();

  

  



  @Autowired

  private KubernetesClientResource kubernetesClientResource;

  private KubernetesClientResource kubernetesClientResource;

  

  

  

  

  public NamespaceWatcher(KubernetesClient kubernetesClient, CatalogClient catalogClient, String anameSpacename, Map<String, Object> aheaders) {

  public NamespaceWatcher(KubernetesClient kubernetesClient, CatalogClient catalogClient, String anameSpacename, Map<String, Object> aheaders, KubernetesClientResource akubernetesClientResource) {

    super();

    super();

    this.kubernetesClient = kubernetesClient;

    this.kubernetesClient = kubernetesClient;

    this.catalogClient = catalogClient;

    this.catalogClient = catalogClient;

    this.nameSpacename = anameSpacename;

    this.nameSpacename = anameSpacename;

    this.headers = aheaders;

    this.headers = aheaders;

    this.kubernetesClientResource = akubernetesClientResource;

    

    

    kubernetesSecretResourceSpec  = catalogClient.retrieveResourceSpecByNameCategoryVersion(

    kubernetesSecretResourceSpec  = catalogClient.retrieveResourceSpecByNameCategoryVersion(

        KubernetesSecret.OSL_KUBSECRET_RSPEC_NAME, 

        KubernetesSecret.OSL_KUBSECRET_RSPEC_NAME,
@@ -75,9 +74,9 @@ public class NamespaceWatcher { 
        KubernetesConfigMap.OSL_KUBCMAP_RSPEC_VERSION);

        KubernetesConfigMap.OSL_KUBCMAP_RSPEC_VERSION);

  }

  }

  

  

  public static NamespaceWatcher getNew(KubernetesClient kubernetesClient2, CatalogClient catalogClient2, String anameSpacename, Map<String, Object> aheaders) {

  public static NamespaceWatcher getNew(KubernetesClient kubernetesClient2, CatalogClient catalogClient2, String anameSpacename, Map<String, Object> aheaders, KubernetesClientResource akubernetesClientResource) {

    

    

    NamespaceWatcher aNamespaceWatchers = new NamespaceWatcher(kubernetesClient2, catalogClient2, anameSpacename, aheaders);

    NamespaceWatcher aNamespaceWatchers = new NamespaceWatcher(kubernetesClient2, catalogClient2, anameSpacename, aheaders, akubernetesClientResource);

    

    

    SharedIndexInformer<Secret> rSecret = aNamespaceWatchers.createSecretWatchersFornamespace(anameSpacename, aheaders);

    SharedIndexInformer<Secret> rSecret = aNamespaceWatchers.createSecretWatchersFornamespace(anameSpacename, aheaders);

    aNamespaceWatchers.informers.add( rSecret );

    aNamespaceWatchers.informers.add( rSecret );