diff --git a/src/main/java/org/etsi/osl/cridge/KubernetesClientResource.java b/src/main/java/org/etsi/osl/cridge/KubernetesClientResource.java index 1d35d36b4aeba20cb036948988d041e52ce4f9f9..95c66213cd6bea1c85bf72399610089a8d613ed3 100644 --- a/src/main/java/org/etsi/osl/cridge/KubernetesClientResource.java +++ b/src/main/java/org/etsi/osl/cridge/KubernetesClientResource.java @@ -419,7 +419,7 @@ public class KubernetesClientResource { if ( this.watchersForNamespaces.get(nameSpacename) == null ) { //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); } diff --git a/src/main/java/org/etsi/osl/cridge/NamespaceWatcher.java b/src/main/java/org/etsi/osl/cridge/NamespaceWatcher.java index 268957abb44048ccd80819fd4f59975a1ba351a7..7088c2255ec0dbc358e69227493981fcd9ecb596 100644 --- a/src/main/java/org/etsi/osl/cridge/NamespaceWatcher.java +++ b/src/main/java/org/etsi/osl/cridge/NamespaceWatcher.java @@ -46,17 +46,16 @@ public class NamespaceWatcher { List< SharedIndexInformer<?>> informers = new ArrayList<>(); - - @Autowired 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(); this.kubernetesClient = kubernetesClient; this.catalogClient = catalogClient; this.nameSpacename = anameSpacename; this.headers = aheaders; + this.kubernetesClientResource = akubernetesClientResource; kubernetesSecretResourceSpec = catalogClient.retrieveResourceSpecByNameCategoryVersion( KubernetesSecret.OSL_KUBSECRET_RSPEC_NAME, @@ -75,9 +74,9 @@ public class NamespaceWatcher { 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); aNamespaceWatchers.informers.add( rSecret );