ensure REALM_ID is unique by using ns

LEDfan · LEDfan · commit b08619a2b3d5 · 2023-01-17T12:16:57.000+01:00
diff --git a/docs/deployment/bases/shinyproxy/kustomization.yaml b/docs/deployment/bases/shinyproxy/kustomization.yaml
@@ -3,3 +3,6 @@ kind: Kustomization
 
 resources:
   - resources/shinyproxy.rbac.yaml
+
+configurations:
+  - kustomizeconfig/shinyproxy.yaml
diff --git a/docs/deployment/bases/shinyproxy/kustomizeconfig/shinyproxy.yaml b/docs/deployment/bases/shinyproxy/kustomizeconfig/shinyproxy.yaml
@@ -0,0 +1,3 @@
+images:
+  - path: spec/image
+    kind: ShinyProxy
diff --git a/docs/deployment/overlays/2-clustered/shinyproxy-dept2/resources/shinyproxy.shinyproxy.yaml b/docs/deployment/overlays/2-clustered/shinyproxy-dept2/resources/shinyproxy.shinyproxy.yaml
@@ -1,7 +1,7 @@
 apiVersion: openanalytics.eu/v1
 kind: ShinyProxy
 metadata:
-  name: shinyproxy-dept2
+  name: shinyproxy
 spec:
   server:
     secureCookies: true
diff --git a/src/main/kotlin/eu/openanalytics/shinyproxyoperator/components/PodTemplateSpecFactory.kt b/src/main/kotlin/eu/openanalytics/shinyproxyoperator/components/PodTemplateSpecFactory.kt
@@ -74,7 +74,7 @@ class PodTemplateSpecFactory {
                             .build(),
                             EnvVarBuilder()
                                 .withName("PROXY_REALM_ID")
-                                .withValue(shinyProxy.metadata.name)
+                                .withValue(shinyProxy.metadata.name + '-' + shinyProxy.metadata.namespace)
                             .build()))
                         .withVolumeMounts(VolumeMountBuilder()
                             .withName("config-volume")

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+images:`
	`2`	`+ - path: spec/image`
	`3`	`+ kind: ShinyProxy`