Merge branch 'master' into argo-events_v1.2.0

charts/argo-cd/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 1.8.4
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 2.14.1
+version: 2.14.2
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 keywords:

charts/argo-cd/README.md

@@ -258,6 +258,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
 | server.service.servicePortHttpName | Server service http port name, can be used to route traffic via istio | `http` |
 | server.service.servicePortHttpsName | Server service https port name, can be used to route traffic via istio | `https` |
 | server.service.loadBalancerSourceRanges | Source IP ranges to allow access to service from. | `[]` |
+| server.service.externalIPs | Server service external IPs. | `[]` |
 | server.service.type | Server service type | `"ClusterIP"` |
 | server.serviceAccount.annotations | Server service account annotations | `{}` |
 | server.serviceAccount.create | Create server service account | `true` |

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

@@ -36,6 +36,9 @@ spec:
 {{- if .Values.server.service.loadBalancerIP }}
   loadBalancerIP: {{ .Values.server.service.loadBalancerIP | quote }}
 {{- end }}
+{{- if .Values.server.service.externalIPs }}
+  externalIPs: {{ .Values.server.service.externalIPs }}
+{{- end }}
 {{- if .Values.server.service.loadBalancerSourceRanges }}
   loadBalancerSourceRanges:
 {{ toYaml .Values.server.service.loadBalancerSourceRanges | indent 4 }}

charts/argo-cd/values.yaml

@@ -451,6 +451,7 @@ server:
     namedTargetPort: true
     loadBalancerIP: ""
     loadBalancerSourceRanges: []
+    externalIPs: []
 
   ## Server metrics service configuration
   metrics:

charts/argo-rollouts/Chart.yaml

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

charts/argo-rollouts/templates/crds/analysis-run-crd.yaml

@@ -6,11 +6,6 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.4.0
   name: analysisruns.argoproj.io
 spec:
-  additionalPrinterColumns:
-  - JSONPath: .status.phase
-    description: AnalysisRun status
-    name: Status
-    type: string
   group: argoproj.io
   names:
     kind: AnalysisRun
@@ -20,8 +15,17 @@ spec:
     - ar
     singular: analysisrun
   scope: Namespaced
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+    additionalPrinterColumns:
+    - jsonPath: .status.phase
+      description: AnalysisRun status
+      name: Status
+      type: string
     subresources: {}
-  validation:
+    schema:
       openAPIV3Schema:
           properties:
             apiVersion:
@@ -2831,9 +2835,4 @@ spec:
           required:
           - spec
           type: object
-  version: v1alpha1
-  versions:
-  - name: v1alpha1
-    served: true
-    storage: true
 {{- end }}

charts/argo-rollouts/templates/crds/analysis-template-crd.yaml

@@ -15,7 +15,11 @@ spec:
     - at
     singular: analysistemplate
   scope: Namespaced
-  validation:
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+    schema:
       openAPIV3Schema:
         properties:
           apiVersion:
@@ -2753,9 +2757,4 @@ spec:
         required:
         - spec
         type: object
-  version: v1alpha1
-  versions:
-  - name: v1alpha1
-    served: true
-    storage: true
 {{- end }}

charts/argo-rollouts/templates/crds/cluster-analysis-template-crd.yaml

@@ -15,7 +15,11 @@ spec:
     - cat
     singular: clusteranalysistemplate
   scope: Cluster
-  validation:
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+    schema:
       openAPIV3Schema:
         properties:
           apiVersion:
@@ -2753,9 +2757,4 @@ spec:
         required:
         - spec
         type: object
-  version: v1alpha1
-  versions:
-  - name: v1alpha1
-    served: true
-    storage: true
 {{- end }}

charts/argo-rollouts/templates/crds/experiment-crd.yaml

@@ -6,11 +6,6 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.4.0
   name: experiments.argoproj.io
 spec:
-  additionalPrinterColumns:
-  - JSONPath: .status.phase
-    description: Experiment status
-    name: Status
-    type: string
   group: argoproj.io
   names:
     kind: Experiment
@@ -20,8 +15,17 @@ spec:
     - exp
     singular: experiment
   scope: Namespaced
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
     subresources: {}
-  validation:
+    additionalPrinterColumns:
+    - jsonPath: .status.phase
+      description: Experiment status
+      name: Status
+      type: string
+    schema:
       openAPIV3Schema:
         properties:
           apiVersion:
@@ -2676,9 +2680,4 @@ spec:
         required:
         - spec
         type: object
-  version: v1alpha1
-  versions:
-  - name: v1alpha1
-    served: true
-    storage: true
 {{- end }}

charts/argo-rollouts/templates/crds/rollout-crd.yaml

@@ -6,23 +6,6 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.4.0
   name: rollouts.argoproj.io
 spec:
-  additionalPrinterColumns:
-  - JSONPath: .spec.replicas
-    description: Number of desired pods
-    name: Desired
-    type: integer
-  - JSONPath: .status.replicas
-    description: Total number of non-terminated pods targeted by this rollout
-    name: Current
-    type: integer
-  - JSONPath: .status.updatedReplicas
-    description: Total number of non-terminated pods targeted by this rollout that have the desired template spec
-    name: Up-to-date
-    type: integer
-  - JSONPath: .status.availableReplicas
-    description: Total number of available pods (ready for at least minReadySeconds) targeted by this rollout
-    name: Available
-    type: integer
   group: argoproj.io
   names:
     kind: Rollout
@@ -32,13 +15,34 @@ spec:
     - ro
     singular: rollout
   scope: Namespaced
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+    additionalPrinterColumns:
+    - jsonPath: .spec.replicas
+      description: Number of desired pods
+      name: Desired
+      type: integer
+    - jsonPath: .status.replicas
+      description: Total number of non-terminated pods targeted by this rollout
+      name: Current
+      type: integer
+    - jsonPath: .status.updatedReplicas
+      description: Total number of non-terminated pods targeted by this rollout that have the desired template spec
+      name: Up-to-date
+      type: integer
+    - jsonPath: .status.availableReplicas
+      description: Total number of available pods (ready for at least minReadySeconds) targeted by this rollout
+      name: Available
+      type: integer
     subresources:
       scale:
         labelSelectorPath: .status.selector
         specReplicasPath: .spec.replicas
         statusReplicasPath: .status.HPAReplicas
       status: {}
-  validation:
+    schema:
       openAPIV3Schema:
         properties:
           apiVersion:
@@ -3139,9 +3143,4 @@ spec:
         required:
         - spec
         type: object
-  version: v1alpha1
-  versions:
-  - name: v1alpha1
-    served: true
-    storage: true
 {{- end }}

charts/argocd-notifications/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: 1.0.1
 description: A Helm chart for ArgoCD notifications, an add-on to ArgoCD.
 name: argocd-notifications
 type: application
-version: 1.0.13
+version: 1.0.14
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 keywords:

charts/argocd-notifications/templates/deployment.yaml

@@ -51,6 +51,9 @@ spec:
             name: metrics
             protocol: TCP
           {{- end }}
+          {{- with .Values.extraEnv }}
+          env: {{ toYaml . | nindent 12 }}
+          {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

charts/argocd-notifications/values.yaml

@@ -54,6 +54,9 @@ metrics:
     # interval: 30s
     # scrapeTimeout: 10s
 
+# Additional container environment variables
+extraEnv: []
+
 notifiers:
 # For more information: https://argocd-notifications.readthedocs.io/en/stable/services/overview/