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.

Sign up for GitHub

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

Jump to bottom

fix: missing Helm params (#9565) #9566

Merged
merged 5 commits into from
Jun 5, 2022
Merged

fix: missing Helm params (#9565) #9566

merged 5 commits into from
Jun 5, 2022

Conversation

crenshaw-dev
Copy link
Member

@crenshaw-dev crenshaw-dev commented Jun 2, 2022 •
edited
Loading

Fixes #8808
Fixes #9175
Fixes #9213
Fixes #9380
Fixes #9565

Screenshot after applying the fix:

image

@crenshaw-dev
fix: missing Helm params
5d0985f 
Signed-off-by: Michael Crenshaw <[email protected]>
@crenshaw-dev
use absolute paths, fix tests
cfd48d0 
Signed-off-by: Michael Crenshaw <[email protected]>
crenshaw-dev
crenshaw-dev commented Jun 2, 2022
View reviewed changes
util/helm/helm_test.go
opts := TemplateOpts{
Name: "test",
Values: []path.ResolvedFilePath{"values-production.yaml"},
Copy link
Member Author

Choose a reason for hiding this comment

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

The tests were passing relative paths. That worked when we were incorrectly using filepath.Join. Since the code now expects (and should always receive) absolute paths, we have to calculate absolute paths in the tests.

@codecov
Copy link

codecov bot commented Jun 2, 2022 •
edited
Loading

Codecov Report

Merging #9566 (a4149d7) into master (b2fe209) will increase coverage by 0.03%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #9566      +/-   ##
==========================================
+ Coverage   45.77%   45.80%   +0.03%     
==========================================
  Files         222      222              
  Lines       26372    26371       -1     
==========================================
+ Hits        12072    12080       +8     
+ Misses      12651    12643       -8     
+ Partials     1649     1648       -1
Impacted Files Coverage Δ
util/io/path/resolved.go 76.92% <ø> (ø)
util/helm/helm.go 41.89% <100.00%> (-0.78%) ⬇️
util/settings/settings.go 48.16% <0.00%> (ø)
reposerver/repository/repository.go 61.38% <0.00%> (+0.94%) ⬆️

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 b2fe209...a4149d7. Read the comment docs.

@crenshaw-dev
fix race in test
9f87324 
Signed-off-by: Michael Crenshaw <[email protected]>
@crenshaw-dev
Merge branch 'fix-missing-helm-params' of https://github.com/crenshaw…
a4149d7 
…-dev/argo-cd into fix-missing-helm-params

Signed-off-by: Michael Crenshaw <[email protected]>
@crenshaw-dev crenshaw-dev requested a review from leoluz June 2, 2022 17:37
@crenshaw-dev
Copy link
Member Author

@leoluz I want to do a follow-up PR to add some enforcement mechanism for absolute paths. But wanted to keep this PR minimal since it's a bugfix.

@crenshaw-dev crenshaw-dev added the cherry-pick/2.4 Candidate for cherry picking into the 2.4 release branch label Jun 3, 2022
leoluz
leoluz approved these changes Jun 3, 2022
View reviewed changes
Copy link
Collaborator

@leoluz leoluz left a comment

Choose a reason for hiding this comment

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

LGTM

@crenshaw-dev crenshaw-dev merged commit 9d81222 into argoproj:master Jun 5, 2022
@crenshaw-dev crenshaw-dev deleted the fix-missing-helm-params branch June 5, 2022 00:16
crenshaw-dev added a commit that referenced this pull request Jun 5, 2022
@crenshaw-dev
fix: missing Helm params (#9565) (#9566)
a6c5874 
* fix: missing Helm params

Signed-off-by: Michael Crenshaw <[email protected]>

* use absolute paths, fix tests

Signed-off-by: Michael Crenshaw <[email protected]>

* fix race in test

Signed-off-by: Michael Crenshaw <[email protected]>
@crenshaw-dev crenshaw-dev added the cherry-pick/2.3 Candidate for cherry picking into the 2.3 release branch label Jun 13, 2022
crenshaw-dev added a commit that referenced this pull request Jun 13, 2022
@crenshaw-dev
fix: missing Helm params (#9565) (#9566)
b0e4473 
* fix: missing Helm params

Signed-off-by: Michael Crenshaw <[email protected]>

* use absolute paths, fix tests

Signed-off-by: Michael Crenshaw <[email protected]>

* fix race in test

Signed-off-by: Michael Crenshaw <[email protected]>
crenshaw-dev added a commit that referenced this pull request Jun 15, 2022
@crenshaw-dev
fix: missing Helm params (#9565) (#9566)
fd42ba7 
* fix: missing Helm params

Signed-off-by: Michael Crenshaw <[email protected]>

* use absolute paths, fix tests

Signed-off-by: Michael Crenshaw <[email protected]>

* fix race in test

Signed-off-by: Michael Crenshaw <[email protected]>
crenshaw-dev added a commit that referenced this pull request Jun 15, 2022
@crenshaw-dev
fix: missing Helm params (#9565) (#9566)
3fab7de 
* fix: missing Helm params

Signed-off-by: Michael Crenshaw <[email protected]>

* use absolute paths, fix tests

Signed-off-by: Michael Crenshaw <[email protected]>

* fix race in test

Signed-off-by: Michael Crenshaw <[email protected]>
@crenshaw-dev
Copy link
Member Author

I've cherry-picked this to 2.1.16, 2.2.10, and 2.3.5.

sujeilyfonseca added a commit to sujeilyfonseca/argo-cd that referenced this pull request Jul 7, 2022
@sujeilyfonseca @terrytangyuan
@alexmt @keithchong @argo-bot @jannfis @crenshaw-dev @ishitasequeira @pasha-codefresh @danielhelfand @cippaciong
feat: Argo CD v2.3.5 (argoproj#52)
570d9e1 
* fix(ui): Applications page incorrectly resets to tiles view. Fixes argoproj#8702 (argoproj#8718)

Signed-off-by: Yuan Tang <[email protected]>

* fix: correct jsonnet paths resolution (argoproj#8721)

Signed-off-by: Alexander Matyushentsev <[email protected]>

* chore: Bump stable version of application set addon (argoproj#8744)

Signed-off-by: Alexander Matyushentsev <[email protected]>

* fix: Retry checkbox unchecked unexpectedly; Sync up with YAML (argoproj#8682) (argoproj#8720)

Signed-off-by: Keith Chong <[email protected]>

* Bump version to 2.3.1

* Bump version to 2.3.1

* Merge pull request from GHSA-2f5v-8r3f-8pww

* fix: application resource APIs must enforce project restrictions

Signed-off-by: Alexander Matyushentsev <[email protected]>

* Fix unit tests

Signed-off-by: jannfis <[email protected]>

Co-authored-by: jannfis <[email protected]>

* chore: remove lint-docs CI task (argoproj#8722) (argoproj#8858)

* chore: remove lint-docs CI task

Signed-off-by: Alexander Matyushentsev <[email protected]>

* chore: remove not longer necessary url-allow-list

Signed-off-by: Alexander Matyushentsev <[email protected]>

Co-authored-by: Alexander Matyushentsev <[email protected]>

* chore: fix imports (argoproj#8859)

Signed-off-by: Michael Crenshaw <[email protected]>

* Bump version to 2.3.2

* Bump version to 2.3.2

* fix: Set QPS and burst rate for resource ops client (argoproj#8915)

* fix: Set QPS and burst rate for resource ops client

Signed-off-by: jannfis <[email protected]>

* fix: prevent excessive repo-server disk usage for large repos (argoproj#8845) (argoproj#8897)

fix: prevent excessive repo-server disk usage for large repos (argoproj#8845) (argoproj#8897)

Signed-off-by: Michael Crenshaw <[email protected]>

* fix: bump gitops engine version to v0.6.2

Signed-off-by: Alexander Matyushentsev <[email protected]>

* docs: update v2.4+ roadmap items (argoproj#8593)

Signed-off-by: ishitasequeira <[email protected]>

* docs: reflect v2.3 release changes in roadmap.md (argoproj#8747)

docs: reflect v2.3 release changes in roadmap.md (argoproj#8747)

Signed-off-by: Alexander Matyushentsev <[email protected]>

* Bump version to 2.3.3

* Bump version to 2.3.3

* fix: Fix docs build error (argoproj#8895)

* work with specific jinja version

Signed-off-by: pashavictorovich <[email protected]>

* fix: fix broken monaco editor collapse icons (argoproj#8709)

Signed-off-by: Alexander Matyushentsev <[email protected]>

* chore: upgrade to go 1.17.8 (argoproj#8866) (argoproj#9004)

* chore: upgrade to go 1.17.8

Signed-off-by: Michael Crenshaw <[email protected]>

* chore: use 1.17 so it's always latest in the series

Signed-off-by: Michael Crenshaw <[email protected]>

* fix: allow cli/ui to follow logs (argoproj#8987) (argoproj#9065)

Signed-off-by: Daniel Helfand <[email protected]>

* Merge pull request from GHSA-xmg8-99r8-jc2j

Signed-off-by: Michael Crenshaw <[email protected]>

Co-authored-by: Michael Crenshaw <[email protected]>

* Merge pull request from GHSA-6gcg-hp2x-q54h

* fix: do not allow symlinks from directory-type applications

Signed-off-by: Michael Crenshaw <[email protected]>

* chore: add new util file

Signed-off-by: Michael Crenshaw <[email protected]>

* chore: lint

Signed-off-by: Michael Crenshaw <[email protected]>

* chore: use t.TempDir for simpler tests

Signed-off-by: Michael Crenshaw <[email protected]>

* address comments

Signed-off-by: Michael Crenshaw <[email protected]>

* Merge pull request from GHSA-r642-gv9p-2wjj

Signed-off-by: jannfis <[email protected]>

Co-authored-by: Michael Crenshaw <[email protected]>

Co-authored-by: Michael Crenshaw <[email protected]>

* Bump version to 2.3.4

* Bump version to 2.3.4

* test: fix ErrorContains (argoproj#9445)

Signed-off-by: Michael Crenshaw <[email protected]>

* fix: missing Helm params (argoproj#9565) (argoproj#9566)

* fix: missing Helm params

Signed-off-by: Michael Crenshaw <[email protected]>

* use absolute paths, fix tests

Signed-off-by: Michael Crenshaw <[email protected]>

* fix race in test

Signed-off-by: Michael Crenshaw <[email protected]>

* chore: upgrade golangci-lint to v1.46.2 (argoproj#9448)

* chore: upgrade golangci-lint to v1.46.2

Because:

* Installation of golangci-lint v1.45.2 is currently broken and fails
  silently due to a redacted dependency
  (blizzy78/varnamelen#13)

This commit:

* Upgrades golangci-lint to v1.46.2

Signed-off-by: Tommaso Sardelli <[email protected]>

* fix: lint

Signed-off-by: Michael Crenshaw <[email protected]>

* fix: lint

Signed-off-by: Tommaso Sardelli <[email protected]>

Co-authored-by: Michael Crenshaw <[email protected]>
Signed-off-by: Michael Crenshaw <[email protected]>

* fix: test race (argoproj#9469)

Signed-off-by: Michael Crenshaw <[email protected]>

* chore: lint issues

Signed-off-by: Michael Crenshaw <[email protected]>

* chore: update golangci-lint (argoproj#8988)

* chore: update golangci-lint

Signed-off-by: Michael Crenshaw <[email protected]>

* chore: remove obsolete repo-server unit test (argoproj#9559)

Signed-off-by: Alexander Matyushentsev <[email protected]>

* chore: Make unit tests run on platforms other than amd64 (argoproj#8995)

Signed-off-by: jannfis <[email protected]>

Co-authored-by: Michael Crenshaw <[email protected]>
Signed-off-by: Michael Crenshaw <[email protected]>

* chore: eliminate go-mpatch dependency (argoproj#9045)

* chore: eliminate go-mpatch dependency

Signed-off-by: Michael Crenshaw <[email protected]>

* chore: abstract out resource list function

Signed-off-by: Michael Crenshaw <[email protected]>

* chore: don't exit the program in anything but the main function

Signed-off-by: Michael Crenshaw <[email protected]>

* chore: better error messages

Signed-off-by: Michael Crenshaw <[email protected]>

* chore: better error messages

Signed-off-by: Michael Crenshaw <[email protected]>

* test: directory app manifest generation (argoproj#9503)

* test: directory app manifest generation

Signed-off-by: Michael Crenshaw <[email protected]>

* git doesn't support empty dirs

Signed-off-by: Michael Crenshaw <[email protected]>

* Merge pull request from GHSA-h4w9-6x78-8vrj

Signed-off-by: Michael Crenshaw <[email protected]>

* Merge pull request from GHSA-2m7h-86qq-fp4v

Signed-off-by: Michael Crenshaw <[email protected]>

fix references

Signed-off-by: Michael Crenshaw <[email protected]>

use long enough state param for oauth2

Signed-off-by: Michael Crenshaw <[email protected]>

typo

Signed-off-by: Michael Crenshaw <[email protected]>

more entropy

Signed-off-by: Michael Crenshaw <[email protected]>

fix test

Signed-off-by: Michael Crenshaw <[email protected]>

* Merge pull request from GHSA-q4w5-4gq2-98vm

Signed-off-by: Michael Crenshaw <[email protected]>

* Merge pull request from GHSA-jhqp-vf4w-rpwq

Signed-off-by: Michael Crenshaw <[email protected]>

defer instead of multiple close calls

Signed-off-by: Michael Crenshaw <[email protected]>

oops

Signed-off-by: Michael Crenshaw <[email protected]>

don't count jsonnet against max

Signed-off-by: Michael Crenshaw <[email protected]>

fix codegen

Signed-off-by: Michael Crenshaw <[email protected]>

add caveat about 300x ratio

Signed-off-by: Michael Crenshaw <[email protected]>

fix versions

Signed-off-by: Michael Crenshaw <[email protected]>

fix tests/lint

Signed-off-by: Michael Crenshaw <[email protected]>

* chore: fix docs gen

Signed-off-by: Michael Crenshaw <[email protected]>

* Bump version to 2.3.5

* Bump version to 2.3.5

* docs: Changes for v2.3.5

Documented key decision factors to use Argo CD v2.3.5.

Contributes to: automation-saas/automation-saas/native-AWS#1972

Signed-off-by: Sujeily Fonseca <[email protected]>

Co-authored-by: Yuan Tang <[email protected]>
Co-authored-by: Alexander Matyushentsev <[email protected]>
Co-authored-by: Keith Chong <[email protected]>
Co-authored-by: argo-bot <[email protected]>
Co-authored-by: jannfis <[email protected]>
Co-authored-by: Michael Crenshaw <[email protected]>
Co-authored-by: Ishita Sequeira <[email protected]>
Co-authored-by: pasha-codefresh <[email protected]>
Co-authored-by: Daniel Helfand <[email protected]>
Co-authored-by: Tommaso Sardelli <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@leoluz leoluz leoluz approved these changes

Assignees
No one assigned
Labels
cherry-pick/2.3 Candidate for cherry picking into the 2.3 release branch cherry-pick/2.4 Candidate for cherry picking into the 2.4 release branch
Projects
None yet
Milestone
No milestone
2 participants
@crenshaw-dev @leoluz