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

chore: k8s client 0.26 #15571

Closed
wants to merge 13 commits into from
Closed

Conversation

blakepettersson
Copy link
Member

@blakepettersson blakepettersson commented Sep 19, 2023

This is based on #13965, which this time hopefully has been updated
and merged correctly to a currentish version of argo-cd.

The main difference here is that the gitops version is based upon
argoproj/gitops-engine#537, which should maintain pre-existing
labels and annotations.

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).
  • The title of the PR conforms to the Toolchain Guide
  • 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).
  • My new feature complies with the feature status guidelines.
  • I have added a brief description of why this PR is necessary and/or what this PR solves.

fengshunli and others added 8 commits June 11, 2023 00:52
Signed-off-by: fengshunli <1171313930@qq.com>
Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>

# Conflicts:
#	applicationset/controllers/applicationset_controller.go
#	applicationset/controllers/applicationset_controller_test.go
#	docs/operator-manual/server-commands/argocd-server.md
#	docs/operator-manual/upgrading/2.7-2.8.md
#	docs/user-guide/sync-options.md
#	go.mod
#	go.sum
This is based on argoproj#13965, which this time hopefully has been updated
and merged correctly to a currentish version of argo-cd.

The main difference here is that the gitops version is based upon
argoproj/gitops-engine#537, which should maintain pre-existing
labels and annotations.

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>
Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>
This should work exactly the same as before.

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>
Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>
Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>
Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>
@codecov
Copy link

codecov bot commented Sep 19, 2023

Codecov Report

Patch coverage: 46.34% and project coverage change: -0.05% ⚠️

Comparison is base (ae47e05) 50.03% compared to head (858dd26) 49.99%.
Report is 3 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #15571      +/-   ##
==========================================
- Coverage   50.03%   49.99%   -0.05%     
==========================================
  Files         266      266              
  Lines       45681    45754      +73     
==========================================
+ Hits        22857    22874      +17     
- Misses      20590    20634      +44     
- Partials     2234     2246      +12     
Files Changed Coverage Δ
applicationset/utils/clusterUtils.go 68.33% <0.00%> (ø)
cmd/argocd/commands/admin/cluster.go 0.00% <0.00%> (ø)
cmd/util/project.go 12.14% <0.00%> (ø)
server/application/terminal.go 12.38% <0.00%> (ø)
util/db/cluster.go 59.87% <0.00%> (ø)
util/db/helmrepository.go 0.00% <0.00%> (ø)
util/db/secrets.go 78.99% <25.00%> (-2.21%) ⬇️
util/rbac/rbac.go 78.77% <25.00%> (-0.77%) ⬇️
util/settings/settings.go 49.63% <25.00%> (-0.48%) ⬇️
...cationset/controllers/applicationset_controller.go 62.05% <38.46%> (+0.46%) ⬆️
... and 5 more

... and 3 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>
Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>
Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>
Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>
This reverts commit 99a56ea.

Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>
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.

2 participants