From 3ade71cf87e830f2624fbf315a47b0930c4cf02f Mon Sep 17 00:00:00 2001
From: Christos Tranoris <tranoris@ece.upatras.gr>
Date: Tue, 18 Feb 2025 21:35:38 +0200
Subject: [PATCH] fix for #20
---
.../org/etsi/osl/cridge/KubernetesClientResource.java | 2 +-
src/main/java/org/etsi/osl/cridge/NamespaceWatcher.java | 9 ++++-----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/etsi/osl/cridge/KubernetesClientResource.java b/src/main/java/org/etsi/osl/cridge/KubernetesClientResource.java
index 1d35d36..95c6621 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 268957a..7088c22 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 );
--
GitLab