Removes server.enabled

As suggested, the server should always be enabled.
This commit is contained in:
Jaret Deprin 2019-10-15 18:40:16 -07:00
parent 41df9ed672
commit ca53ad463a
16 changed files with 16 additions and 41 deletions

View file

@ -138,7 +138,6 @@ $ helm install --name my-release argo/argo-cd
| server.clusterAdminAccess.enabled | Enable RBAC for cluster admin access | `true` | | server.clusterAdminAccess.enabled | Enable RBAC for cluster admin access | `true` |
| server.config | URL for Argo CD | `{}` | | server.config | URL for Argo CD | `{}` |
| server.containerPort | Server container port. | `8080` | | server.containerPort | Server container port. | `8080` |
| server.enabled | Enable Argo CD Server | `true` |
| server.extraArgs | Additional arguments for the server | `[]` | | server.extraArgs | Additional arguments for the server | `[]` |
| server.image.repository | Repository to use for the server | `global.image.repository` | | server.image.repository | Repository to use for the server | `global.image.repository` |
| server.image.imagePullPolicy | Image pull policy for the server | `global.image.imagePullPolicy` | | server.image.imagePullPolicy | Image pull policy for the server | `global.image.imagePullPolicy` |

View file

@ -1,4 +1,3 @@
{{- if .Values.server.enabled }}
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
@ -11,5 +10,4 @@ metadata:
app.kubernetes.io/part-of: {{ include "argo-cd.name" . }} app.kubernetes.io/part-of: {{ include "argo-cd.name" . }}
app.kubernetes.io/component: {{ .Values.server.name }} app.kubernetes.io/component: {{ .Values.server.name }}
data: data:
{{- toYaml .Values.server.config | nindent 4 }} {{- toYaml .Values.server.config | nindent 4 }}
{{- end }}

View file

@ -1,4 +1,3 @@
{{- if .Values.server.enabled }}
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
@ -11,5 +10,4 @@ metadata:
app.kubernetes.io/part-of: {{ include "argo-cd.name" . }} app.kubernetes.io/part-of: {{ include "argo-cd.name" . }}
app.kubernetes.io/component: {{ .Values.server.name }} app.kubernetes.io/component: {{ .Values.server.name }}
data: data:
{{- toYaml .Values.server.rbacConfig | nindent 4 }} {{- toYaml .Values.server.rbacConfig | nindent 4 }}
{{- end }}

View file

@ -1,4 +1,3 @@
{{- if and .Values.server.enabled }}
apiVersion: v1 apiVersion: v1
{{- toYaml .Values.configs.knownHosts | nindent 0 }} {{- toYaml .Values.configs.knownHosts | nindent 0 }}
kind: ConfigMap kind: ConfigMap
@ -10,5 +9,4 @@ 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: {{ .Values.server.name }} app.kubernetes.io/component: {{ .Values.server.name }}
name: argocd-ssh-known-hosts-cm name: argocd-ssh-known-hosts-cm
{{- end }}

View file

@ -1,4 +1,3 @@
{{- if and .Values.server.enabled }}
apiVersion: v1 apiVersion: v1
{{- toYaml .Values.configs.tlsCerts | nindent 0 }} {{- toYaml .Values.configs.tlsCerts | nindent 0 }}
kind: ConfigMap kind: ConfigMap
@ -10,5 +9,4 @@ 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: {{ .Values.server.name }} app.kubernetes.io/component: {{ .Values.server.name }}
name: argocd-tls-certs-cm name: argocd-tls-certs-cm
{{- end }}

View file

@ -1,4 +1,4 @@
{{- if and .Values.server.enabled .Values.server.additionalApplications }} {{- if .Values.server.additionalApplications }}
apiVersion: v1 apiVersion: v1
kind: List kind: List
items: items:
@ -38,5 +38,4 @@ items:
ignoreDifferences: ignoreDifferences:
{{- toYaml .ignoreDifferences | nindent 8 }} {{- toYaml .ignoreDifferences | nindent 8 }}
{{- end }} {{- end }}
{{- end }}
{{- end }} {{- end }}

View file

@ -1,4 +1,4 @@
{{- if and .Values.server.enabled .Values.server.certificate.enabled -}} {{- if .Values.server.certificate.enabled -}}
apiVersion: certmanager.k8s.io/v1alpha1 apiVersion: certmanager.k8s.io/v1alpha1
kind: Certificate kind: Certificate
metadata: metadata:
@ -20,5 +20,4 @@ spec:
issuerRef: issuerRef:
kind: {{ .Values.certificate.issuer.kind | quote }} kind: {{ .Values.certificate.issuer.kind | quote }}
name: {{ .Values.certificate.issuer.name | quote }} name: {{ .Values.certificate.issuer.name | quote }}
secretName: argocd-secret secretName: argocd-secret
{{- end }}

View file

@ -1,4 +1,4 @@
{{- if and .Values.server.enabled .Values.server.clusterAdminAccess.enabled }} {{- if .Values.server.clusterAdminAccess.enabled }}
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
@ -31,5 +31,4 @@ rules:
- pods - pods
- pods/log - pods/log
verbs: verbs:
- get - get
{{- end }}

View file

@ -1,4 +1,4 @@
{{- if and .Values.server.enabled .Values.server.clusterAdminAccess.enabled }} {{- if .Values.server.clusterAdminAccess.enabled }}
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
@ -18,4 +18,3 @@ subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: {{ template "argo-cd.serverServiceAccountName" . }} name: {{ template "argo-cd.serverServiceAccountName" . }}
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
{{- end -}}

View file

@ -1,4 +1,3 @@
{{- if .Values.server.enabled }}
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
@ -128,5 +127,4 @@ spec:
- configMap: - configMap:
name: argocd-tls-certs-cm name: argocd-tls-certs-cm
name: tls-certs name: tls-certs
{{- end }} {{- end }}
{{- end }}

View file

@ -1,4 +1,4 @@
{{- if and .Values.server.enabled .Values.server.additionalProjects }} {{- if .Values.server.additionalProjects }}
apiVersion: v1 apiVersion: v1
kind: List kind: List
items: items:
@ -42,5 +42,4 @@ items:
roles: roles:
{{- toYaml .roles | nindent 8 }} {{- toYaml .roles | nindent 8 }}
{{- end }} {{- end }}
{{- end }}
{{- end }} {{- end }}

View file

@ -1,4 +1,3 @@
{{- if .Values.server.enabled }}
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: Role kind: Role
metadata: metadata:
@ -43,5 +42,4 @@ rules:
- events - events
verbs: verbs:
- create - create
- list - list
{{- end }}

View file

@ -1,4 +1,3 @@
{{- if .Values.server.enabled }}
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding kind: RoleBinding
metadata: metadata:
@ -17,5 +16,4 @@ roleRef:
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: {{ template "argo-cd.serverServiceAccountName" . }} name: {{ template "argo-cd.serverServiceAccountName" . }}
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
{{- end }}

View file

@ -1,4 +1,3 @@
{{- if .Values.server.enabled }}
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
@ -29,5 +28,4 @@ spec:
targetPort: {{ .Values.server.name }} targetPort: {{ .Values.server.name }}
selector: selector:
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}
{{- end }}

View file

@ -1,4 +1,3 @@
{{- if .Values.server.enabled }}
apiVersion: v1 apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
@ -9,5 +8,4 @@ metadata:
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
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: {{ .Values.server.name }} app.kubernetes.io/component: {{ .Values.server.name }}
{{- end }}

View file

@ -183,7 +183,6 @@ redis:
## Server ## Server
server: server:
enabled: true
name: server name: server
image: {} image: {}