Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/argoproj/argo-cd
Browse files Browse the repository at this point in the history
  • Loading branch information
reggie-k committed Jan 7, 2025
2 parents 4091eca + c739478 commit 03209b4
Show file tree
Hide file tree
Showing 52 changed files with 983 additions and 1,142 deletions.
2 changes: 1 addition & 1 deletion .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ linters-settings:
disabled: false
# receiver names in a method should reflect the struct name (p for Person, for example)
- name: receiver-naming
disabled: true
disabled: false
# redefining built in names (true, false, append, make) can lead to bugs very difficult to detect.
- name: redefines-builtin-id
disabled: true
Expand Down
24 changes: 12 additions & 12 deletions controller/sharding/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,20 @@ func NewClusterSharding(_ db.ArgoDB, shard, replicas int, shardingAlgorithm stri
}

// IsManagedCluster returns whether or not the cluster should be processed by a given shard.
func (s *ClusterSharding) IsManagedCluster(c *v1alpha1.Cluster) bool {
s.lock.RLock()
defer s.lock.RUnlock()
func (sharding *ClusterSharding) IsManagedCluster(c *v1alpha1.Cluster) bool {
sharding.lock.RLock()
defer sharding.lock.RUnlock()
if c == nil { // nil cluster (in-cluster) is always managed by current clusterShard
return true
}
clusterShard := 0
if shard, ok := s.Shards[c.Server]; ok {
if shard, ok := sharding.Shards[c.Server]; ok {
clusterShard = shard
} else {
log.Warnf("The cluster %s has no assigned shard.", c.Server)
}
log.Debugf("Checking if cluster %s with clusterShard %d should be processed by shard %d", c.Server, clusterShard, s.Shard)
return clusterShard == s.Shard
log.Debugf("Checking if cluster %s with clusterShard %d should be processed by shard %d", c.Server, clusterShard, sharding.Shard)
return clusterShard == sharding.Shard
}

func (sharding *ClusterSharding) Init(clusters *v1alpha1.ClusterList, apps *v1alpha1.ApplicationList) {
Expand Down Expand Up @@ -187,22 +187,22 @@ func hasShardingUpdates(old, new *v1alpha1.Cluster) bool {
}

// A read lock should be acquired before calling getClusterAccessor.
func (d *ClusterSharding) getClusterAccessor() clusterAccessor {
func (sharding *ClusterSharding) getClusterAccessor() clusterAccessor {
return func() []*v1alpha1.Cluster {
// no need to lock, as this is only called from the updateDistribution function
clusters := make([]*v1alpha1.Cluster, 0, len(d.Clusters))
for _, c := range d.Clusters {
clusters := make([]*v1alpha1.Cluster, 0, len(sharding.Clusters))
for _, c := range sharding.Clusters {
clusters = append(clusters, c)
}
return clusters
}
}

// A read lock should be acquired before calling getAppAccessor.
func (d *ClusterSharding) getAppAccessor() appAccessor {
func (sharding *ClusterSharding) getAppAccessor() appAccessor {
return func() []*v1alpha1.Application {
apps := make([]*v1alpha1.Application, 0, len(d.Apps))
for _, a := range d.Apps {
apps := make([]*v1alpha1.Application, 0, len(sharding.Apps))
for _, a := range sharding.Apps {
apps = append(apps, a)
}
return apps
Expand Down
2 changes: 1 addition & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ mkdocs==1.6.1
# Thus pointing to the older version of mkdocs-material.
mkdocs-material==7.1.8
markdown_include==0.8.1
pygments==2.19.0
pygments==2.19.1
jinja2==3.1.5
markdown==3.7
pymdown-extensions==10.13
60 changes: 30 additions & 30 deletions docs/snyk/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,47 +23,47 @@ recent minor releases.
| [install.yaml](master/argocd-iac-install.html) | - | - | - | - |
| [namespace-install.yaml](master/argocd-iac-namespace-install.html) | - | - | - | - |

### v2.14.0-rc3
### v2.14.0-rc4

| | Critical | High | Medium | Low |
|---:|:--------:|:----:|:------:|:---:|
| [go.mod](v2.14.0-rc3/argocd-test.html) | 0 | 1 | 6 | 0 |
| [ui/yarn.lock](v2.14.0-rc3/argocd-test.html) | 0 | 0 | 1 | 0 |
| [dex:v2.41.1](v2.14.0-rc3/ghcr.io_dexidp_dex_v2.41.1.html) | 0 | 0 | 0 | 2 |
| [haproxy:2.6.17-alpine](v2.14.0-rc3/public.ecr.aws_docker_library_haproxy_2.6.17-alpine.html) | 0 | 0 | 2 | 4 |
| [redis:7.0.15-alpine](v2.14.0-rc3/public.ecr.aws_docker_library_redis_7.0.15-alpine.html) | 0 | 0 | 0 | 1 |
| [argocd:v2.14.0-rc3](v2.14.0-rc3/quay.io_argoproj_argocd_v2.14.0-rc3.html) | 0 | 0 | 3 | 10 |
| [redis:7.0.15-alpine](v2.14.0-rc3/redis_7.0.15-alpine.html) | 0 | 0 | 0 | 1 |
| [install.yaml](v2.14.0-rc3/argocd-iac-install.html) | - | - | - | - |
| [namespace-install.yaml](v2.14.0-rc3/argocd-iac-namespace-install.html) | - | - | - | - |
| [go.mod](v2.14.0-rc4/argocd-test.html) | 0 | 1 | 6 | 0 |
| [ui/yarn.lock](v2.14.0-rc4/argocd-test.html) | 0 | 0 | 1 | 0 |
| [dex:v2.41.1](v2.14.0-rc4/ghcr.io_dexidp_dex_v2.41.1.html) | 0 | 0 | 0 | 2 |
| [haproxy:2.6.17-alpine](v2.14.0-rc4/public.ecr.aws_docker_library_haproxy_2.6.17-alpine.html) | 0 | 0 | 2 | 4 |
| [redis:7.0.15-alpine](v2.14.0-rc4/public.ecr.aws_docker_library_redis_7.0.15-alpine.html) | 0 | 0 | 0 | 1 |
| [argocd:v2.14.0-rc3](v2.14.0-rc4/quay.io_argoproj_argocd_v2.14.0-rc3.html) | 0 | 0 | 3 | 10 |
| [redis:7.0.15-alpine](v2.14.0-rc4/redis_7.0.15-alpine.html) | 0 | 0 | 0 | 1 |
| [install.yaml](v2.14.0-rc4/argocd-iac-install.html) | - | - | - | - |
| [namespace-install.yaml](v2.14.0-rc4/argocd-iac-namespace-install.html) | - | - | - | - |

### v2.13.2
### v2.13.3

| | Critical | High | Medium | Low |
|---:|:--------:|:----:|:------:|:---:|
| [go.mod](v2.13.2/argocd-test.html) | 1 | 1 | 7 | 2 |
| [ui/yarn.lock](v2.13.2/argocd-test.html) | 0 | 0 | 1 | 0 |
| [dex:v2.41.1](v2.13.2/ghcr.io_dexidp_dex_v2.41.1.html) | 0 | 0 | 0 | 2 |
| [haproxy:2.6.17-alpine](v2.13.2/public.ecr.aws_docker_library_haproxy_2.6.17-alpine.html) | 0 | 0 | 2 | 4 |
| [redis:7.0.15-alpine](v2.13.2/public.ecr.aws_docker_library_redis_7.0.15-alpine.html) | 0 | 0 | 0 | 1 |
| [argocd:v2.13.2](v2.13.2/quay.io_argoproj_argocd_v2.13.2.html) | 0 | 0 | 3 | 11 |
| [redis:7.0.15-alpine](v2.13.2/redis_7.0.15-alpine.html) | 0 | 0 | 0 | 1 |
| [install.yaml](v2.13.2/argocd-iac-install.html) | - | - | - | - |
| [namespace-install.yaml](v2.13.2/argocd-iac-namespace-install.html) | - | - | - | - |
| [go.mod](v2.13.3/argocd-test.html) | 1 | 1 | 7 | 2 |
| [ui/yarn.lock](v2.13.3/argocd-test.html) | 0 | 0 | 1 | 0 |
| [dex:v2.41.1](v2.13.3/ghcr.io_dexidp_dex_v2.41.1.html) | 0 | 0 | 0 | 2 |
| [haproxy:2.6.17-alpine](v2.13.3/public.ecr.aws_docker_library_haproxy_2.6.17-alpine.html) | 0 | 0 | 2 | 4 |
| [redis:7.0.15-alpine](v2.13.3/public.ecr.aws_docker_library_redis_7.0.15-alpine.html) | 0 | 0 | 0 | 1 |
| [argocd:v2.13.3](v2.13.3/quay.io_argoproj_argocd_v2.13.3.html) | 0 | 0 | 3 | 10 |
| [redis:7.0.15-alpine](v2.13.3/redis_7.0.15-alpine.html) | 0 | 0 | 0 | 1 |
| [install.yaml](v2.13.3/argocd-iac-install.html) | - | - | - | - |
| [namespace-install.yaml](v2.13.3/argocd-iac-namespace-install.html) | - | - | - | - |

### v2.12.8
### v2.12.9

| | Critical | High | Medium | Low |
|---:|:--------:|:----:|:------:|:---:|
| [go.mod](v2.12.8/argocd-test.html) | 1 | 1 | 8 | 2 |
| [ui/yarn.lock](v2.12.8/argocd-test.html) | 0 | 0 | 1 | 0 |
| [dex:v2.38.0](v2.12.8/ghcr.io_dexidp_dex_v2.38.0.html) | 0 | 0 | 6 | 7 |
| [haproxy:2.6.17-alpine](v2.12.8/public.ecr.aws_docker_library_haproxy_2.6.17-alpine.html) | 0 | 0 | 2 | 4 |
| [redis:7.0.15-alpine](v2.12.8/public.ecr.aws_docker_library_redis_7.0.15-alpine.html) | 0 | 0 | 0 | 1 |
| [argocd:v2.12.8](v2.12.8/quay.io_argoproj_argocd_v2.12.8.html) | 0 | 0 | 3 | 11 |
| [redis:7.0.15-alpine](v2.12.8/redis_7.0.15-alpine.html) | 0 | 0 | 0 | 1 |
| [install.yaml](v2.12.8/argocd-iac-install.html) | - | - | - | - |
| [namespace-install.yaml](v2.12.8/argocd-iac-namespace-install.html) | - | - | - | - |
| [go.mod](v2.12.9/argocd-test.html) | 1 | 1 | 8 | 2 |
| [ui/yarn.lock](v2.12.9/argocd-test.html) | 0 | 0 | 1 | 0 |
| [dex:v2.38.0](v2.12.9/ghcr.io_dexidp_dex_v2.38.0.html) | 0 | 0 | 6 | 7 |
| [haproxy:2.6.17-alpine](v2.12.9/public.ecr.aws_docker_library_haproxy_2.6.17-alpine.html) | 0 | 0 | 2 | 4 |
| [redis:7.0.15-alpine](v2.12.9/public.ecr.aws_docker_library_redis_7.0.15-alpine.html) | 0 | 0 | 0 | 1 |
| [argocd:v2.12.9](v2.12.9/quay.io_argoproj_argocd_v2.12.9.html) | 0 | 0 | 3 | 10 |
| [redis:7.0.15-alpine](v2.12.9/redis_7.0.15-alpine.html) | 0 | 0 | 0 | 1 |
| [install.yaml](v2.12.9/argocd-iac-install.html) | - | - | - | - |
| [namespace-install.yaml](v2.12.9/argocd-iac-namespace-install.html) | - | - | - | - |

### v2.11.12

Expand Down
2 changes: 1 addition & 1 deletion docs/snyk/master/argocd-iac-install.html
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@
<div class="header-wrap">
<h1 class="project__header__title">Snyk test report</h1>

<p class="timestamp">December 29th 2024, 12:22:07 am (UTC+00:00)</p>
<p class="timestamp">January 5th 2025, 12:21:50 am (UTC+00:00)</p>
</div>
<div class="source-panel">
<span>Scanned the following path:</span>
Expand Down
2 changes: 1 addition & 1 deletion docs/snyk/master/argocd-iac-namespace-install.html
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@
<div class="header-wrap">
<h1 class="project__header__title">Snyk test report</h1>

<p class="timestamp">December 29th 2024, 12:22:17 am (UTC+00:00)</p>
<p class="timestamp">January 5th 2025, 12:22:00 am (UTC+00:00)</p>
</div>
<div class="source-panel">
<span>Scanned the following path:</span>
Expand Down
4 changes: 2 additions & 2 deletions docs/snyk/master/argocd-test.html
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@
<div class="header-wrap">
<h1 class="project__header__title">Snyk test report</h1>

<p class="timestamp">December 29th 2024, 12:19:49 am (UTC+00:00)</p>
<p class="timestamp">January 5th 2025, 12:19:32 am (UTC+00:00)</p>
</div>
<div class="source-panel">
<span>Scanned the following paths:</span>
Expand All @@ -470,7 +470,7 @@ <h1 class="project__header__title">Snyk test report</h1>
<div class="meta-counts">
<div class="meta-count"><span>7</span> <span>known vulnerabilities</span></div>
<div class="meta-count"><span>26 vulnerable dependency paths</span></div>
<div class="meta-count"><span>2160</span> <span>dependencies</span></div>
<div class="meta-count"><span>2165</span> <span>dependencies</span></div>
</div><!-- .meta-counts -->
</div><!-- .layout-container--short -->
</header><!-- .project__header -->
Expand Down
2 changes: 1 addition & 1 deletion docs/snyk/master/ghcr.io_dexidp_dex_v2.41.1.html
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@
<div class="header-wrap">
<h1 class="project__header__title">Snyk test report</h1>

<p class="timestamp">December 29th 2024, 12:19:59 am (UTC+00:00)</p>
<p class="timestamp">January 5th 2025, 12:19:42 am (UTC+00:00)</p>
</div>
<div class="source-panel">
<span>Scanned the following paths:</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@
<div class="header-wrap">
<h1 class="project__header__title">Snyk test report</h1>

<p class="timestamp">December 29th 2024, 12:20:04 am (UTC+00:00)</p>
<p class="timestamp">January 5th 2025, 12:19:47 am (UTC+00:00)</p>
</div>
<div class="source-panel">
<span>Scanned the following path:</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@
<div class="header-wrap">
<h1 class="project__header__title">Snyk test report</h1>

<p class="timestamp">December 29th 2024, 12:20:10 am (UTC+00:00)</p>
<p class="timestamp">January 5th 2025, 12:19:52 am (UTC+00:00)</p>
</div>
<div class="source-panel">
<span>Scanned the following paths:</span>
Expand Down
4 changes: 2 additions & 2 deletions docs/snyk/master/quay.io_argoproj_argocd_latest.html
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@
<div class="header-wrap">
<h1 class="project__header__title">Snyk test report</h1>

<p class="timestamp">December 29th 2024, 12:20:31 am (UTC+00:00)</p>
<p class="timestamp">January 5th 2025, 12:20:11 am (UTC+00:00)</p>
</div>
<div class="source-panel">
<span>Scanned the following paths:</span>
Expand All @@ -472,7 +472,7 @@ <h1 class="project__header__title">Snyk test report</h1>
<div class="meta-counts">
<div class="meta-count"><span>21</span> <span>known vulnerabilities</span></div>
<div class="meta-count"><span>101 vulnerable dependency paths</span></div>
<div class="meta-count"><span>2383</span> <span>dependencies</span></div>
<div class="meta-count"><span>2384</span> <span>dependencies</span></div>
</div><!-- .meta-counts -->
</div><!-- .layout-container--short -->
</header><!-- .project__header -->
Expand Down
2 changes: 1 addition & 1 deletion docs/snyk/master/redis_7.0.15-alpine.html
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@
<div class="header-wrap">
<h1 class="project__header__title">Snyk test report</h1>

<p class="timestamp">December 29th 2024, 12:20:35 am (UTC+00:00)</p>
<p class="timestamp">January 5th 2025, 12:20:17 am (UTC+00:00)</p>
</div>
<div class="source-panel">
<span>Scanned the following paths:</span>
Expand Down
2 changes: 1 addition & 1 deletion docs/snyk/v2.11.12/argocd-iac-install.html
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@
<div class="header-wrap">
<h1 class="project__header__title">Snyk test report</h1>

<p class="timestamp">December 29th 2024, 12:32:09 am (UTC+00:00)</p>
<p class="timestamp">January 5th 2025, 12:31:48 am (UTC+00:00)</p>
</div>
<div class="source-panel">
<span>Scanned the following path:</span>
Expand Down
2 changes: 1 addition & 1 deletion docs/snyk/v2.11.12/argocd-iac-namespace-install.html
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@
<div class="header-wrap">
<h1 class="project__header__title">Snyk test report</h1>

<p class="timestamp">December 29th 2024, 12:32:19 am (UTC+00:00)</p>
<p class="timestamp">January 5th 2025, 12:31:57 am (UTC+00:00)</p>
</div>
<div class="source-panel">
<span>Scanned the following path:</span>
Expand Down
2 changes: 1 addition & 1 deletion docs/snyk/v2.11.12/argocd-test.html
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@
<div class="header-wrap">
<h1 class="project__header__title">Snyk test report</h1>

<p class="timestamp">December 29th 2024, 12:30:07 am (UTC+00:00)</p>
<p class="timestamp">January 5th 2025, 12:29:46 am (UTC+00:00)</p>
</div>
<div class="source-panel">
<span>Scanned the following paths:</span>
Expand Down
2 changes: 1 addition & 1 deletion docs/snyk/v2.11.12/ghcr.io_dexidp_dex_v2.38.0.html
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@
<div class="header-wrap">
<h1 class="project__header__title">Snyk test report</h1>

<p class="timestamp">December 29th 2024, 12:30:15 am (UTC+00:00)</p>
<p class="timestamp">January 5th 2025, 12:29:55 am (UTC+00:00)</p>
</div>
<div class="source-panel">
<span>Scanned the following paths:</span>
Expand Down
2 changes: 1 addition & 1 deletion docs/snyk/v2.11.12/haproxy_2.6.14-alpine.html
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@
<div class="header-wrap">
<h1 class="project__header__title">Snyk test report</h1>

<p class="timestamp">December 29th 2024, 12:30:21 am (UTC+00:00)</p>
<p class="timestamp">January 5th 2025, 12:29:59 am (UTC+00:00)</p>
</div>
<div class="source-panel">
<span>Scanned the following path:</span>
Expand Down
2 changes: 1 addition & 1 deletion docs/snyk/v2.11.12/quay.io_argoproj_argocd_v2.11.12.html
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@
<div class="header-wrap">
<h1 class="project__header__title">Snyk test report</h1>

<p class="timestamp">December 29th 2024, 12:30:41 am (UTC+00:00)</p>
<p class="timestamp">January 5th 2025, 12:30:23 am (UTC+00:00)</p>
</div>
<div class="source-panel">
<span>Scanned the following paths:</span>
Expand Down
2 changes: 1 addition & 1 deletion docs/snyk/v2.11.12/redis_7.0.15-alpine.html
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@
<div class="header-wrap">
<h1 class="project__header__title">Snyk test report</h1>

<p class="timestamp">December 29th 2024, 12:30:46 am (UTC+00:00)</p>
<p class="timestamp">January 5th 2025, 12:30:27 am (UTC+00:00)</p>
</div>
<div class="source-panel">
<span>Scanned the following paths:</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@
<div class="header-wrap">
<h1 class="project__header__title">Snyk test report</h1>

<p class="timestamp">December 29th 2024, 12:29:39 am (UTC+00:00)</p>
<p class="timestamp">January 5th 2025, 12:29:21 am (UTC+00:00)</p>
</div>
<div class="source-panel">
<span>Scanned the following path:</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@
<div class="header-wrap">
<h1 class="project__header__title">Snyk test report</h1>

<p class="timestamp">December 29th 2024, 12:29:48 am (UTC+00:00)</p>
<p class="timestamp">January 5th 2025, 12:29:31 am (UTC+00:00)</p>
</div>
<div class="source-panel">
<span>Scanned the following path:</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@
<div class="header-wrap">
<h1 class="project__header__title">Snyk test report</h1>

<p class="timestamp">December 29th 2024, 12:27:36 am (UTC+00:00)</p>
<p class="timestamp">January 5th 2025, 12:27:21 am (UTC+00:00)</p>
</div>
<div class="source-panel">
<span>Scanned the following paths:</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@
<div class="header-wrap">
<h1 class="project__header__title">Snyk test report</h1>

<p class="timestamp">December 29th 2024, 12:27:44 am (UTC+00:00)</p>
<p class="timestamp">January 5th 2025, 12:27:28 am (UTC+00:00)</p>
</div>
<div class="source-panel">
<span>Scanned the following paths:</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@
<div class="header-wrap">
<h1 class="project__header__title">Snyk test report</h1>

<p class="timestamp">December 29th 2024, 12:22:39 am (UTC+00:00)</p>
<p class="timestamp">January 5th 2025, 12:27:31 am (UTC+00:00)</p>
</div>
<div class="source-panel">
<span>Scanned the following path:</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@
<div class="header-wrap">
<h1 class="project__header__title">Snyk test report</h1>

<p class="timestamp">December 29th 2024, 12:27:52 am (UTC+00:00)</p>
<p class="timestamp">January 5th 2025, 12:27:35 am (UTC+00:00)</p>
</div>
<div class="source-panel">
<span>Scanned the following paths:</span>
Expand Down
Loading

0 comments on commit 03209b4

Please sign in to comment.