Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Resolve symlinked value files correctly #8387

Merged
merged 2 commits into from Feb 4, 2022

Conversation

jannfis
Copy link
Member

@jannfis jannfis commented Feb 4, 2022

Fixes a regression introduced by 78c2084

Fixes #8379

Signed-off-by: jannfis jann@mistrust.net

Note on DCO:

If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the Details link next to the DCO action for instructions on how to resolve this.

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • Optional. My organization is added to USERS.md.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).

Signed-off-by: jannfis <jann@mistrust.net>
Signed-off-by: jannfis <jann@mistrust.net>
Copy link
Collaborator

@alexmt alexmt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@codecov
Copy link

codecov bot commented Feb 4, 2022

Codecov Report

Merging #8387 (9e13b48) into master (ac12540) will increase coverage by 0.02%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #8387      +/-   ##
==========================================
+ Coverage   41.97%   42.00%   +0.02%     
==========================================
  Files         178      178              
  Lines       22894    22904      +10     
==========================================
+ Hits         9610     9620      +10     
  Misses      11905    11905              
  Partials     1379     1379              
Impacted Files Coverage Δ
reposerver/repository/repository.go 58.71% <100.00%> (+0.13%) ⬆️
server/server.go 55.33% <0.00%> (+0.57%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ac12540...9e13b48. Read the comment docs.

@alexmt alexmt merged commit bb77664 into argoproj:master Feb 4, 2022
alexmt pushed a commit that referenced this pull request Feb 4, 2022
* fix: Resolve symlinked value files correctly

Signed-off-by: jannfis <jann@mistrust.net>

* fix: Resolve symlinked value files correctly

Signed-off-by: jannfis <jann@mistrust.net>
alexmt pushed a commit that referenced this pull request Feb 4, 2022
* fix: Resolve symlinked value files correctly

Signed-off-by: jannfis <jann@mistrust.net>

* fix: Resolve symlinked value files correctly

Signed-off-by: jannfis <jann@mistrust.net>
alexmt pushed a commit that referenced this pull request Feb 4, 2022
* fix: Resolve symlinked value files correctly

Signed-off-by: jannfis <jann@mistrust.net>

* fix: Resolve symlinked value files correctly

Signed-off-by: jannfis <jann@mistrust.net>
roi-codefresh added a commit to codefresh-io/argo-cd that referenced this pull request Feb 6, 2022
* fix(ui): Add Error Boundary around Extensions and comply with new Extensions API (argoproj#7215)

* fix: Add error boundary around Extensions and change path where UI looks for extensions

Signed-off-by: Remington Breeze <remington@breeze.software>

* Add error message to error boundary

Signed-off-by: Remington Breeze <remington@breeze.software>

* docs: Kustomize load_restrictor -> load-restrictor (argoproj#7358)

Signed-off-by: Jan-Otto Kröpke <joe@adorsys.de>

* docs: update v2.3+ roadmap (argoproj#7353)

* docs: update v2.3+ roadmap

Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>

* Address reviewer notes: Add 'Merge Argo CD Image Updater into Argo CD' and 'Multi-tenancy improvements'

Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>

* fix: remove not existing repo (argoproj#7280)

* remove not existing repo

Signed-off-by: pashavictorovich <pavel@codefresh.io>

* fix test

Signed-off-by: pashavictorovich <pavel@codefresh.io>

* fix: Application status panel shows Syncing instead of Deleting (argoproj#7486)

Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>

* fix: Operation has completed with phase: Running (argoproj#7482)

* fix: Operation has completed with phase: Running

Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>

* Bump version to 2.1.4

* Bump version to 2.1.4

* fix: Invalid memory address or nil pointer dereference in processRequestedAppOperation (argoproj#7501)

Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>

* Bump version to 2.1.5

* Bump version to 2.1.5

* fix: supporting OCI dependencies. Fixes argoproj#6062 (argoproj#6994)

* fix: supporting OCI dependencies

Signed-off-by: Mohammad Yosefpor <myusefpur@gmail.com>

* chore: add org to USERS.md

Signed-off-by: Mohammad Yosefpor <myusefpur@gmail.com>

* fix(tests): remove invalid TestRepoPermission e2e test

Signed-off-by: Mohammad Yosefpor <myusefpur@gmail.com>

* fix: don't use revision caching during app creation (argoproj#7508)

Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>

* Bump version to 2.1.6

* Bump version to 2.1.6

* Fix: Kuberenetes manifest to have new Github.com ssh known host keys for ArgoCD deployments (argoproj#7722)

* Kuberenetes manifest to have new ssh known host keys for ArgoCD deployments

https://github.blog/2021-09-01-improving-git-protocol-security-github/
Signed-off-by: smark88 <msarcevicz@influxdata.com>

* added to docs

Signed-off-by: smark88 <msarcevicz@influxdata.com>

* fix: regenerate manifests using 'make manifests'

Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>

Co-authored-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>

* Bump version to 2.1.7

* Bump version to 2.1.7

* fix: upgraded gitops engine to v0.4.2 (fixes argoproj#7561)

Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>

* fix: env vars to tune cluster cache were broken (argoproj#7779)

Signed-off-by: Jesse Suen <jesse@akuity.io>

* fix nil point (argoproj#7905)

Signed-off-by: jomenxiao <jomenxiao@gmail.com>

* fix: issue with keepalive (argoproj#7861)

* fix issue with keepalive

Signed-off-by: pashavictorovich <pavel@codefresh.io>

* empty commit

Signed-off-by: pashavictorovich <pavel@codefresh.io>

* Bump version to 2.1.8

* Bump version to 2.1.8

* Merge pull request from GHSA-63qx-x74g-jcr7

Signed-off-by: jannfis <jann@mistrust.net>

* Bump version to 2.1.9

* Bump version to 2.1.9

* fix: Resolve symlinked value files correctly (argoproj#8387)

* fix: Resolve symlinked value files correctly

Signed-off-by: jannfis <jann@mistrust.net>

* fix: Resolve symlinked value files correctly

Signed-off-by: jannfis <jann@mistrust.net>

* Bump version to 2.1.10

* Bump version to 2.1.10

* add CODEFRESH=true to e2e workflow

* codegen

* fix e2e

Co-authored-by: Remington Breeze <remington@breeze.software>
Co-authored-by: Jan-Otto Kröpke <github@jkroepke.de>
Co-authored-by: Alexander Matyushentsev <Alexander_Matyushentsev@intuit.com>
Co-authored-by: pasha-codefresh <pavel@codefresh.io>
Co-authored-by: argo-bot <argoproj@gmail.com>
Co-authored-by: Mohammad Yosefpor <47300215+m-yosefpor@users.noreply.github.com>
Co-authored-by: Mark Sarcevicz <47335998+smark88@users.noreply.github.com>
Co-authored-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
Co-authored-by: Jesse Suen <jessesuen@users.noreply.github.com>
Co-authored-by: jomenxiao <jomenxiao@gmail.com>
Co-authored-by: jannfis <jann@mistrust.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ArgoCD 2.2.4 w/ new CVE fix does not allow for symlink'd values.yaml files
2 participants