DevFW-CICD/argocd-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upbound/main' into render-values-by-tpl-func

Browse source 
Signed-off-by: Boris Komraz <bkomraz1@gmail.com>
This commit is contained in:
Boris Komraz 2023-11-01 14:44:39 +02:00
commit e779ad7988
No known key found for this signature in database
6 changed files with 56 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/configs/ct-lint.yaml vendored
View file

@ -7,7 +7,6 @@ chart-dirs:
- charts - charts
chart-repos: chart-repos:
- dandydeveloper=https://dandydeveloper.github.io/charts/ - dandydeveloper=https://dandydeveloper.github.io/charts/
helm-extra-args: "--timeout 600s"
validate-chart-schema: false validate-chart-schema: false
validate-maintainers: true validate-maintainers: true
validate-yaml: true validate-yaml: true

4
.github/workflows/lint-and-test.yml vendored
View file

@ -38,10 +38,10 @@ jobs:
- name: Setup Chart Linting - name: Setup Chart Linting
id: lint id: lint
uses: helm/chart-testing-action@e8788873172cb653a90ca2e819d79d65a66d4e76 # v2.4.0 uses: helm/chart-testing-action@b43128a8b25298e1e7b043b78ea6613844e079b1 # v2.6.0
with: with:
# Note: Also update in scripts/lint.sh # Note: Also update in scripts/lint.sh
version: v3.7.1 version: v3.10.0
- name: List changed charts - name: List changed charts
id: list-changed id: list-changed

4
charts/argo-cd/Chart.yaml
View file

@ -1,9 +1,9 @@
apiVersion: v2 apiVersion: v2
appVersion: v2.8.5 appVersion: v2.8.6
kubeVersion: ">=1.23.0-0" kubeVersion: ">=1.23.0-0"
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd name: argo-cd
version: 5.49.1 version: 5.50.1
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
sources: sources:

4
charts/argo-rollouts/Chart.yaml
View file

@ -2,7 +2,7 @@ apiVersion: v2
appVersion: v1.6.0 appVersion: v1.6.0
description: A Helm chart for Argo Rollouts description: A Helm chart for Argo Rollouts
name: argo-rollouts name: argo-rollouts
version: 2.32.1 version: 2.32.2
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://argoproj.github.io/argo-rollouts/assets/logo.png icon: https://argoproj.github.io/argo-rollouts/assets/logo.png
keywords: keywords:
@ -19,4 +19,4 @@ annotations:
url: https://argoproj.github.io/argo-helm/pgp_keys.asc url: https://argoproj.github.io/argo-helm/pgp_keys.asc
artifacthub.io/changes: | artifacthub.io/changes: |
- kind: fixed - kind: fixed
description: Use integer instead of float for controller replicas description: Update AnalysisRun CRD to match upstream

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

@ -189,13 +189,22 @@ spec:
datadog: datadog:
properties: properties:
apiVersion: apiVersion:
default: v1
enum:
- v1
- v2
type: string
formula:
type: string type: string
interval: interval:
default: 5m
type: string type: string
queries:
additionalProperties:
type: string
type: object
query: query:
type: string type: string
required:
- query
type: object type: object
graphite: graphite:
properties: properties:
@ -2809,6 +2818,19 @@ spec:
type: string type: string
authentication: authentication:
properties: properties:
oauth2:
properties:
clientId:
type: string
clientSecret:
type: string
scopes:
items:
type: string
type: array
tokenUrl:
type: string
type: object
sigv4: sigv4:
properties: properties:
profile: profile:
@ -2857,6 +2879,31 @@ spec:
type: object type: object
web: web:
properties: properties:
authentication:
properties:
oauth2:
properties:
clientId:
type: string
clientSecret:
type: string
scopes:
items:
type: string
type: array
tokenUrl:
type: string
type: object
sigv4:
properties:
profile:
type: string
region:
type: string
roleArn:
type: string
type: object
type: object
body: body:
type: string type: string
headers: headers:

2
scripts/lint.sh
View file

@ -9,7 +9,7 @@ echo -e "\n-- Linting all Helm Charts --\n"
docker run \ docker run \
-v "$SRCROOT:/workdir" \ -v "$SRCROOT:/workdir" \
--entrypoint /bin/sh \ --entrypoint /bin/sh \
quay.io/helmpack/chart-testing:v3.7.1 \ quay.io/helmpack/chart-testing:v3.10.0 \
-c cd /workdir \ -c cd /workdir \
ct lint \ ct lint \
--config .github/configs/ct-lint.yaml \ --config .github/configs/ct-lint.yaml \