Skip to content

Commit

Permalink
Merge branch 'master' into fix-argoproj#15319
Browse files Browse the repository at this point in the history
  • Loading branch information
timgriffiths authored Nov 21, 2024
2 parents 6c35fb1 + 3b81d3c commit 11adcde
Show file tree
Hide file tree
Showing 1,510 changed files with 91,439 additions and 35,042 deletions.
1 change: 1 addition & 0 deletions .codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ ignore:
- "pkg/client/.*"
- "vendor/.*"
- "test/.*"
- "**/mocks/*"
coverage:
status:
# we've found this not to be useful
Expand Down
13 changes: 13 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
**/*.pb.go linguist-generated=true
**/mocks/*.go linguist-generated=true
assets/swagger.json linguist-generated=true
docs/operator-manual/resource_actions_builtin.md linguist-generated=true
docs/operator-manual/server-commands/argocd-*.md linguist-generated=true
docs/user-guide/commands/argocd_*.md linguist-generated=true
manifests/core-install.yaml linguist-generated=true
manifests/crds/*-crd.yaml linguist-generated=true
manifests/ha/install.yaml linguist-generated=true
manifests/ha/namespace-install.yaml linguist-generated=true
manifests/install.yaml linguist-generated=true
manifests/namespace-install.yaml linguist-generated=true
pkg/apis/api-rules/violation_exceptions.list linguist-generated=true
43 changes: 43 additions & 0 deletions .github/ISSUE_TEMPLATE/new_dev_tool.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
---
name: New Dev Tool Request
about: This is a request for adding a new tool for setting up a dev environment.
title: ''
labels: ''
assignees: ''
---

Checklist:

* [ ] I am willing to maintain this tool, or have another Argo CD maintainer who is.
* [ ] I have another Argo CD maintainer who is willing to help maintain this tool (there needs to be at least two maintainers willing to maintain this tool)
* [ ] I have a lead sponsor who is a core Argo CD maintainer
* [ ] There is a PR which adds said tool - this is so that the maintainers can assess the impact of having this in the tree
* [ ] I have given a motivation why this should be added

### The proposer

<-- The username(s) of the person(s) proposing the tool -->

### The proposed tool

<!-- The tool itself, with a link to the tool’s website -->

### Motivation

<!-- Why this tool would be useful to have in the tree. -->

### Link to PR (Optional)

<!-- A PR adding the tool to the tree -->

### Lead Sponsor(s)

Final approval requires sponsorship from at least one core maintainer.

- @<sponsor-1>

### Co-sponsors

These will be the co-maintainers of the specified tool.

- @<sponsor-1>
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,13 @@ updates:
directory: "/"
schedule:
interval: "daily"
open-pull-requests-limit: 20
ignore:
- dependency-name: k8s.io/*
groups:
otel:
patterns:
- "^go.opentelemetry.io/.*"

- package-ecosystem: "github-actions"
directory: "/"
Expand All @@ -26,6 +31,11 @@ updates:
directory: "/"
schedule:
interval: "daily"
ignore:
# We use consistent go and node versions across a lot of different files, and updating via dependabot would cause
# drift among those files, instead we let renovate bot handle them.
- dependency-name: "library/golang"
- dependency-name: "library/node"

- package-ecosystem: "docker"
directory: "/test/container/"
Expand Down
Loading

0 comments on commit 11adcde

Please sign in to comment.