address incorrect affinity spec (istio#440)

* add ignore file * fix for 18130 * generated file update
pitlv2109 · Oct 23, 2019 · 4a2e9c0 · 4a2e9c0
1 parent a6d3a87
commit 4a2e9c0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,3 +25,6 @@ kubedns
 out/
 build/out/
 data/charts/
+#cli logs
+.mesh-cli.log
+cmd/mesh/,mesh-cli.log
diff --git a/data/translateConfig/translateConfig-1.3.yaml b/data/translateConfig/translateConfig-1.3.yaml
@@ -19,7 +19,7 @@ apiMapping:
     outPath: "global.securityNamespace"
 kubernetesMapping:
   "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.Affinity":
-    outPath: "[{{.ResourceType}}:{{.ResourceName}}].spec.template.spec.containers.[name:{{.ContainerName}}].affinity"
+    outPath: "[{{.ResourceType}}:{{.ResourceName}}].spec.template.spec.affinity"
   "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.Env":
     outPath: "[{{.ResourceType}}:{{.ResourceName}}].spec.template.spec.containers.[name:{{.ContainerName}}].env"
   "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.HpaSpec":

diff --git a/data/translateConfig/translateConfig-1.4.yaml b/data/translateConfig/translateConfig-1.4.yaml
@@ -19,7 +19,7 @@ apiMapping:
     outPath: "global.securityNamespace"
 kubernetesMapping:
   "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.Affinity":
-    outPath: "[{{.ResourceType}}:{{.ResourceName}}].spec.template.spec.containers.[name:{{.ContainerName}}].affinity"
+    outPath: "[{{.ResourceType}}:{{.ResourceName}}].spec.template.spec.affinity"
   "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.Env":
     outPath: "[{{.ResourceType}}:{{.ResourceName}}].spec.template.spec.containers.[name:{{.ContainerName}}].env"
   "{{.FeatureName}}.Components.{{.ComponentName}}.K8S.HpaSpec":

diff --git a/pkg/vfs/assets.gen.go b/pkg/vfs/assets.gen.go