Skip to content

chore: sync all codefresh code changes into v2.14.9#388

Merged
ATGardner merged 46 commits into
sync-2.14.9from
feature/syncing-from-upstream
Apr 20, 2025
Merged

chore: sync all codefresh code changes into v2.14.9#388
ATGardner merged 46 commits into
sync-2.14.9from
feature/syncing-from-upstream

Conversation

@ATGardner
Copy link
Copy Markdown
Collaborator

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.
  • 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.
  • Optional. My organization is added to USERS.md.
  • Optional. For bug fixes, I've indicated what older releases this fix should be cherry-picked into (this may or may not happen depending on risk/complexity).

ATGardner and others added 20 commits April 8, 2025 16:04
Change the branch condition from 'release-*' to 'sync-*' for setting
the IMAGE_TAG based on the VERSION file. This aligns the script's
behavior with the new branching strategy.
- Introduced CfOptions struct to encapsulate application versioning
  and Git client options for manifest generation.
- Updated GenerateManifests function signature to accept CfOptions
  instead of individual parameters.
- Adjusted related function calls and tests to align with the new
  structure, improving code readability and maintainability.
upstream later added `Namespace` which serves the same role.
the helm chart is now explicitly setting it to `false` anyway. so the default value was only used in e2e tests (and making them fail)
- Modify image tag format to include branch name and commit SHA.
- Change repository references from 'argoproj/argo-cd' to 'codefresh-io/argo-cd'.
- Adjust trigger conditions for release workflow to focus on branches.
@ATGardner ATGardner self-assigned this Apr 18, 2025
ci - run on every pr into `sync-*`
release - run on every push to `sync-*`
This reverts commit b35f04f.
@ATGardner ATGardner changed the title Feature/syncing from upstream chore: sync all codefresh code changes into v2.14.9 Apr 18, 2025
Remove commented-out branch checks and ensure IMAGE_TAG is set
to the version from the VERSION file when not explicitly declared.
This change improves consistency in manifest generation.
Update the image tag generation logic to replace slashes in the
GitHub reference with underscores, ensuring consistent and valid
tag formats for the image in the GitHub Container Registry.
Updated the image tag generation logic to clean the reference names
by replacing slashes with underscores. This ensures a more consistent
and predictable tagging format when pushing images to the registry.
the build-only OR build-and-push steps should run. not both.
…pr into them

* every push to sync-* branch should trigger the image.yaml pipeline. it will build an image, tag it vx.y.a-yyyy-mm-ss-git_hash  and push it to `quay.io/codefresh/argocd`
* every push to a branch that has a pull request to sync-* should trigger the image.yaml pipeline. it will build an image, tag it vx.y.z-branch_name-git_sha and push it to `quay.io/codefresh/dev/argocd`
Ensure consistent formatting in the conditional statement for uploading
test results to Codecov in the CI workflow. This change improves
readability without altering functionality.
- Added spaces in the types list for pull_request to enhance readability.
- Standardized comments for permissions in build-and-publish jobs.
Ensure proper formatting of quay_image_name by adding a missing '/'
when the event is a pull request. This change improves the clarity
and correctness of the image name used in the workflow.
Added a 1-second delay before the app sync operation in the
TestGetVirtualProjectMatch test to prevent errors caused by
sync window restrictions. This change ensures that the test
runs smoothly without being blocked by the sync window.
@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 20, 2025

Codecov Report

Attention: Patch coverage is 35.14938% with 2583 lines in your changes missing coverage. Please review.

Please upload report for BASE (sync-2.14.9@38985bd). Learn more about missing BASE report.

Files with missing lines Patch % Lines
...nt_reporter/reporter/application_event_reporter.go 36.10% 252 Missing and 17 partials ⚠️
...-reporter-server/commands/event_reporter_server.go 1.47% 200 Missing ⚠️
server/application/application_rollout_rollback.go 0.00% 159 Missing ⚠️
event_reporter/server.go 0.00% 154 Missing ⚠️
event_reporter/application/client.go 0.00% 127 Missing ⚠️
event_reporter/reporter/event_payload.go 54.54% 103 Missing and 22 partials ⚠️
...commands/application_change_revision_controller.go 2.80% 104 Missing ⚠️
reposerver/repository/repository.go 61.36% 88 Missing and 14 partials ⚠️
acr_controller/server.go 0.00% 97 Missing ⚠️
event_reporter/reporter/broadcaster.go 0.00% 88 Missing ⚠️
... and 42 more
Additional details and impacted files
@@              Coverage Diff               @@
##             sync-2.14.9     #388   +/-   ##
==============================================
  Coverage               ?   53.92%           
==============================================
  Files                  ?      385           
  Lines                  ?    61206           
  Branches               ?        0           
==============================================
  Hits                   ?    33006           
  Misses                 ?    25379           
  Partials               ?     2821           

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Adjust the conditions for uploading test results to Codecov and
executing the SonarQube scan to ensure they only run for the
'sync-*' branches, improving the accuracy of the CI process.
@ATGardner ATGardner merged commit 584fc7f into sync-2.14.9 Apr 20, 2025
23 checks passed
@ATGardner ATGardner deleted the feature/syncing-from-upstream branch April 20, 2025 10:29
ATGardner added a commit that referenced this pull request Apr 20, 2025
squashed all of our code changes from `v2.13.3-2025.3.5-50344f005` into a single change over upstream `v2.14.9`

---------

Co-authored-by: Vadim Gusev <ubuntolog@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