From 057b4f3a57a5533e3f92972f7bf6fa4ca6c06f89 Mon Sep 17 00:00:00 2001
From: Liviu Costea <email.lcostea@gmail.com>
Date: Wed, 6 Feb 2019 22:00:06 +0200
Subject: [PATCH] Harcode resource names because code expects them this way

Some resource names and application urls are hardcoded in code with these
names. So they can't be parameterized.
---
 .../argocd-application-controller-clusterrole.yaml          | 2 +-
 .../argocd-application-controller-clusterrolebinding.yaml   | 6 +++---
 .../templates/argocd-application-controller-deployment.yaml | 6 +++---
 .../templates/argocd-application-controller-role.yaml       | 2 +-
 .../argocd-application-controller-rolebinding.yaml          | 6 +++---
 .../argo-cd/templates/argocd-application-controller-sa.yaml | 2 +-
 .../templates/argocd-application-controller-service.yaml    | 2 +-
 charts/argo-cd/templates/argocd-cm.yaml                     | 2 +-
 charts/argo-cd/templates/argocd-metrics-service.yaml        | 2 +-
 charts/argo-cd/templates/argocd-rbac-cm.yaml                | 6 +++---
 charts/argo-cd/templates/argocd-repo-server-deployment.yaml | 2 +-
 charts/argo-cd/templates/argocd-repo-server-service.yaml    | 2 +-
 charts/argo-cd/templates/argocd-secret.yaml                 | 2 +-
 charts/argo-cd/templates/argocd-server-deployment.yaml      | 4 ++--
 charts/argo-cd/templates/argocd-server-role.yaml            | 2 +-
 charts/argo-cd/templates/argocd-server-rolebinding.yaml     | 6 +++---
 charts/argo-cd/templates/argocd-server-sa.yaml              | 2 +-
 charts/argo-cd/templates/argocd-server-service.yaml         | 2 +-
 18 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/charts/argo-cd/templates/argocd-application-controller-clusterrole.yaml b/charts/argo-cd/templates/argocd-application-controller-clusterrole.yaml
index 9e366975..83a31835 100644
--- a/charts/argo-cd/templates/argocd-application-controller-clusterrole.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller-clusterrole.yaml
@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ include "argo-cd.fullname" . }}-application-controller
+  name: argocd-application-controller
   labels:
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
     helm.sh/chart: {{ include "argo-cd.chart" . }}
diff --git a/charts/argo-cd/templates/argocd-application-controller-clusterrolebinding.yaml b/charts/argo-cd/templates/argocd-application-controller-clusterrolebinding.yaml
index f3b5e12d..0ab7df66 100644
--- a/charts/argo-cd/templates/argocd-application-controller-clusterrolebinding.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller-clusterrolebinding.yaml
@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ include "argo-cd.fullname" . }}-application-controller
+  name: argocd-application-controller
   labels:
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
     helm.sh/chart: {{ include "argo-cd.chart" . }}
@@ -13,9 +13,9 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ include "argo-cd.fullname" . }}-application-controller
+  name: argocd-application-controller
 subjects:
 - kind: ServiceAccount
-  name: {{ include "argo-cd.fullname" . }}-application-controller
+  name: argocd-application-controller
   namespace: {{ .Release.Namespace }}
 {{- end -}} }}
\ No newline at end of file
diff --git a/charts/argo-cd/templates/argocd-application-controller-deployment.yaml b/charts/argo-cd/templates/argocd-application-controller-deployment.yaml
index 860bf0f1..31dd0a0b 100755
--- a/charts/argo-cd/templates/argocd-application-controller-deployment.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller-deployment.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "argo-cd.fullname" . }}-application-controller
+  name: argocd-application-controller
   labels:
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
     helm.sh/chart: {{ include "argo-cd.chart" . }}
@@ -32,7 +32,7 @@ spec:
         - "10"
         image: {{ .Values.applicationController.image.repository }}:{{ .Values.applicationController.image.tag }}
         imagePullPolicy: {{ .Values.applicationController.image.pullPolicy }}
-        name: {{ include "argo-cd.name" . }}-application-controller
+        name: argocd-application-controller
         ports:
         - containerPort: {{ .Values.applicationController.containerPort }}
         readinessProbe:
@@ -40,4 +40,4 @@ spec:
             port: {{ .Values.applicationController.containerPort }}
           initialDelaySeconds: 5
           periodSeconds: 10
-      serviceAccountName: {{ include "argo-cd.name" . }}-application-controller
+      serviceAccountName: argocd-application-controller
diff --git a/charts/argo-cd/templates/argocd-application-controller-role.yaml b/charts/argo-cd/templates/argocd-application-controller-role.yaml
index 60bed254..e6418a4f 100755
--- a/charts/argo-cd/templates/argocd-application-controller-role.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller-role.yaml
@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: {{ include "argo-cd.fullname" . }}-application-controller
+  name: argocd-application-controller
   labels:
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
     helm.sh/chart: {{ include "argo-cd.chart" . }}
diff --git a/charts/argo-cd/templates/argocd-application-controller-rolebinding.yaml b/charts/argo-cd/templates/argocd-application-controller-rolebinding.yaml
index 77d51cc9..530475ec 100755
--- a/charts/argo-cd/templates/argocd-application-controller-rolebinding.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller-rolebinding.yaml
@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: {{ include "argo-cd.fullname" . }}-application-controller
+  name: argocd-application-controller
   labels:
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
     helm.sh/chart: {{ include "argo-cd.chart" . }}
@@ -12,7 +12,7 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: {{ include "argo-cd.fullname" . }}-application-controller
+  name: argocd-application-controller
 subjects:
 - kind: ServiceAccount
-  name: {{ include "argo-cd.fullname" . }}-application-controller
+  name: argocd-application-controller
diff --git a/charts/argo-cd/templates/argocd-application-controller-sa.yaml b/charts/argo-cd/templates/argocd-application-controller-sa.yaml
index 0e937f37..bd1890b7 100755
--- a/charts/argo-cd/templates/argocd-application-controller-sa.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller-sa.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "argo-cd.fullname" . }}-application-controller
+  name: argocd-application-controller
   labels:
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
     helm.sh/chart: {{ include "argo-cd.chart" . }}
diff --git a/charts/argo-cd/templates/argocd-application-controller-service.yaml b/charts/argo-cd/templates/argocd-application-controller-service.yaml
index 50f191d5..76b8b701 100755
--- a/charts/argo-cd/templates/argocd-application-controller-service.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller-service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "argo-cd.fullname" . }}-application-controller
+  name: argocd-application-controller
   labels:
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
     helm.sh/chart: {{ include "argo-cd.chart" . }}
diff --git a/charts/argo-cd/templates/argocd-cm.yaml b/charts/argo-cd/templates/argocd-cm.yaml
index 306ae024..79045e90 100755
--- a/charts/argo-cd/templates/argocd-cm.yaml
+++ b/charts/argo-cd/templates/argocd-cm.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "argo-cd.fullname" . }}-cm
+  name: argocd-cm
   labels: 
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}
     helm.sh/chart: {{ include "argo-cd.chart" . }}
diff --git a/charts/argo-cd/templates/argocd-metrics-service.yaml b/charts/argo-cd/templates/argocd-metrics-service.yaml
index 63fad0e5..f3a7b4f2 100755
--- a/charts/argo-cd/templates/argocd-metrics-service.yaml
+++ b/charts/argo-cd/templates/argocd-metrics-service.yaml
@@ -8,7 +8,7 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/part-of: {{ include "argo-cd.name" . }}
     app.kubernetes.io/component: server
-  name: {{ include "argo-cd.fullname" . }}-metrics
+  name: argocd-metrics
 spec:
   ports:
   - name: http
diff --git a/charts/argo-cd/templates/argocd-rbac-cm.yaml b/charts/argo-cd/templates/argocd-rbac-cm.yaml
index 133a2187..fb688d03 100755
--- a/charts/argo-cd/templates/argocd-rbac-cm.yaml
+++ b/charts/argo-cd/templates/argocd-rbac-cm.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "argo-cd.fullname" . }}-rbac-cm
+  name: argocd-rbac-cm
   labels:
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}
     helm.sh/chart: {{ include "argo-cd.chart" . }}
@@ -13,6 +13,6 @@ data:
   policy.default: {{ .Values.rbac.policyDefault }}
 {{- end }}
 {{- if .Values.rbac.policyCsv }}
-  policy.csv: |
-{{ toYaml .Values.rbac.policyCsv | indent 4 }}
+  policy.csv:
+{{- toYaml .Values.rbac.policyCsv | indent 4 }}
 {{- end }}
diff --git a/charts/argo-cd/templates/argocd-repo-server-deployment.yaml b/charts/argo-cd/templates/argocd-repo-server-deployment.yaml
index de7664bb..66229263 100755
--- a/charts/argo-cd/templates/argocd-repo-server-deployment.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server-deployment.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "argo-cd.fullname" . }}-repo-server
+  name: argocd-repo-server
   labels:
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}-repo-server
     helm.sh/chart: {{ include "argo-cd.chart" . }}
diff --git a/charts/argo-cd/templates/argocd-repo-server-service.yaml b/charts/argo-cd/templates/argocd-repo-server-service.yaml
index 8b540d0e..68b80200 100755
--- a/charts/argo-cd/templates/argocd-repo-server-service.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server-service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "argo-cd.fullname" . }}-repo-server
+  name: argocd-repo-server
   labels:
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}-repo-server
     helm.sh/chart: {{ include "argo-cd.chart" . }}
diff --git a/charts/argo-cd/templates/argocd-secret.yaml b/charts/argo-cd/templates/argocd-secret.yaml
index c4a5000d..c693d079 100755
--- a/charts/argo-cd/templates/argocd-secret.yaml
+++ b/charts/argo-cd/templates/argocd-secret.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "argo-cd.fullname" . }}-secret
+  name: argocd-secret
   labels: 
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}
     helm.sh/chart: {{ include "argo-cd.chart" . }}
diff --git a/charts/argo-cd/templates/argocd-server-deployment.yaml b/charts/argo-cd/templates/argocd-server-deployment.yaml
index c29b1ab5..0a3bb3dc 100755
--- a/charts/argo-cd/templates/argocd-server-deployment.yaml
+++ b/charts/argo-cd/templates/argocd-server-deployment.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "argo-cd.fullname" . }}-server
+  name: argocd-server
   labels:
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
     helm.sh/chart: {{ include "argo-cd.chart" . }}
@@ -23,7 +23,7 @@ spec:
         app.kubernetes.io/part-of: {{ include "argo-cd.name" . }}
         app.kubernetes.io/component: server
     spec:
-      serviceAccountName: {{ include "argo-cd.fullname" . }}-server
+      serviceAccountName: argocd-server
       initContainers:
       - name: ui
         image: {{ .Values.server.uiInitImage.repository }}:{{ .Values.server.uiInitImage.tag }}
diff --git a/charts/argo-cd/templates/argocd-server-role.yaml b/charts/argo-cd/templates/argocd-server-role.yaml
index 18339313..832ca5c4 100755
--- a/charts/argo-cd/templates/argocd-server-role.yaml
+++ b/charts/argo-cd/templates/argocd-server-role.yaml
@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: {{ include "argo-cd.fullname" . }}-server
+  name: argocd-server
   labels:
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
     helm.sh/chart: {{ include "argo-cd.chart" . }}
diff --git a/charts/argo-cd/templates/argocd-server-rolebinding.yaml b/charts/argo-cd/templates/argocd-server-rolebinding.yaml
index d91a32fd..4c53b979 100755
--- a/charts/argo-cd/templates/argocd-server-rolebinding.yaml
+++ b/charts/argo-cd/templates/argocd-server-rolebinding.yaml
@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: {{ include "argo-cd.fullname" . }}-server
+  name: argocd-server
   labels:
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
     helm.sh/chart: {{ include "argo-cd.chart" . }}
@@ -13,7 +13,7 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: {{ include "argo-cd.fullname" . }}-server
+  name: argocd-server
 subjects:
 - kind: ServiceAccount
-  name: {{ include "argo-cd.fullname" . }}-server
+  name: argocd-server
diff --git a/charts/argo-cd/templates/argocd-server-sa.yaml b/charts/argo-cd/templates/argocd-server-sa.yaml
index 5f4f4f3b..d764c65f 100755
--- a/charts/argo-cd/templates/argocd-server-sa.yaml
+++ b/charts/argo-cd/templates/argocd-server-sa.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "argo-cd.fullname" . }}-server
+  name: argocd-server
   labels:
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
     helm.sh/chart: {{ include "argo-cd.chart" . }}
diff --git a/charts/argo-cd/templates/argocd-server-service.yaml b/charts/argo-cd/templates/argocd-server-service.yaml
index 469fe57f..371c4b2f 100755
--- a/charts/argo-cd/templates/argocd-server-service.yaml
+++ b/charts/argo-cd/templates/argocd-server-service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "argo-cd.fullname" . }}-server
+  name: argocd-server
   labels:
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
     helm.sh/chart: {{ include "argo-cd.chart" . }}