Merge branch 'master' into gpaul/hpa

charts/argo-cd/README.md

@@ -157,6 +157,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
 | server.certificate.domain | Certificate manager domain | `"argocd.example.com"` |
 | server.certificate.enabled | Enables a certificate manager certificate. | `false` |
 | server.certificate.issuer | Certificate manager issuer | `{}` |
+| server.clusterAdminAccess.enabled | Enable RBAC for local cluster deployments. | `true` |
 | server.config | [General Argo CD configuration](https://argoproj.github.io/argo-cd/operator-manual/declarative-setup/#repositories) | See [values.yaml](values.yaml) |
 | server.containerPort | Server container port. | `8080` |
 | server.extraArgs | Additional arguments for the server. A list of key:value pairs. | `[]` |

charts/argo-cd/templates/argocd-application-controller/service.yaml

@@ -17,7 +17,7 @@ metadata:
     app.kubernetes.io/component: {{ .Values.controller.name }}
 spec:
   ports:
-  - name: {{ .Values.controller.name }}
+  - name: {{ .Values.controller.service.portName }}
     port: {{ .Values.controller.service.port }}
     targetPort: {{ .Values.controller.containerPort }}
   selector:

charts/argo-cd/templates/argocd-repo-server/service.yaml

@@ -17,7 +17,7 @@ metadata:
   name: {{ template "argo-cd.repoServer.fullname" . }}
 spec:
   ports:
-  - name: repo-server
+  - name: {{ .Values.repoServer.service.portName }}
     protocol: TCP
     port: {{ .Values.repoServer.service.port }}
     targetPort: repo-server

charts/argo-cd/templates/argocd-server/clusterrole.yaml

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

charts/argo-cd/templates/argocd-server/clusterrolebinding.yaml

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

charts/argo-cd/templates/argocd-server/deployment.yaml

@@ -78,7 +78,7 @@ spec:
         {{- end }}
         volumeMounts:
         {{- if .Values.server.volumeMounts }}
-{{- toYaml .Values.server.volumeMounts | nindent 10}}
+{{- toYaml .Values.server.volumeMounts | nindent 8}}
         {{- end }}
         {{- if .Values.configs.knownHosts }}
         - mountPath: /app/config/ssh

charts/argo-cd/values.yaml

@@ -86,6 +86,7 @@ controller:
     annotations: {}
     labels: {}
     port: 8082
+    portName: https-controller
 
   ## Node selectors and tolerations for server scheduling to nodes with taints
   ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
@@ -514,6 +515,11 @@ server:
   #   orphanedResources: {}
   #   roles: []
 
+  ## Enable Admin ClusterRole resources.
+  ## Enable if you would like to grant rights to ArgoCD to deploy to the local kuberentes cluster.
+  clusterAdminAccess:
+    enabled: true
+
 ## Repo Server
 repoServer:
   name: repo-server
@@ -604,6 +610,7 @@ repoServer:
     annotations: {}
     labels: {}
     port: 8081
+    portName: https-repo-server
 
   ## Repo server metrics service configuration
   metrics:

charts/argo-rollouts/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "0.7"
 description: A Helm chart for Argo Rollouts
 name: argo-rollouts
-version: 0.1.0
+version: 0.1.1
 icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png
 home: https://github.com/argoproj/argo-helm
 maintainers:

charts/argo-rollouts/README.md

@@ -0,0 +1,39 @@
+Argo Rollouts Chart
+=============
+A Helm chart for Argo Rollouts, progressive delivery for Kubernetes.
+
+Current chart version is `0.1.0`
+
+Source code can be found [here](https://github.com/argoproj/argo-rollouts)
+
+## Additional Information
+This is a **community maintained** chart. This chart installs [argo-rollouts](https://argoproj.github.io/argo-rollouts/), progressive delivery for Kubernetes.
+
+The default installation is intended to be similar to the provided Argo Rollouts [releases](https://github.com/argoproj/argo-rollouts/releases).
+
+## Prerequisites
+
+- Kubernetes 1.7+
+
+
+## Installing the Chart
+
+To install the chart with the release name `my-release`:
+
+```console
+$ helm repo add argo https://argoproj.github.io/argo-helm
+$ helm install --name my-release argo/argo-rollouts
+```
+
+## Chart Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| clusterInstall | bool | `true` |  |
+| controller.component | string | `"rollouts-controller"` |  |
+| controller.image.pullPolicy | string | `"IfNotPresent"` |  |
+| controller.image.repository | string | `"argoproj/argo-rollouts"` |  |
+| controller.image.tag | string | `"v0.7.0"` |  |
+| controller.name | string | `"argo-rollouts"` |  |
+| installCRDs | bool | `true` |  |
+| serviceAccount.name | string | `"argo-rollouts"` |  |