Merge branch 'master' into feat/monitoring-labels

2021-05-18 07:31:44 +02:00 · 2021-05-18 07:31:44 +02:00 · 84205e2f05
commit 84205e2f05
parent 53cd39800d fdc6daa970
24 changed files with 93 additions and 144 deletions
--- a/3
+++ b/3
@ -1,5 +1,8 @@
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners

+# All charts
+/charts/* @mkilchhofer
+
 # Argo Workflows
 /charts/argo @stefansedich @paguos @vladlosev @yann-soubeyrand @oliverbaehler

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -22,6 +22,12 @@ helm delete argo-cd --purge
 kubectl delete crd -l app.kubernetes.io/part-of=argocd
 ```

+Pre-requisites:
+```
+helm repo add redis-ha https://dandydeveloper.github.io/charts/
+helm dependency update
+```
+
 Minimally:

 ```
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@ -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.3
+version: 3.3.3
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 keywords:
--- a/charts/argo-cd/README.md
+++ b/charts/argo-cd/README.md
@ -40,7 +40,7 @@ Helm apiVersion switched to `v2`. Requires Helm `3.0.0` or above to install. [Re

 ### 2.14.7 and above

-The `matchLabels` key in the ArgoCD Appliaction Controller is no longer hard-coded. Note that labels are immutable so caution should be exercised when making changes to this resource.
+The `matchLabels` key in the ArgoCD Application Controller is no longer hard-coded. Note that labels are immutable so caution should be exercised when making changes to this resource.

 ### 2.10.x to 2.11.0

@ -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
--- a/charts/argo-cd/templates/_helpers.tpl
+++ b/charts/argo-cd/templates/_helpers.tpl
@ -152,3 +152,21 @@ Return the appropriate apiVersion for ingress
 {{- 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 -}}
--- a/charts/argo-cd/templates/argocd-application-controller/clusterrole.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller/clusterrole.yaml
@ -6,6 +6,9 @@ metadata:
  labels:
    {{- include "argo-cd.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }}
 rules:
+{{- if .Values.controller.clusterRoleRules.enabled }}
+{{- toYaml .Values.controller.clusterRoleRules.rules | nindent 2 }}
+{{ else }}
 - apiGroups:
  - '*'
  resources:
@ -17,3 +20,4 @@ rules:
  verbs:
  - '*'
 {{- end }}
+{{- end }}
--- a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
@ -95,8 +95,8 @@ spec:
        volumeMounts:
        - mountPath: /app/config/controller/tls
          name: argocd-repo-server-tls
-{{- if .Values.controller.volumeMounts }}
-{{- toYaml .Values.controller.volumeMounts | nindent 10}}
+        {{- with .Values.controller.volumeMounts }}
+        {{- toYaml . | nindent 8 }}
        {{- end }}
        resources:
 {{- toYaml .Values.controller.resources | nindent 10 }}
@ -129,8 +129,8 @@ spec:
            path: ca.crt
          optional: true
          secretName: argocd-repo-server-tls
-{{- if .Values.controller.volumes }}
-{{- toYaml .Values.controller.volumes | nindent 8 }}
+      {{- with .Values.controller.volumes }}
+      {{- toYaml . | nindent 6 }}
      {{- end }}
 {{- if .Values.controller.priorityClassName }}
      priorityClassName: {{ .Values.controller.priorityClassName }}
--- a/charts/argo-cd/templates/argocd-configs/argocd-cm.yaml
+++ b/charts/argo-cd/templates/argocd-configs/argocd-cm.yaml
@ -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 }}
--- a/charts/argo-cd/templates/argocd-configs/argocd-styles-cm.yaml
+++ b/charts/argo-cd/templates/argocd-configs/argocd-styles-cm.yaml
@ -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 }}
--- a/charts/argo-cd/templates/argocd-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-server/deployment.yaml
@ -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
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@ -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
@ -183,6 +183,13 @@ controller:
  ## Enable if you would like to grant rights to ArgoCD to deploy to the local Kubernetes cluster.
  clusterAdminAccess:
    enabled: true
+  ## Enable Custom Rules for the Application Controller's Cluster Role resource
+  ## Enable this and set the rules: to whatever custom rules you want for the Cluster Role resource.
+  ## Defaults to off
+  clusterRoleRules:
+    enabled: false
+    rules: []
+

 ## Dex
 dex:
@ -279,7 +286,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
@ -356,7 +363,7 @@ redis-ha:
    metrics:
      enabled: true
  image:
-    tag: 6.2.1-alpine
+    tag: 6.2.2-alpine

 ## Server
 server:
@ -1011,9 +1018,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
--- a/charts/argo-ci/.helmignore
+++ b/charts/argo-ci/.helmignore
@ -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
--- a/charts/argo-ci/Chart.yaml
+++ b/charts/argo-ci/Chart.yaml
@ -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
--- a/charts/argo-ci/README.md
+++ b/charts/argo-ci/README.md
@ -1,5 +0,0 @@
-# Argo CI Chart
-
-**Deprecated** - Use [Argo-Events](./argo-events) instead.
-
-This is a **community maintained** chart.
--- a/charts/argo-ci/templates/NOTES.txt
+++ b/charts/argo-ci/templates/NOTES.txt
--- a/charts/argo-ci/templates/_helpers.tpl
+++ b/charts/argo-ci/templates/_helpers.tpl
@ -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 -}}
--- a/charts/argo-ci/templates/ci-deployment.yaml
+++ b/charts/argo-ci/templates/ci-deployment.yaml
@ -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 }}
--- a/charts/argo-ci/templates/ci-service.yaml
+++ b/charts/argo-ci/templates/ci-service.yaml
@ -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
--- a/charts/argo-ci/values.yaml
+++ b/charts/argo-ci/values.yaml
@ -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
--- a/charts/argocd-applicationset/Chart.yaml
+++ b/charts/argocd-applicationset/Chart.yaml
@ -2,7 +2,7 @@ apiVersion: v2
 name: argocd-applicationset
 description: A Helm chart for installing ArgoCD ApplicationSet
 type: application
-version: 0.1.3
+version: 0.1.4
 appVersion: "v0.1.0"
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
--- a/charts/argocd-applicationset/templates/_helpers.tpl
+++ b/charts/argocd-applicationset/templates/_helpers.tpl
@ -40,7 +40,6 @@ helm.sh/chart: {{ include "argo-applicationset.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
-app.kubernetes.io/name: {{ include "argo-applicationset.name" . }}
 app.kubernetes.io/part-of: argo-cd-applicationset
 app.kubernetes.io/component: controller
 {{- end }}
--- a/charts/argocd-notifications/Chart.yaml
+++ b/charts/argocd-notifications/Chart.yaml
@ -3,7 +3,7 @@ appVersion: 1.1.1
 description: A Helm chart for ArgoCD notifications, an add-on to ArgoCD.
 name: argocd-notifications
 type: application
-version: 1.2.0
+version: 1.3.0
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 keywords:
--- a/charts/argocd-notifications/templates/configmap.yaml
+++ b/charts/argocd-notifications/templates/configmap.yaml
@ -8,6 +8,9 @@ metadata:
 data:
  context: |
    argocdUrl: {{ .Values.argocdUrl | quote }}
+  {{- with .Values.context }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
  {{- with .Values.notifiers }}
    {{- toYaml . | nindent 2 }}
  {{- end }}
--- a/charts/argocd-notifications/values.yaml
+++ b/charts/argocd-notifications/values.yaml
@ -19,6 +19,11 @@ nodeSelector: {}
 updateStrategy:
  type: Recreate

+context:
+  # Add custom values into context
+  #  region: east
+  #  environmentName: staging
+
 secret:
  # Whether helm chart creates controller secret
  create: true