From b2ac06da66627f741e0a7a2e8808a739e2a91942 Mon Sep 17 00:00:00 2001
From: Jonathan Meier <jwmeier@amazon.com>
Date: Fri, 23 Sep 2022 12:17:23 -0400
Subject: [PATCH] Conform helm chart to packages standards

---
 charts/metrics-server/templates/NOTES.txt            |  2 +-
 charts/metrics-server/templates/_helpers.tpl         |  2 +-
 charts/metrics-server/templates/apiservice.yaml      |  3 ++-
 .../templates/clusterrolebinding-auth-delegator.yaml |  2 +-
 .../metrics-server/templates/clusterrolebinding.yaml |  2 +-
 charts/metrics-server/templates/deployment.yaml      |  1 +
 charts/metrics-server/templates/rolebinding.yaml     |  2 +-
 charts/metrics-server/templates/service.yaml         |  2 ++
 charts/metrics-server/templates/serviceaccount.yaml  |  1 +
 charts/metrics-server/templates/servicemonitor.yaml  |  3 ++-
 charts/metrics-server/values.yaml                    | 12 ++++++------
 11 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/charts/metrics-server/templates/NOTES.txt b/charts/metrics-server/templates/NOTES.txt
index 0ad6bb0..84f5433 100644
--- a/charts/metrics-server/templates/NOTES.txt
+++ b/charts/metrics-server/templates/NOTES.txt
@@ -3,5 +3,5 @@
 ***********************************************************************
   Chart version: {{ .Chart.Version }}
   App version:   {{ .Chart.AppVersion }}
-  Image tag:     {{ include "metrics-server.image" . }}
+  Image ref:     {{ include "metrics-server.image" . }}
 ***********************************************************************
diff --git a/charts/metrics-server/templates/_helpers.tpl b/charts/metrics-server/templates/_helpers.tpl
index f558169..6968513 100644
--- a/charts/metrics-server/templates/_helpers.tpl
+++ b/charts/metrics-server/templates/_helpers.tpl
@@ -65,7 +65,7 @@ Create the name of the service account to use
 The image to use
 */}}
 {{- define "metrics-server.image" -}}
-{{- printf "%s:%s" .Values.image.repository (default (printf "v%s" .Chart.AppVersion) .Values.image.tag) }}
+{{- printf "%s/%s@%s" .Values.image.sourceRegistry .Values.image.repository .Values.image.digest }}
 {{- end }}
 
 {{/* Get PodDisruptionBudget API Version */}}
diff --git a/charts/metrics-server/templates/apiservice.yaml b/charts/metrics-server/templates/apiservice.yaml
index dd37b5d..26026fc 100644
--- a/charts/metrics-server/templates/apiservice.yaml
+++ b/charts/metrics-server/templates/apiservice.yaml
@@ -3,6 +3,7 @@ apiVersion: apiregistration.k8s.io/v1
 kind: APIService
 metadata:
   name: v1beta1.metrics.k8s.io
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "metrics-server.labels" . | nindent 4 }}
 spec:
@@ -11,7 +12,7 @@ spec:
   insecureSkipTLSVerify: true
   service:
     name: {{ include "metrics-server.fullname" . }}
-    namespace: {{ .Release.Namespace }}
+    namespace: {{ .Release.Namespace | quote }}
   version: v1beta1
   versionPriority: 100
 {{- end -}}
diff --git a/charts/metrics-server/templates/clusterrolebinding-auth-delegator.yaml b/charts/metrics-server/templates/clusterrolebinding-auth-delegator.yaml
index 826c3b7..c0fb07e 100644
--- a/charts/metrics-server/templates/clusterrolebinding-auth-delegator.yaml
+++ b/charts/metrics-server/templates/clusterrolebinding-auth-delegator.yaml
@@ -12,5 +12,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ include "metrics-server.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
+    namespace: {{ .Release.Namespace | quote }}
 {{- end -}}
diff --git a/charts/metrics-server/templates/clusterrolebinding.yaml b/charts/metrics-server/templates/clusterrolebinding.yaml
index 512cb65..f02a275 100644
--- a/charts/metrics-server/templates/clusterrolebinding.yaml
+++ b/charts/metrics-server/templates/clusterrolebinding.yaml
@@ -12,5 +12,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ include "metrics-server.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
+    namespace: {{ .Release.Namespace | quote }}
 {{- end -}}
diff --git a/charts/metrics-server/templates/deployment.yaml b/charts/metrics-server/templates/deployment.yaml
index 90e0588..2c0f320 100644
--- a/charts/metrics-server/templates/deployment.yaml
+++ b/charts/metrics-server/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "metrics-server.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "metrics-server.labels" . | nindent 4 }}
 spec:
diff --git a/charts/metrics-server/templates/rolebinding.yaml b/charts/metrics-server/templates/rolebinding.yaml
index 3fda743..4dc4e3c 100644
--- a/charts/metrics-server/templates/rolebinding.yaml
+++ b/charts/metrics-server/templates/rolebinding.yaml
@@ -13,5 +13,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ include "metrics-server.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
+    namespace: {{ .Release.Namespace | quote }}
 {{- end -}}
diff --git a/charts/metrics-server/templates/service.yaml b/charts/metrics-server/templates/service.yaml
index 7470218..3415cc4 100644
--- a/charts/metrics-server/templates/service.yaml
+++ b/charts/metrics-server/templates/service.yaml
@@ -2,6 +2,8 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "metrics-server.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
+
   {{- with .Values.service.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
diff --git a/charts/metrics-server/templates/serviceaccount.yaml b/charts/metrics-server/templates/serviceaccount.yaml
index 12f7724..99e3d32 100644
--- a/charts/metrics-server/templates/serviceaccount.yaml
+++ b/charts/metrics-server/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ template "metrics-server.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace | quote }}
   {{- with .Values.serviceAccount.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
diff --git a/charts/metrics-server/templates/servicemonitor.yaml b/charts/metrics-server/templates/servicemonitor.yaml
index 52e6491..25b0e74 100644
--- a/charts/metrics-server/templates/servicemonitor.yaml
+++ b/charts/metrics-server/templates/servicemonitor.yaml
@@ -3,6 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ include "metrics-server.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "metrics-server.labels" . | nindent 4 }}
     {{- with .Values.serviceMonitor.additionalLabels }}
@@ -12,7 +13,7 @@ spec:
   jobLabel: {{ .Release.Name }}
   namespaceSelector:
     matchNames:
-      - {{ .Release.Namespace }}
+      - {{ .Release.Namespace | quote }}
   selector:
     matchLabels:
       {{- include "metrics-server.selectorLabels" . | nindent 6 }}
diff --git a/charts/metrics-server/values.yaml b/charts/metrics-server/values.yaml
index 6a97505..7583ac6 100644
--- a/charts/metrics-server/values.yaml
+++ b/charts/metrics-server/values.yaml
@@ -3,13 +3,13 @@
 # Declare variables to be passed into your templates.
 
 image:
-  repository: k8s.gcr.io/metrics-server/metrics-server
-  # Overrides the image tag whose default is v{{ .Chart.AppVersion }}
-  tag: ""
-  pullPolicy: IfNotPresent
+  sourceRegistry: public.ecr.aws/eks-anywhere
+  repository: metrics-server/eks-distro/kubernetes-sigs/metrics-server
+  digest: {{eks-distro/kubernetes-sigs/metrics-server}}
 
-imagePullSecrets: []
-# - registrySecretName
+  pullPolicy: IfNotPresent
+  imagePullSecrets:
+    - regcred
 
 nameOverride: ""
 fullnameOverride: ""
-- 
2.30.1 (Apple Git-130)