From 060fa584b4b72c2cc5cf0ca8d87ffc41aa6cd17e Mon Sep 17 00:00:00 2001 From: Scott Cabrinha Date: Fri, 14 Feb 2020 13:55:18 -0800 Subject: [PATCH 1/4] feat: adding readme (#241) --- charts/argo-rollouts/Chart.yaml | 2 +- charts/argo-rollouts/README.md | 39 +++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 charts/argo-rollouts/README.md diff --git a/charts/argo-rollouts/Chart.yaml b/charts/argo-rollouts/Chart.yaml index fa8038dd..175d2c86 100644 --- a/charts/argo-rollouts/Chart.yaml +++ b/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: diff --git a/charts/argo-rollouts/README.md b/charts/argo-rollouts/README.md new file mode 100644 index 00000000..f4f0f3a6 --- /dev/null +++ b/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"` | | From 3fd67d8cbb51857acfadc53fff575cfed6bb07b6 Mon Sep 17 00:00:00 2001 From: Tuan Date: Mon, 17 Feb 2020 06:49:52 +0800 Subject: [PATCH 2/4] fix: Make clusterrole & clusterrolebinding optional for argocd-server again (#233) * Make clusterrole & clusterrolebinding optional for argocd-server * Bump Chart version * Update README.md --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/README.md | 1 + charts/argo-cd/templates/argocd-server/clusterrole.yaml | 4 +++- .../argo-cd/templates/argocd-server/clusterrolebinding.yaml | 4 +++- charts/argo-cd/values.yaml | 5 +++++ 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 6e0b68a4..b43a0734 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "1.4.2" description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 1.7.3 +version: 1.7.4 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index ee1787fd..04d337cc 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -147,6 +147,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. | `[]` | diff --git a/charts/argo-cd/templates/argocd-server/clusterrole.yaml b/charts/argo-cd/templates/argocd-server/clusterrole.yaml index d14fcca6..4570454b 100644 --- a/charts/argo-cd/templates/argocd-server/clusterrole.yaml +++ b/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: @@ -30,4 +31,5 @@ rules: - pods - pods/log verbs: - - get \ No newline at end of file + - get +{{- end }} \ No newline at end of file diff --git a/charts/argo-cd/templates/argocd-server/clusterrolebinding.yaml b/charts/argo-cd/templates/argocd-server/clusterrolebinding.yaml index 2cf4765e..3bbd5a0d 100644 --- a/charts/argo-cd/templates/argocd-server/clusterrolebinding.yaml +++ b/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: @@ -16,4 +17,5 @@ roleRef: subjects: - kind: ServiceAccount name: {{ template "argo-cd.serverServiceAccountName" . }} - namespace: {{ .Release.Namespace }} \ No newline at end of file + namespace: {{ .Release.Namespace }} +{{- end }} \ No newline at end of file diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index df42b9c1..afe9432e 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -507,6 +507,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 From 1f625ddd8e9dd7a634a87bdc8eb13f6505e97798 Mon Sep 17 00:00:00 2001 From: bergur88 Date: Sun, 16 Feb 2020 23:17:37 +0000 Subject: [PATCH 3/4] fix: Make port names configurable for repo-server and controller (#236) * allow changing of port names for application-controller and repo-server * bump chart version * chore: bump Chart version --- charts/argo-cd/Chart.yaml | 2 +- .../templates/argocd-application-controller/service.yaml | 2 +- charts/argo-cd/templates/argocd-repo-server/service.yaml | 2 +- charts/argo-cd/values.yaml | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index b43a0734..0f3a5aa1 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "1.4.2" description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 1.7.4 +version: 1.7.5 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: diff --git a/charts/argo-cd/templates/argocd-application-controller/service.yaml b/charts/argo-cd/templates/argocd-application-controller/service.yaml index bda37168..69f8ce52 100644 --- a/charts/argo-cd/templates/argocd-application-controller/service.yaml +++ b/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: diff --git a/charts/argo-cd/templates/argocd-repo-server/service.yaml b/charts/argo-cd/templates/argocd-repo-server/service.yaml index 9ce1f144..169edd31 100644 --- a/charts/argo-cd/templates/argocd-repo-server/service.yaml +++ b/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 diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index afe9432e..f2d22c4c 100755 --- a/charts/argo-cd/values.yaml +++ b/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/ @@ -595,6 +596,7 @@ repoServer: annotations: {} labels: {} port: 8081 + portName: https-repo-server ## Repo server metrics service configuration metrics: From fdb6093011df454af5e16ce4dec9042b45bd62ff Mon Sep 17 00:00:00 2001 From: tgauweiler <43210663+tgauweiler@users.noreply.github.com> Date: Mon, 17 Feb 2020 00:46:41 +0100 Subject: [PATCH 4/4] fix: volumeMounts indention for argocd-server (#239) * Fix volumeMounts indention for argocd-server * chore: bump chart version --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/templates/argocd-server/deployment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 0f3a5aa1..6a07da99 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "1.4.2" description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 1.7.5 +version: 1.7.6 home: https://github.com/argoproj/argo-helm icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png keywords: diff --git a/charts/argo-cd/templates/argocd-server/deployment.yaml b/charts/argo-cd/templates/argocd-server/deployment.yaml index fe6e54d5..42b78cdd 100755 --- a/charts/argo-cd/templates/argocd-server/deployment.yaml +++ b/charts/argo-cd/templates/argocd-server/deployment.yaml @@ -76,7 +76,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