Enable Consistent Selectors across all Utility Containers

As AQUA automated testing needs consistent application and
component selectors.

Change-Id: I78c08d90398cd8ef428c53f803b3e11a7a0ab66c
Signed-off-by: diwakar thyagaraj <diwakar.chitoor.thyagaraj@att.com>

charts/calicoctl-utility/templates/deployment-calicoctl-utility.yaml

@@ -95,24 +95,24 @@ apiVersion: apps/v1
 metadata:
   name: {{ printf "%s" $envAll.Release.Name }}
   labels:
-{{ tuple $envAll "utility" "calicoctl-util" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
+{{ tuple $envAll "calico" "utility" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
   replicas: {{ .Values.pod.replicas.utility }}
   selector:
     matchLabels:
-{{ tuple $envAll "utility" "calicoctl-util" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
+{{ tuple $envAll "calico" "utility" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
   template:
     metadata:
       name: {{ printf "%s" $envAll.Release.Name }}
       labels:
-{{ tuple $envAll "utility" "calicoctl-util" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
+{{ tuple $envAll "calico" "utility" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
       annotations:
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
 {{ dict "envAll" $envAll "podName" "calicoctl-utility" "containerNames" (list "calicoctl-utility") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
 {{ tuple . | include "helm-toolkit.snippets.release_uuid"  | indent 8}}
     spec:
-{{ dict "envAll" $envAll "application" "calicoctl_util" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
+{{ dict "envAll" $envAll "application" "calico" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
       serviceAccountName: {{ $serviceAccountName }}
       nodeSelector:
         {{ .Values.labels.utility.node_selector_key }}: {{ .Values.labels.utility.node_selector_value }}
@@ -120,7 +120,7 @@ spec:
         - name: calicoctl-utility
 {{ tuple $envAll "calicoctl_utility" | include "helm-toolkit.snippets.image" | indent 10 }}
 {{ tuple $envAll $envAll.Values.pod.resources.calicoctl_utility | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
-{{ dict "envAll" $envAll "application" "calicoctl_util" "container" "calicoctl_utility" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
+{{ dict "envAll" $envAll "application" "calico" "container" "calicoctl_utility" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
           command:
             - "bootstrap.sh"
           readinessProbe:

charts/calicoctl-utility/values.yaml

@@ -31,7 +31,7 @@ images:
 
 pod:
   security_context:
-    calicoctl_util:
+    calico:
       pod:
         runAsUser: 65534
       container:

charts/etcdctl-utility/templates/configmap-bin.yaml

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if and .Values.manifests.configmap_bin .Values.deployment.etcdctl }}
+{{- if .Values.manifests.configmap_bin }}
 {{- $envAll := . }}
 ---
 apiVersion: v1

charts/etcdctl-utility/templates/configmap-etc-sudoers.yaml

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if and .Values.manifests.configmap_etc_sudoers .Values.deployment.etcdctl }}
+{{- if .Values.manifests.configmap_etc_sudoers }}
 {{- $envAll := . }}
 ---
 apiVersion: v1

charts/etcdctl-utility/templates/configmap-etc.yaml

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
-{{- if and .Values.manifests.configmap_etc_client .Values.deployment.etcdctl }}
+{{- if .Values.manifests.configmap_etc_client }}
 {{- $envAll := . }}
 
 ---

charts/etcdctl-utility/templates/deployment-etcdctl-utility.yaml

@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */}}
-{{- if and .Values.manifests.deployment_etcdctl_utility ( and .Values.deployment.etcdctl) }}
+{{- if .Values.manifests.deployment_etcdctl_utility }}
 {{- $envAll := . }}
 
 {{- $serviceAccountName := printf "%s" $envAll.Release.Name }}
@@ -57,34 +57,34 @@ metadata:
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
   labels:
-{{ tuple $envAll "utility" "etcdctl-util" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
+{{ tuple $envAll "etcd" "utility" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
   replicas: {{ .Values.pod.replicas.utility }}
   selector:
     matchLabels:
-{{ tuple $envAll "utility" "etcdctl-util" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
+{{ tuple $envAll "etcd" "utility" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
   template:
     metadata:
       name: {{ printf "%s" $envAll.Release.Name }}
       labels:
-{{ tuple $envAll "utility" "etcdctl-util" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
+{{ tuple $envAll "etcd" "utility" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
       annotations:
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
         {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
 {{ dict "envAll" $envAll "podName" "etcdctl-utility" "containerNames" (list "etcdctl-utility") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
     spec:
-{{ dict "envAll" $envAll "application" "etcdctl_util" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
+{{ dict "envAll" $envAll "application" "etcd" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
       serviceAccountName: {{ $serviceAccountName }}
       affinity:
-{{ tuple $envAll "etcdctl" "utility" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
+{{ tuple $envAll "etcd" "utility" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
       nodeSelector:
         {{ .Values.labels.utility.node_selector_key }}: {{ .Values.labels.utility.node_selector_value }}
       containers:
         - name: etcdctl-utility
 {{ tuple $envAll "etcdctl_utility" | include "helm-toolkit.snippets.image" | indent 10 }}
 {{ tuple $envAll $envAll.Values.pod.resources.etcdctl_utility | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
-{{ dict "envAll" $envAll "application" "etcdctl_util" "container" "etcdctl_utility" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
+{{ dict "envAll" $envAll "application" "etcd" "container" "etcdctl_utility" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
           env:
             - name: ETCDCTL_API
               value: "{{ .Values.conf.etcd.etcdctl_api }}"

charts/etcdctl-utility/values.yaml

@@ -17,10 +17,6 @@
 # Declare variables to be passed into your templates.
 # name: value
 
-
-deployment:
-  etcdctl: true
-
 release_group: null
 
 images:
@@ -45,7 +41,7 @@ labels:
 
 pod:
   security_context:
-    etcdctl_util:
+    etcd:
       pod:
         runAsUser: 65534
       container:
@@ -130,7 +126,6 @@ conf:
     endpoints: kubernetes-etcd.kube-system.svc.cluster.local
     etcdctl_api: "3"
   utility:
-    location_corridor: c1
     # Set to true for development sites,
     # Set to false otherwise
     always_log_user: true