fix: network trait unique dapr resiliency configmap

edgefarm · Jul 17, 2023 · 3e116a7 · 3e116a7
1 parent 6fafd9b
commit 3e116a7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cue/traits/edgefarm-network-trait.cue b/cue/traits/edgefarm-network-trait.cue
@@ -32,7 +32,7 @@ template: {
                         {
                             name: "dapr-resiliency"
                             configMap:
-                                name: "resiliency-"+parameter.network.name+"-"+parameter.network.user
+                                name: "resiliency-"+parameter.network.name+"-"+parameter.network.user+"-"+context.name
                         },
                     ]
                     initContainers: [{
@@ -122,7 +122,7 @@ template: {
             apiVersion: "v1"
             kind: "ConfigMap"
             metadata: {
-                name: "resiliency-"+parameter.network.name+"-"+parameter.network.user
+                name: "resiliency-"+parameter.network.name+"-"+parameter.network.user+"-"+context.name
             }
             data: {
                 "resiliency.yaml": """

diff --git a/manifests/vela-caps/traits/edgefarm-network-trait.yaml b/manifests/vela-caps/traits/edgefarm-network-trait.yaml
@@ -28,7 +28,7 @@ spec:
         			},
         			{
         				name: "dapr-resiliency"
-        				configMap: name: "resiliency-" + parameter.network.name + "-" + parameter.network.user
+        				configMap: name: "resiliency-" + parameter.network.name + "-" + parameter.network.user + "-" + context.name
         			},
         		]
         		initContainers: [{
@@ -112,7 +112,7 @@ spec:
         outputs: "resiliency-dapr-component": {
         	apiVersion: "v1"
         	kind:       "ConfigMap"
-        	metadata: name: "resiliency-" + parameter.network.name + "-" + parameter.network.user
+        	metadata: name: "resiliency-" + parameter.network.name + "-" + parameter.network.user + "-" + context.name
         	data: "resiliency.yaml": """
         		apiVersion: dapr.io/v1alpha1
         		kind: Resiliency