Merge remote-tracking branch 'argoproj/master' into patch-1

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.3
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 keywords:

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:
@@ -29,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 -}}

charts/argo-cd/values.yaml

@@ -404,6 +404,7 @@ server:
     type: ClusterIP
     servicePortHttp: 80
     servicePortHttps: 443
+    loadBalancerIP: ""
     loadBalancerSourceRanges: []
 
   ## Server metrics service configuration

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

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
 ```

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