From 6e3c5b5ef6e6f274f48f07417f1d0e2631fb26e8 Mon Sep 17 00:00:00 2001
From: Ashwin Venkatesh <ashwin@hashicorp.com>
Date: Wed, 26 Jan 2022 15:44:23 -0500
Subject: [PATCH] Rename consul client daemonset.

---
 CHANGELOG.md                                  |  3 +-
 charts/consul/templates/client-daemonset.yaml |  2 +-
 ...nect-inject-authmethod-serviceaccount.yaml | 21 ------
 ...nect-inject-authmethod-serviceaccount.bats | 65 -------------------
 4 files changed, 3 insertions(+), 88 deletions(-)
 delete mode 100644 charts/consul/templates/connect-inject-authmethod-serviceaccount.yaml
 delete mode 100644 charts/consul/test/unit/connect-inject-authmethod-serviceaccount.bats

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a29d9d080a..cfcf2d9349 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 BREAKING CHANGES:
 * Helm
   * Some Consul components from the Helm chart have been renamed to ensure consistency in naming across the components.
-  This will not be a breaking change if Consul components are not referred to by name externally. Check the PR for the list of renamed components. [[GH-993](https://github.com/hashicorp/consul-k8s/pull/993)]
+  This will not be a breaking change if Consul components are not referred to by name externally. Check the PR for the list of renamed components. [[GH-993](https://github.com/hashicorp/consul-k8s/pull/993)][[GH-1000](https://github.com/hashicorp/consul-k8s/pull/1000)]
 
 FEATURES:
 * Helm
@@ -18,6 +18,7 @@ IMPROVEMENTS:
   * Allow using dash-separated names for config entries when using `kubectl`. [[GH-965](https://github.com/hashicorp/consul-k8s/pull/965)]
   * Support Pod Security Policies with Vault integration. [[GH-985](https://github.com/hashicorp/consul-k8s/pull/985)]
   * Rename Consul resources to remove resource kind suffixes from the resource names to standardize resource names across the Helm chart. [[GH-993](https://github.com/hashicorp/consul-k8s/pull/993)]
+  * Append `-client` to the Consul Daemonset name to standardize resource names across the Helm chart. [[GH-1000](https://github.com/hashicorp/consul-k8s/pull/1000)]
 * CLI
   * Show a diff when upgrading a Consul installation on Kubernetes [[GH-934](https://github.com/hashicorp/consul-k8s/pull/934)]
 * Control Plane
diff --git a/charts/consul/templates/client-daemonset.yaml b/charts/consul/templates/client-daemonset.yaml
index 9517d8d974..7c9c08d91f 100644
--- a/charts/consul/templates/client-daemonset.yaml
+++ b/charts/consul/templates/client-daemonset.yaml
@@ -11,7 +11,7 @@
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
-  name: {{ template "consul.fullname" . }}
+  name: {{ template "consul.fullname" . }}-client
   namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "consul.name" . }}
diff --git a/charts/consul/templates/connect-inject-authmethod-serviceaccount.yaml b/charts/consul/templates/connect-inject-authmethod-serviceaccount.yaml
deleted file mode 100644
index b8a8330334..0000000000
--- a/charts/consul/templates/connect-inject-authmethod-serviceaccount.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-{{- if or (and (ne (.Values.connectInject.enabled | toString) "-") .Values.connectInject.enabled) (and (eq (.Values.connectInject.enabled | toString) "-") .Values.global.enabled) }}
-{{- if .Values.global.acls.manageSystemACLs }}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ template "consul.fullname" . }}-connect-injector
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app: {{ template "consul.name" . }}
-    chart: {{ template "consul.chart" . }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-    component: connect-injector
-{{- with .Values.global.imagePullSecrets }}
-imagePullSecrets:
-{{- range . }}
-  - name: {{ .name }}
-{{- end }}
-{{- end }}
-{{- end }}
-{{- end }}
diff --git a/charts/consul/test/unit/connect-inject-authmethod-serviceaccount.bats b/charts/consul/test/unit/connect-inject-authmethod-serviceaccount.bats
deleted file mode 100644
index 68788cadc5..0000000000
--- a/charts/consul/test/unit/connect-inject-authmethod-serviceaccount.bats
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env bats
-
-load _helpers
-
-@test "connectInjectAuthMethod/ServiceAccount: disabled by default" {
-  cd `chart_dir`
-  assert_empty helm template \
-      -s templates/connect-inject-authmethod-serviceaccount.yaml  \
-      .
-}
-
-@test "connectInjectAuthMethod/ServiceAccount: enabled with global.enabled false" {
-  cd `chart_dir`
-  local actual=$(helm template \
-      -s templates/connect-inject-authmethod-serviceaccount.yaml  \
-      --set 'global.enabled=false' \
-      --set 'client.enabled=true' \
-      --set 'connectInject.enabled=true' \
-      --set 'global.acls.manageSystemACLs=true' \
-      . | tee /dev/stderr |
-      yq -s 'length > 0' | tee /dev/stderr)
-  [ "${actual}" = "true" ]
-}
-
-@test "connectInjectAuthMethod/ServiceAccount: disabled with connectInject.enabled" {
-  cd `chart_dir`
-  assert_empty helm template \
-      -s templates/connect-inject-authmethod-serviceaccount.yaml  \
-      --set 'connectInject.enabled=true' \
-      .
-}
-
-@test "connectInjectAuthMethod/ServiceAccount: enabled with global.acls.manageSystemACLs.enabled=true" {
-  cd `chart_dir`
-  local actual=$(helm template \
-      -s templates/connect-inject-authmethod-serviceaccount.yaml  \
-      --set 'connectInject.enabled=true' \
-      --set 'global.acls.manageSystemACLs=true' \
-      . | tee /dev/stderr |
-      yq -s 'length > 0' | tee /dev/stderr)
-  [ "${actual}" = "true" ]
-}
-
-#--------------------------------------------------------------------
-# global.imagePullSecrets
-
-@test "connectInjectAuthMethod/ServiceAccount: can set image pull secrets" {
-  cd `chart_dir`
-  local object=$(helm template \
-      -s templates/connect-inject-authmethod-serviceaccount.yaml  \
-      --set 'connectInject.enabled=true' \
-      --set 'global.acls.manageSystemACLs=true' \
-      --set 'global.imagePullSecrets[0].name=my-secret' \
-      --set 'global.imagePullSecrets[1].name=my-secret2' \
-      . | tee /dev/stderr)
-
-  local actual=$(echo "$object" |
-      yq -r '.imagePullSecrets[0].name' | tee /dev/stderr)
-  [ "${actual}" = "my-secret" ]
-
-  local actual=$(echo "$object" |
-      yq -r '.imagePullSecrets[1].name' | tee /dev/stderr)
-  [ "${actual}" = "my-secret2" ]
-}
-