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

Merge branch 'main' into configre-argocd-applicationset-svc-type

Browse source
This commit is contained in:
yu-croco 2023-05-08 18:55:20 +09:00
commit b0497e4d3f
13 changed files with 43 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,23 +10,23 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Set up Helm - name: Set up Helm
uses: azure/setup-helm@v3 uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78 # v3.5
with: with:
version: v3.10.1 # Also update in publish.yaml version: v3.10.1 # Also update in publish.yaml
- name: Set up python - name: Set up python
uses: actions/setup-python@v4 uses: actions/setup-python@57ded4d7d5e986d7296eab16560982c6dd7c923b # v4.6.0
with: with:
python-version: 3.9 python-version: 3.9
- name: Setup Chart Linting - name: Setup Chart Linting
id: lint id: lint
uses: helm/chart-testing-action@v2.4.0 uses: helm/chart-testing-action@e8788873172cb653a90ca2e819d79d65a66d4e76 # v2.4.0
with: with:
# Note: Also update in scripts/lint.sh # Note: Also update in scripts/lint.sh
version: v3.7.1 version: v3.7.1
@ -58,7 +58,7 @@ jobs:
fi fi
- name: Create kind cluster - name: Create kind cluster
uses: helm/kind-action@v1.5.0 uses: helm/kind-action@d8ccf8fb623ce1bb360ae2f45f323d9d5c5e9f00 # v1.5.0
if: steps.list-changed.outputs.changed == 'true' if: steps.list-changed.outputs.changed == 'true'
with: with:
config: .github/configs/kind-config.yaml config: .github/configs/kind-config.yaml

11
.github/workflows/pr-sizing.yml vendored
View file

@ -1,8 +1,12 @@
## Reference: https://github.com/pascalgn/size-label-action ## Reference: https://github.com/pascalgn/size-label-action
name: 'PR Labeling' name: 'PR Labeling'
on: on:
pull_request_target: pull_request_target:
types: [opened, synchronize, reopened] types:
- opened
- synchronize
- reopened
permissions: permissions:
contents: read contents: read
@ -12,7 +16,7 @@ jobs:
triage: triage:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/labeler@v4 - uses: actions/labeler@ba790c862c380240c6d5e7427be5ace9a05c754b # v4.0.3
with: with:
configuration-path: ".github/configs/labeler.yaml" configuration-path: ".github/configs/labeler.yaml"
repo-token: "${{ secrets.GITHUB_TOKEN }}" repo-token: "${{ secrets.GITHUB_TOKEN }}"
@ -21,7 +25,6 @@ jobs:
size-label: size-label:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: size-label - uses: pascalgn/size-label-action@1619680c5ac1ef360b944bb56a57587ba4aa2af8 # v0.4.3
uses: "pascalgn/size-label-action@v0.4.3"
env: env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

3
.github/workflows/pr-title.yml vendored
View file

@ -19,7 +19,7 @@ jobs:
name: Validate PR title name: Validate PR title
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: amannn/action-semantic-pull-request@v5 - uses: amannn/action-semantic-pull-request@c3cd5d1ea3580753008872425915e343e351ab54 # v5.2.0
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: with:
@ -31,6 +31,7 @@ jobs:
argo-workflows argo-workflows
argocd-image-updater argocd-image-updater
argocd-apps argocd-apps
deps
github github
# Configure that a scope must always be provided. # Configure that a scope must always be provided.
requireScope: true requireScope: true

6
.github/workflows/publish.yml vendored
View file

@ -15,12 +15,12 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Install Helm - name: Install Helm
uses: azure/setup-helm@v3 uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78 # v3.5
with: with:
version: v3.10.1 # Also update in lint-and-test.yaml version: v3.10.1 # Also update in lint-and-test.yaml
@ -39,7 +39,7 @@ jobs:
git checkout origin/gh-pages index.yaml git checkout origin/gh-pages index.yaml
- name: Run chart-releaser - name: Run chart-releaser
uses: helm/chart-releaser-action@v1.5.0 uses: helm/chart-releaser-action@be16258da8010256c6e82849661221415f031968 # v1.5.0
with: with:
config: "./.github/configs/cr.yaml" config: "./.github/configs/cr.yaml"
env: env:

6
.github/workflows/scorecard.yml vendored
View file

@ -37,7 +37,7 @@ jobs:
persist-credentials: false persist-credentials: false
- name: "Run analysis" - name: "Run analysis"
uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86 # v2.1.2 uses: ossf/scorecard-action@80e868c13c90f172d68d1f4501dee99e2479f7af # v2.1.3
with: with:
results_file: results.sarif results_file: results.sarif
results_format: sarif results_format: sarif
@ -59,7 +59,7 @@ jobs:
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
# format to the repository Actions tab. # format to the repository Actions tab.
- name: "Upload artifact" - name: "Upload artifact"
uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0 uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
with: with:
name: SARIF file name: SARIF file
path: results.sarif path: results.sarif
@ -67,6 +67,6 @@ jobs:
# Upload the results to GitHub's code scanning dashboard. # Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning" - name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4 uses: github/codeql-action/upload-sarif@29b1f65c5e92e24fe6b6647da1eaabe529cec70f # v2.3.3
with: with:
sarif_file: results.sarif sarif_file: results.sarif

2
.github/workflows/stale.yml vendored
View file

@ -14,7 +14,7 @@ jobs:
pull-requests: write # for actions/stale to close stale PRs pull-requests: write # for actions/stale to close stale PRs
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/stale@v8 - uses: actions/stale@1160a2240286f5da8ec72b1c0816ce2481aabf84 # v8.0.0
with: with:
repo-token: ${{ secrets.GITHUB_TOKEN }} repo-token: ${{ secrets.GITHUB_TOKEN }}
# Number of days of inactivity before an issue becomes stale # Number of days of inactivity before an issue becomes stale

2
CODEOWNERS
View file

@ -2,7 +2,7 @@
* @mkilchhofer @jmeridth * @mkilchhofer @jmeridth
# Argo Workflows # Argo Workflows
/charts/argo-workflows/ @vladlosev @yann-soubeyrand @jmeridth @yu-croco /charts/argo-workflows/ @vladlosev @jmeridth @yu-croco
# Argo CD # Argo CD
/charts/argo-cd/ @mbevc1 @mkilchhofer @yu-croco @jmeridth @pdrastil /charts/argo-cd/ @mbevc1 @mkilchhofer @yu-croco @jmeridth @pdrastil

2
README.md
View file

@ -36,7 +36,7 @@ kubectl apply -k "https://github.com/argoproj/argo-cd/manifests/crds?ref=v2.4.9"
### Security Policy ### Security Policy
If you have a security concern relating to either this project repo or an individual helm chart, please [open an issue](https://github.com/argoproj/argo-helm/issues/new/choose) or [start a discussion](https://github.com/argoproj/argo-helm/discussions/new). Please refer to [SECURITY.md](SECURITY.md) for details on how to report security issues.
### Changelog ### Changelog

8
charts/argo-events/Chart.yaml
View file

@ -2,9 +2,9 @@ apiVersion: v2
appVersion: v1.7.6 appVersion: v1.7.6
description: A Helm chart for Argo Events, the event-driven workflow automation framework description: A Helm chart for Argo Events, the event-driven workflow automation framework
name: argo-events name: argo-events
version: 2.2.0 version: 2.3.1
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://argoproj.github.io/argo-events/assets/logo.png icon: https://avatars.githubusercontent.com/u/30269780?s=200&v=4
keywords: keywords:
- argoproj - argoproj
- argo-events - argo-events
@ -15,5 +15,5 @@ maintainers:
url: https://argoproj.github.io/ url: https://argoproj.github.io/
annotations: annotations:
artifacthub.io/changes: | artifacthub.io/changes: |
- kind: fixed - kind: chore
description: add namespace field for namespace scoped resources description: Update chart icon

6
charts/argo-events/templates/extra-manifests.yaml
View file

@ -1,4 +1,8 @@
{{ range .Values.extraObjects }} {{ range .Values.extraObjects }}
--- ---
{{ tpl (toYaml .) $ }} {{- if typeIs "string" . }}
{{- tpl . $ }}
{{- else }}
{{- tpl (toYaml .) $ }}
{{- end }}
{{ end }} {{ end }}

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

@ -2,7 +2,7 @@ apiVersion: v2
appVersion: v1.4.1 appVersion: v1.4.1
description: A Helm chart for Argo Rollouts description: A Helm chart for Argo Rollouts
name: argo-rollouts name: argo-rollouts
version: 2.26.1 version: 2.27.0
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:
@ -16,4 +16,4 @@ maintainers:
annotations: annotations:
artifacthub.io/changes: | artifacthub.io/changes: |
- kind: added - kind: added
description: Missing permissions to leases under coordination api group description: Allow extraObjects to contain string templates

6
charts/argo-rollouts/templates/extra-manifests.yaml
View file

@ -1,4 +1,8 @@
{{ range .Values.extraObjects }} {{ range .Values.extraObjects }}
--- ---
{{ tpl (toYaml .) $ }} {{- if typeIs "string" . }}
{{- tpl . $ }}
{{- else }}
{{- tpl (toYaml .) $ }}
{{- end }}
{{ end }} {{ end }}

8
charts/argo-workflows/Chart.yaml
View file

@ -3,8 +3,8 @@ appVersion: v3.4.7
name: argo-workflows name: argo-workflows
description: A Helm chart for Argo Workflows description: A Helm chart for Argo Workflows
type: application type: application
version: 0.26.0 version: 0.26.1
icon: https://raw.githubusercontent.com/argoproj/argo-workflows/master/docs/assets/argo.png icon: https://argoproj.github.io/argo-workflows/assets/logo.png
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
sources: sources:
- https://github.com/argoproj/argo-workflows - https://github.com/argoproj/argo-workflows
@ -13,5 +13,5 @@ maintainers:
url: https://argoproj.github.io/ url: https://argoproj.github.io/
annotations: annotations:
artifacthub.io/changes: | artifacthub.io/changes: |
- kind: fix - kind: chore
description: Drop .Values.useDefaultArtifactRepo flag to simplify usage description: Update Chart icon