Skip to content
Snippets Groups Projects
Commit c395e0db authored by trantzas's avatar 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
No related branches found
No related tags found
1 merge request!20Merge "20-refactor-cridge-cr-deletion" into "develop"
Pipeline #13456 passed
......@@ -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);
}
......
......@@ -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 );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment