Skip to content

Commit 4b22d3f

Browse files
committed
Ref #26797: ensure manifests can be created in ns
1 parent 3754042 commit 4b22d3f

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

src/main/java/eu/openanalytics/containerproxy/backend/kubernetes/KubernetesBackend.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
7070
import io.fabric8.kubernetes.client.KubernetesClient;
7171
import io.fabric8.kubernetes.client.dsl.LogWatch;
72-
import io.fabric8.kubernetes.client.dsl.MixedOperation;
72+
import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
7373
import io.fabric8.kubernetes.client.dsl.Resource;
7474
import io.fabric8.kubernetes.client.dsl.base.PatchContext;
7575
import io.fabric8.kubernetes.client.dsl.base.PatchType;
@@ -400,7 +400,8 @@ private List<GenericKubernetesResource> getAdditionPersistentManifestsAsObjects(
400400
}
401401

402402
private void applyAdditionalManifest(GenericKubernetesResource resource) {
403-
MixedOperation<GenericKubernetesResource, GenericKubernetesResourceList, Resource<GenericKubernetesResource>> client = kubeClient.genericKubernetesResources(resource.getApiVersion(), resource.getKind());
403+
NonNamespaceOperation<GenericKubernetesResource, GenericKubernetesResourceList, Resource<GenericKubernetesResource>> client
404+
= kubeClient.genericKubernetesResources(resource.getApiVersion(), resource.getKind()).inNamespace(resource.getMetadata().getNamespace());
404405
String policy;
405406
if (resource.getMetadata().getAnnotations() != null) {
406407
policy = resource.getMetadata().getAnnotations().getOrDefault(ANNOTATION_MANIFEST_POLICY, "CreateOnce");

0 commit comments

Comments
 (0)