Merge pull request #21 from gruntwork-io/yorinasub17-patch-1

Fix pdb

Author: yorinasub17

charts/k8s-service/templates/pdb.yaml

@@ -7,7 +7,6 @@ kind: PodDisruptionBudget
 metadata:
   name: {{ include "k8s-service.fullname" . }}
   labels:
-<<<<<<< HEAD
     gruntwork.io/app-name: {{ .Values.applicationName }}
     # These labels are required by helm. You can read more about required labels in the chart best practices guide:
     # https://docs.helm.sh/chart_best_practices/#standard-labels