Removed the changes caused by merge conflict

Signed-off-by: kiran <kiran.sundaravarathan@paytm.com>
kedacore · Apr 1, 2020 · 275d2b9 · 275d2b9
1 parent 5229603
commit 275d2b9
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/keda/templates/12-keda-deployment.yaml b/keda/templates/12-keda-deployment.yaml
@@ -12,10 +12,6 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
 {{ tpl .Values.additionalLabels . | indent 4}}
-  {{- if .Values.podAnnotations.keda }}
-  annotations:
-  {{ tpl .Values.podAnnotations.keda . | indent 4}}
-  {{- end }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:

diff --git a/keda/templates/22-metrics-deployment.yaml b/keda/templates/22-metrics-deployment.yaml
@@ -10,10 +10,6 @@ metadata:
     app.kubernetes.io/part-of: {{ .Values.operatorName }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-  {{- if .Values.podAnnotations.metricsAdapter }}
-  annotations:
-  {{ tpl .Values.podAnnotations.metricsAdapter . | indent 4}}
-  {{- end }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector: