From ae13f015ff4c108d5719117857c0ef4c27adafc6 Mon Sep 17 00:00:00 2001 From: Johan van der Geest Date: Mon, 13 Apr 2020 14:54:06 +0200 Subject: [PATCH 1/3] fix: implementing server service labels (#304) * Adding custom labels to the argocd-server service when specified in the Helm values.yaml * Updated argo-cd chart version to 2.2.2 due to argocd-server service labeling implementation --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/templates/argocd-server/service.yaml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 390cabc3..cbad77a5 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "1.5.1" description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 2.2.1 +version: 2.2.2 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/service.yaml b/charts/argo-cd/templates/argocd-server/service.yaml index 673461b2..8c13a4e6 100644 --- a/charts/argo-cd/templates/argocd-server/service.yaml +++ b/charts/argo-cd/templates/argocd-server/service.yaml @@ -15,6 +15,9 @@ metadata: app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/part-of: argocd app.kubernetes.io/component: {{ .Values.server.name }} +{{- if .Values.server.service.labels }} +{{- toYaml .Values.server.service.labels | nindent 4 }} +{{- end }} spec: type: {{ .Values.server.service.type }} ports: From 02f9725f770d02e0900a0cf7a2ace1136d5340c3 Mon Sep 17 00:00:00 2001 From: Vaibhav Date: Mon, 13 Apr 2020 13:07:39 -0400 Subject: [PATCH 2/3] chore: bump image version to v0.14.0 (#303) Co-authored-by: Derek Wang --- charts/argo-events/Chart.yaml | 4 ++-- charts/argo-events/README.md | 6 ++++-- charts/argo-events/values.yaml | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/charts/argo-events/Chart.yaml b/charts/argo-events/Chart.yaml index 818b0a7a..4d953bcf 100644 --- a/charts/argo-events/Chart.yaml +++ b/charts/argo-events/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: A Helm chart to install Argo-Events in k8s Cluster name: argo-events -version: 0.13.0 +version: 0.14.0 keywords: - argo-events - sensor-controller @@ -10,6 +10,6 @@ sources: - https://github.com/argoproj/argo-events maintainers: - name: VaibhavPage -appVersion: 0.13.0 +appVersion: 0.14.0 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png home: https://github.com/argoproj/argo-helm diff --git a/charts/argo-events/README.md b/charts/argo-events/README.md index 74cf9e83..5dd63adb 100644 --- a/charts/argo-events/README.md +++ b/charts/argo-events/README.md @@ -3,6 +3,7 @@ This is a **community maintained** chart. It installs the [argo-events](https://github.com/argoproj/argo-events) application. This application comes packaged with: - Sensor Custom Resource Definition (See CRD Notes) - Gateway Custom Resource Definition (See CRD Notes) +- EventSource Custom Resource Definition (See CRD Notes) - Sensor Controller Deployment - Sensor Controller ConfigMap - Gateway Controller Deployment @@ -18,6 +19,7 @@ Some users would prefer to install the CRDs _outside_ of the chart. You can disa You can install the CRDs manually like so: ``` -kubectl apply -f https://github.com/argoproj/argo-events/raw/v0.11/hack/k8s/manifests/sensor-crd.yaml -kubectl apply -f https://github.com/argoproj/argo-events/raw/v0.11/hack/k8s/manifests/gateway-crd.yaml +kubectl apply -f https://github.com/argoproj/argo-events/raw/v0.14.0/hack/k8s/manifests/sensor-crd.yaml +kubectl apply -f https://github.com/argoproj/argo-events/raw/v0.14.0/hack/k8s/manifests/gateway-crd.yaml +kubectl apply -f https://github.com/argoproj/argo-events/raw/v0.14.0/hack/k8s/manifests/event-source-crd.yaml ``` diff --git a/charts/argo-events/values.yaml b/charts/argo-events/values.yaml index 27322b72..4ac26da1 100644 --- a/charts/argo-events/values.yaml +++ b/charts/argo-events/values.yaml @@ -42,11 +42,11 @@ singleNamespace: true sensorController: name: sensor-controller image: sensor-controller - tag: v0.13.0 + tag: v0.14.0 replicaCount: 1 gatewayController: name: gateway-controller image: gateway-controller - tag: v0.13.0 + tag: v0.14.0 replicaCount: 1 From 53edfb9fc5bf4888132b824da26044b38e403296 Mon Sep 17 00:00:00 2001 From: Maciej Strzelecki Date: Tue, 14 Apr 2020 23:15:17 +0200 Subject: [PATCH 3/3] feat: Add a load balancer IP to server's service (#306) * add loadBalancerIP to server's service * optimize condition --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/templates/argocd-server/service.yaml | 7 ++++++- charts/argo-cd/values.yaml | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index cbad77a5..649c6ae1 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "1.5.1" description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 2.2.2 +version: 2.2.3 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/service.yaml b/charts/argo-cd/templates/argocd-server/service.yaml index 8c13a4e6..292bf94b 100644 --- a/charts/argo-cd/templates/argocd-server/service.yaml +++ b/charts/argo-cd/templates/argocd-server/service.yaml @@ -32,7 +32,12 @@ spec: selector: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }} -{{- if and (eq .Values.server.service.type "LoadBalancer") .Values.server.service.loadBalancerSourceRanges }} +{{- if eq .Values.server.service.type "LoadBalancer" }} +{{- if .Values.server.service.loadBalancerIP }} + loadBalancerIP: {{ .Values.server.service.loadBalancerIP | quote }} +{{- end }} +{{- if .Values.server.service.loadBalancerSourceRanges }} loadBalancerSourceranges: {{ toYaml .Values.server.service.loadBalancerSourceRanges | indent 4 }} +{{- end }} {{- end -}} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index cbe7326f..5719be9c 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -404,6 +404,7 @@ server: type: ClusterIP servicePortHttp: 80 servicePortHttps: 443 + loadBalancerIP: "" loadBalancerSourceRanges: [] ## Server metrics service configuration