Remove Service -k8s suffix

hellofresh · Apr 21, 2021 · 56df5fb · 56df5fb
1 parent 30ef6ac
commit 56df5fb
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/charts/kangal/templates/ingress.yaml b/charts/kangal/templates/ingress.yaml
@@ -31,7 +31,7 @@ spec:
         paths:
           - path: {{ $ingressPath }}
             backend:
-              serviceName: {{ $fullName }}-{{ $key }}-k8s
+              serviceName: {{ $fullName }}-{{ $key }}
               servicePort: {{ $labelPort }}
 {{- else }}
 {{- range $key,$host := $hostValue }}
@@ -40,7 +40,7 @@ spec:
         paths:
           - path: {{ $ingressPath }}
             backend:
-              serviceName: {{ $fullName }}-{{ $key }}-k8s
+              serviceName: {{ $fullName }}-{{ $key }}
               servicePort: {{ $labelPort }}
 {{- end }}
 {{- end }}

diff --git a/charts/kangal/templates/service.yaml b/charts/kangal/templates/service.yaml
@@ -5,7 +5,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "<CHARTNAME>.fullname" $ }}-{{ $key }}-k8s
+  name: {{ template "<CHARTNAME>.fullname" $ }}-{{ $key }}
   labels:
     app: {{ template "<CHARTNAME>.name" $ }}-{{ $key }}
     chart: {{ template "<CHARTNAME>.chart" $ }}

diff --git a/examples/constant_load.jmx b/examples/constant_load.jmx
@@ -28,7 +28,7 @@
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
-          <stringProp name="HTTPSampler.domain">kangal-proxy-k8s.default</stringProp>
+          <stringProp name="HTTPSampler.domain">kangal-proxy.default</stringProp>
           <stringProp name="HTTPSampler.port"></stringProp>
           <stringProp name="HTTPSampler.protocol">http</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"></stringProp>

diff --git a/examples/linear_load.jmx b/examples/linear_load.jmx
@@ -44,7 +44,7 @@
           <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
             <collectionProp name="Arguments.arguments"/>
           </elementProp>
-          <stringProp name="HTTPSampler.domain">kangal-proxy-k8s.default</stringProp>
+          <stringProp name="HTTPSampler.domain">kangal-proxy.default</stringProp>
           <stringProp name="HTTPSampler.port"></stringProp>
           <stringProp name="HTTPSampler.protocol">http</stringProp>
           <stringProp name="HTTPSampler.contentEncoding"></stringProp>