Merge branch 'master' into feature/723
This commit is contained in:
Marco Kilchhofer
GitHub
commit
af04d31e0a
15 changed files with 54 additions and 132 deletions
|
|
@ -1,8 +1,8 @@
|
|||
apiVersion: v2
|
||||
appVersion: 2.0.0
|
||||
appVersion: 2.0.1
|
||||
description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
|
||||
name: argo-cd
|
||||
version: 3.2.5
|
||||
version: 3.3.2
|
||||
home: https://github.com/argoproj/argo-helm
|
||||
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
|
||||
keywords:
|
||||
|
|
|
|||
|
|
@ -113,6 +113,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
|
|||
| configs.tlsCertsAnnotations | TLS certificate configmap annotations | `{}` |
|
||||
| configs.tlsCerts.data."argocd.example.com" | TLS certificate | See [values.yaml](values.yaml) |
|
||||
| configs.secret.extra | add additional secrets to be added to argocd-secret | `{}` |
|
||||
| configs.styles | Define custom CSS styles for your argo instance ([Read More](https://argo-cd.readthedocs.io/en/stable/operator-manual/custom-styles/)). This Settings will automatically mount the provided css and reference it in the argo configuration. | `""` (See [values.yaml](values.yaml)) |
|
||||
| openshift.enabled | enables using arbitrary uid for argo repo server | `false` |
|
||||
|
||||
## ArgoCD Controller
|
||||
|
|
|
|||
|
|
@ -151,4 +151,22 @@ Return the appropriate apiVersion for ingress
|
|||
{{- else -}}
|
||||
{{- print "networking.k8s.io/v1" -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
|
||||
{{/*
|
||||
Argo Configuration Preset Values (Incluenced by Values configuration)
|
||||
*/}}
|
||||
{{- define "argo-cd.config.presets" -}}
|
||||
{{- if .Values.configs.styles }}
|
||||
ui.cssurl: "./custom/custom.styles.css"
|
||||
{{- end }}
|
||||
{{- end -}}
|
||||
|
||||
{{/*
|
||||
Merge Argo Configuration with Preset Configuration
|
||||
*/}}
|
||||
{{- define "argo-cd.config" -}}
|
||||
{{- if .Values.server.configEnabled -}}
|
||||
{{- toYaml (mergeOverwrite (default dict (fromYaml (include "argo-cd.config.presets" $))) .Values.server.config) }}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
|
|
@ -11,6 +11,5 @@ metadata:
|
|||
{{ $key }}: {{ $value | quote }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
data:
|
||||
{{- toYaml .Values.server.config | nindent 4 }}
|
||||
data: {{- include "argo-cd.config" $ | nindent 4 }}
|
||||
{{- end }}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
{{- if .Values.configs.styles }}
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: argocd-custom-styles
|
||||
labels:
|
||||
{{- include "argo-cd.labels" (dict "context" . "component" .Values.repoServer.name "name" .Values.repoServer.name) | nindent 4 }}
|
||||
data:
|
||||
custom.styles.css: |
|
||||
{{- .Values.configs.styles | nindent 4 }}
|
||||
{{- end }}
|
||||
|
|
@ -82,6 +82,11 @@ spec:
|
|||
{{- end }}
|
||||
- mountPath: /app/config/server/tls
|
||||
name: argocd-repo-server-tls
|
||||
{{- if .Values.configs.styles }}
|
||||
- mountPath: "/shared/app/custom/custom.styles.css"
|
||||
subPath: "custom.styles.css"
|
||||
name: custom-styles
|
||||
{{- end }}
|
||||
ports:
|
||||
- name: {{ .Values.server.name }}
|
||||
containerPort: {{ .Values.server.containerPort }}
|
||||
|
|
@ -141,6 +146,11 @@ spec:
|
|||
{{- end }}
|
||||
- emptyDir: {}
|
||||
name: static-files
|
||||
{{- if .Values.configs.styles }}
|
||||
- configMap:
|
||||
name: argocd-custom-styles
|
||||
name: custom-styles
|
||||
{{- end }}
|
||||
{{- if .Values.configs.knownHosts }}
|
||||
- configMap:
|
||||
name: argocd-ssh-known-hosts-cm
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ installCRDs: true
|
|||
global:
|
||||
image:
|
||||
repository: quay.io/argoproj/argocd
|
||||
tag: v2.0.0
|
||||
tag: v2.0.1
|
||||
imagePullPolicy: IfNotPresent
|
||||
securityContext: {}
|
||||
# runAsUser: 999
|
||||
|
|
@ -283,7 +283,7 @@ redis:
|
|||
|
||||
image:
|
||||
repository: redis
|
||||
tag: 6.2.1-alpine
|
||||
tag: 6.2.2-alpine
|
||||
imagePullPolicy: IfNotPresent
|
||||
|
||||
## Additional command line arguments to pass to redis-server
|
||||
|
|
@ -360,7 +360,7 @@ redis-ha:
|
|||
metrics:
|
||||
enabled: true
|
||||
image:
|
||||
tag: 6.2.1-alpine
|
||||
tag: 6.2.2-alpine
|
||||
|
||||
## Server
|
||||
server:
|
||||
|
|
@ -1015,9 +1015,16 @@ configs:
|
|||
|
||||
# Argo expects the password in the secret to be bcrypt hashed. You can create this hash with
|
||||
# `htpasswd -nbBC 10 "" $ARGO_PWD | tr -d ':\n' | sed 's/$2y/$2a/'`
|
||||
# argocdServerAdminPassword:
|
||||
# argocdServerAdminPassword: ""
|
||||
# Password modification time defaults to current time if not set
|
||||
# argocdServerAdminPasswordMtime: "2006-01-02T15:04:05Z"
|
||||
|
||||
## Custom CSS Styles
|
||||
## Reference: https://argo-cd.readthedocs.io/en/stable/operator-manual/custom-styles/
|
||||
# styles: |
|
||||
# .nav-bar {
|
||||
# background: linear-gradient(to bottom, #999, #777, #333, #222, #111);
|
||||
# }
|
||||
|
||||
openshift:
|
||||
enabled: false
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
# Patterns to ignore when building packages.
|
||||
# This supports shell glob matching, relative path matching, and
|
||||
# negation (prefixed with !). Only one pattern per line.
|
||||
.DS_Store
|
||||
# Common VCS dirs
|
||||
.git/
|
||||
.gitignore
|
||||
.bzr/
|
||||
.bzrignore
|
||||
.hg/
|
||||
.hgignore
|
||||
.svn/
|
||||
# Common backup files
|
||||
*.swp
|
||||
*.bak
|
||||
*.tmp
|
||||
*~
|
||||
# Various IDEs
|
||||
.project
|
||||
.idea/
|
||||
*.tmproj
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
apiVersion: v2
|
||||
description: A Helm chart for Argo-CI
|
||||
name: argo-ci
|
||||
version: 1.0.0
|
||||
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
|
||||
appVersion: v1.0.0-alpha2
|
||||
home: https://github.com/argoproj/argo-helm
|
||||
deprecated: true
|
||||
dependencies:
|
||||
- name: argo
|
||||
version: "^0.16.0"
|
||||
repository: https://argoproj.github.io/argo-helm
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
# Argo CI Chart
|
||||
|
||||
**Deprecated** - Use [Argo-Events](./argo-events) instead.
|
||||
|
||||
This is a **community maintained** chart.
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
{{/* vim: set filetype=mustache: */}}
|
||||
{{/*
|
||||
Expand the name of the chart.
|
||||
*/}}
|
||||
{{- define "name" -}}
|
||||
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
|
||||
{{- end -}}
|
||||
|
||||
{{/*
|
||||
Create a default fully qualified app name.
|
||||
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
|
||||
*/}}
|
||||
{{- define "fullname" -}}
|
||||
{{- $name := default .Chart.Name .Values.nameOverride -}}
|
||||
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
|
||||
{{- end -}}
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: {{ .Release.Name }}-ci
|
||||
labels:
|
||||
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
|
||||
release: {{ .Release.Name }}
|
||||
heritage: {{ .Release.Service }}
|
||||
spec:
|
||||
selector:
|
||||
matchLabels:
|
||||
app: {{ .Release.Name }}-ci
|
||||
release: {{ .Release.Name }}
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: {{ .Release.Name }}-ci
|
||||
release: {{ .Release.Name }}
|
||||
spec:
|
||||
containers:
|
||||
- name: ci
|
||||
image: "{{ .Values.imageNamespace }}/{{ .Values.ciImage }}:{{ .Values.imageTag }}"
|
||||
imagePullPolicy: {{ .Values.imagePullPolicy }}
|
||||
env:
|
||||
- name: IN_CLUSTER
|
||||
value: "true"
|
||||
- name: NAMESPACE
|
||||
value: {{ .Values.workflowNamespace }}
|
||||
- name: ARGO_CI_IMAGE
|
||||
value: "{{ .Values.imageNamespace }}/{{ .Values.ciImage }}:{{ .Values.imageTag }}"
|
||||
- name: CONTROLLER_INSTANCE_ID
|
||||
value: {{ .Release.Name }}
|
||||
ports:
|
||||
- containerPort: 8001
|
||||
- containerPort: 8002
|
||||
{{- with .Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: {{ .Release.Name }}-ci
|
||||
labels:
|
||||
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
|
||||
release: {{ .Release.Name }}
|
||||
heritage: {{ .Release.Service }}
|
||||
spec:
|
||||
ports:
|
||||
- port: 80
|
||||
protocol: TCP
|
||||
targetPort: 8001
|
||||
selector:
|
||||
app: {{ .Release.Name }}-ci
|
||||
sessionAffinity: None
|
||||
type: LoadBalancer
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
imageNamespace: argoproj
|
||||
ciImage: argoci
|
||||
imageTag: v1.0.0-alpha2
|
||||
imagePullPolicy: Always
|
||||
# Secrets with credentials to pull images from a private registry
|
||||
imagePullSecrets: []
|
||||
# - name: argo-pull-secret
|
||||
workflowNamespace: default
|
||||
|
||||
argo:
|
||||
imagesNamespace: argoproj
|
||||
installMinio: true
|
||||
minioBucketName: argo-artifacts
|
||||
useReleaseAsInstanceID: true
|
||||
Loading…
Reference in a new issue