Chart: Fix usage of name & namespace. (#249)

* Chart: Fix usage of `name` & `namespace`. * Chart: Reorder `Chart.yaml`.
giantswarm · Nov 20, 2023 · 63b624a · 63b624a
1 parent 0f5c318
commit 63b624a
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project's packages adheres to [Semantic Versioning](http://semver.org/s
 - Build App with ABS.
 - Add basic tests with ATS.
 - ATS: Rework tests. ([#248](https://github.com/giantswarm/coredns-app/pull/248))
+- Chart: Fix usage of `name` & `namespace`. ([#249](https://github.com/giantswarm/coredns-app/pull/249))
 
 ## [1.19.0] - 2023-09-28
 

diff --git a/helm/coredns-app/.kube-linter.yaml b/helm/coredns-app/.kube-linter.yaml
@@ -1,3 +1,3 @@
 checks:                                                                                                                                                                                                                                            
   exclude:                                                                                                                                                                                                                                         
-  - "unset-cpu-requirements"                                                                                                                                                                                                                       
+  - unset-cpu-requirements
diff --git a/helm/coredns-app/Chart.yaml b/helm/coredns-app/Chart.yaml
@@ -1,9 +1,9 @@
+annotations:
+  application.giantswarm.io/team: cabbage
 apiVersion: v2
 appVersion: 1.9.3
 description: A Helm chart for CoreDNS
-icon: https://s.giantswarm.io/app-icons/coredns/1/dark.svg
 home: https://github.com/giantswarm/coredns-app
+icon: https://s.giantswarm.io/app-icons/coredns/1/dark.svg
 name: coredns-app
 version: 1.19.0
-annotations:
-  application.giantswarm.io/team: cabbage
diff --git a/helm/coredns-app/templates/hpa.yaml b/helm/coredns-app/templates/hpa.yaml
@@ -2,7 +2,8 @@
 apiVersion: {{ ternary "autoscaling/v2" "autoscaling/v2beta2" (.Capabilities.APIVersions.Has "autoscaling/v2") }}
 kind: HorizontalPodAutoscaler
 metadata:
-  name: coredns
+  name: {{ .Values.name }}
+  namespace: {{ .Values.namespace }}
   labels:
     {{- include "labels.common" . | nindent 4 }}
 spec:

diff --git a/helm/coredns-app/templates/np.yaml b/helm/coredns-app/templates/np.yaml
@@ -1,8 +1,8 @@
-kind: NetworkPolicy
 apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
 metadata:
-  namespace: {{ .Values.namespace }}
   name: {{ .Values.name }}
+  namespace: {{ .Values.namespace }}
   labels:
     {{- include "labels.common" . | nindent 4 }}
 spec:

diff --git a/helm/coredns-app/templates/psp.yaml b/helm/coredns-app/templates/psp.yaml
@@ -3,7 +3,6 @@ apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
   name: {{ .Values.name }}
-  namespace: {{ .Values.namespace }}
   annotations:
     seccomp.security.alpha.kubernetes.io/allowedProfileNames: 'runtime/default'
   labels: