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.
This commit is contained in:
parent
5320ac33c6
commit
057b4f3a57
18 changed files with 29 additions and 29 deletions
|
@ -2,7 +2,7 @@
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
kind: ClusterRole
|
kind: ClusterRole
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ include "argo-cd.fullname" . }}-application-controller
|
name: argocd-application-controller
|
||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
|
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
|
||||||
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
kind: ClusterRoleBinding
|
kind: ClusterRoleBinding
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ include "argo-cd.fullname" . }}-application-controller
|
name: argocd-application-controller
|
||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
|
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
|
||||||
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
||||||
|
@ -13,9 +13,9 @@ metadata:
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
kind: ClusterRole
|
kind: ClusterRole
|
||||||
name: {{ include "argo-cd.fullname" . }}-application-controller
|
name: argocd-application-controller
|
||||||
subjects:
|
subjects:
|
||||||
- kind: ServiceAccount
|
- kind: ServiceAccount
|
||||||
name: {{ include "argo-cd.fullname" . }}-application-controller
|
name: argocd-application-controller
|
||||||
namespace: {{ .Release.Namespace }}
|
namespace: {{ .Release.Namespace }}
|
||||||
{{- end -}} }}
|
{{- end -}} }}
|
|
@ -1,7 +1,7 @@
|
||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ include "argo-cd.fullname" . }}-application-controller
|
name: argocd-application-controller
|
||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
|
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
|
||||||
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
||||||
|
@ -32,7 +32,7 @@ spec:
|
||||||
- "10"
|
- "10"
|
||||||
image: {{ .Values.applicationController.image.repository }}:{{ .Values.applicationController.image.tag }}
|
image: {{ .Values.applicationController.image.repository }}:{{ .Values.applicationController.image.tag }}
|
||||||
imagePullPolicy: {{ .Values.applicationController.image.pullPolicy }}
|
imagePullPolicy: {{ .Values.applicationController.image.pullPolicy }}
|
||||||
name: {{ include "argo-cd.name" . }}-application-controller
|
name: argocd-application-controller
|
||||||
ports:
|
ports:
|
||||||
- containerPort: {{ .Values.applicationController.containerPort }}
|
- containerPort: {{ .Values.applicationController.containerPort }}
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
|
@ -40,4 +40,4 @@ spec:
|
||||||
port: {{ .Values.applicationController.containerPort }}
|
port: {{ .Values.applicationController.containerPort }}
|
||||||
initialDelaySeconds: 5
|
initialDelaySeconds: 5
|
||||||
periodSeconds: 10
|
periodSeconds: 10
|
||||||
serviceAccountName: {{ include "argo-cd.name" . }}-application-controller
|
serviceAccountName: argocd-application-controller
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
kind: Role
|
kind: Role
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ include "argo-cd.fullname" . }}-application-controller
|
name: argocd-application-controller
|
||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
|
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
|
||||||
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
kind: RoleBinding
|
kind: RoleBinding
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ include "argo-cd.fullname" . }}-application-controller
|
name: argocd-application-controller
|
||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
|
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
|
||||||
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
||||||
|
@ -12,7 +12,7 @@ metadata:
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
kind: Role
|
kind: Role
|
||||||
name: {{ include "argo-cd.fullname" . }}-application-controller
|
name: argocd-application-controller
|
||||||
subjects:
|
subjects:
|
||||||
- kind: ServiceAccount
|
- kind: ServiceAccount
|
||||||
name: {{ include "argo-cd.fullname" . }}-application-controller
|
name: argocd-application-controller
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ServiceAccount
|
kind: ServiceAccount
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ include "argo-cd.fullname" . }}-application-controller
|
name: argocd-application-controller
|
||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
|
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
|
||||||
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Service
|
kind: Service
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ include "argo-cd.fullname" . }}-application-controller
|
name: argocd-application-controller
|
||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
|
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-application-controller
|
||||||
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ConfigMap
|
kind: ConfigMap
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ include "argo-cd.fullname" . }}-cm
|
name: argocd-cm
|
||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/name: {{ include "argo-cd.name" . }}
|
app.kubernetes.io/name: {{ include "argo-cd.name" . }}
|
||||||
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
||||||
|
|
|
@ -8,7 +8,7 @@ metadata:
|
||||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||||
app.kubernetes.io/part-of: {{ include "argo-cd.name" . }}
|
app.kubernetes.io/part-of: {{ include "argo-cd.name" . }}
|
||||||
app.kubernetes.io/component: server
|
app.kubernetes.io/component: server
|
||||||
name: {{ include "argo-cd.fullname" . }}-metrics
|
name: argocd-metrics
|
||||||
spec:
|
spec:
|
||||||
ports:
|
ports:
|
||||||
- name: http
|
- name: http
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ConfigMap
|
kind: ConfigMap
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ include "argo-cd.fullname" . }}-rbac-cm
|
name: argocd-rbac-cm
|
||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/name: {{ include "argo-cd.name" . }}
|
app.kubernetes.io/name: {{ include "argo-cd.name" . }}
|
||||||
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
||||||
|
@ -13,6 +13,6 @@ data:
|
||||||
policy.default: {{ .Values.rbac.policyDefault }}
|
policy.default: {{ .Values.rbac.policyDefault }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if .Values.rbac.policyCsv }}
|
{{- if .Values.rbac.policyCsv }}
|
||||||
policy.csv: |
|
policy.csv:
|
||||||
{{ toYaml .Values.rbac.policyCsv | indent 4 }}
|
{{- toYaml .Values.rbac.policyCsv | indent 4 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ include "argo-cd.fullname" . }}-repo-server
|
name: argocd-repo-server
|
||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-repo-server
|
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-repo-server
|
||||||
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Service
|
kind: Service
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ include "argo-cd.fullname" . }}-repo-server
|
name: argocd-repo-server
|
||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-repo-server
|
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-repo-server
|
||||||
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Secret
|
kind: Secret
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ include "argo-cd.fullname" . }}-secret
|
name: argocd-secret
|
||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/name: {{ include "argo-cd.name" . }}
|
app.kubernetes.io/name: {{ include "argo-cd.name" . }}
|
||||||
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ include "argo-cd.fullname" . }}-server
|
name: argocd-server
|
||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
|
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
|
||||||
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
||||||
|
@ -23,7 +23,7 @@ spec:
|
||||||
app.kubernetes.io/part-of: {{ include "argo-cd.name" . }}
|
app.kubernetes.io/part-of: {{ include "argo-cd.name" . }}
|
||||||
app.kubernetes.io/component: server
|
app.kubernetes.io/component: server
|
||||||
spec:
|
spec:
|
||||||
serviceAccountName: {{ include "argo-cd.fullname" . }}-server
|
serviceAccountName: argocd-server
|
||||||
initContainers:
|
initContainers:
|
||||||
- name: ui
|
- name: ui
|
||||||
image: {{ .Values.server.uiInitImage.repository }}:{{ .Values.server.uiInitImage.tag }}
|
image: {{ .Values.server.uiInitImage.repository }}:{{ .Values.server.uiInitImage.tag }}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
kind: Role
|
kind: Role
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ include "argo-cd.fullname" . }}-server
|
name: argocd-server
|
||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
|
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
|
||||||
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
kind: RoleBinding
|
kind: RoleBinding
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ include "argo-cd.fullname" . }}-server
|
name: argocd-server
|
||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
|
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
|
||||||
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
||||||
|
@ -13,7 +13,7 @@ metadata:
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
kind: Role
|
kind: Role
|
||||||
name: {{ include "argo-cd.fullname" . }}-server
|
name: argocd-server
|
||||||
subjects:
|
subjects:
|
||||||
- kind: ServiceAccount
|
- kind: ServiceAccount
|
||||||
name: {{ include "argo-cd.fullname" . }}-server
|
name: argocd-server
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ServiceAccount
|
kind: ServiceAccount
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ include "argo-cd.fullname" . }}-server
|
name: argocd-server
|
||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
|
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
|
||||||
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Service
|
kind: Service
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ include "argo-cd.fullname" . }}-server
|
name: argocd-server
|
||||||
labels:
|
labels:
|
||||||
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
|
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-server
|
||||||
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
helm.sh/chart: {{ include "argo-cd.chart" . }}
|
||||||
|
|
Loading…
Reference in a new issue