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

Use correct registries to integrate with new packages workflows #8538

Merged
merged 1 commit into from
Aug 6, 2024

Conversation

abhay-krishna
Copy link
Member

Use correct registries to integrate with new packages workflows.

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@eks-distro-bot eks-distro-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 26, 2024
Copy link

codecov bot commented Jul 26, 2024

Codecov Report

Attention: Patch coverage is 92.85714% with 2 lines in your changes missing coverage. Please review.

Project coverage is 73.52%. Comparing base (5c7b2b8) to head (8b203ec).

Files Patch % Lines
pkg/curatedpackages/regional_registry.go 60.00% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##             main    #8538   +/-   ##
=======================================
  Coverage   73.52%   73.52%           
=======================================
  Files         578      578           
  Lines       36552    36554    +2     
=======================================
+ Hits        26876    26878    +2     
  Misses       7955     7955           
  Partials     1721     1721           

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

@mitalipaygude
Copy link
Member

Can we add unit tests for these changes? also a section in the description that describes how these changes were tested in general?

@abhay-krishna abhay-krishna changed the base branch from main to df/fix-clusterconfig-docs July 30, 2024 20:15
@eks-distro-bot eks-distro-bot added do-not-merge/invalid-commit-message size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 30, 2024
@eks-distro-bot
Copy link
Collaborator

eks-distro-bot commented Jul 30, 2024

@abhay-krishna: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
eks-anywhere-docs-presubmit 61b3006 link true /test eks-anywhere-docs-presubmit
eks-anywhere-e2e-validate-tinkerbell-hardware-presubmit 61b3006 link true /test eks-anywhere-e2e-validate-tinkerbell-hardware-presubmit
eks-anywhere-cluster-controller-tooling-presubmit 61b3006 link true /test eks-anywhere-cluster-controller-tooling-presubmit
eks-anywhere-release-tooling-presubmit 61b3006 link true /test eks-anywhere-release-tooling-presubmit

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@abhay-krishna abhay-krishna changed the base branch from df/fix-clusterconfig-docs to main July 30, 2024 23:14
@eks-distro-bot eks-distro-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed do-not-merge/invalid-commit-message size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jul 30, 2024
@eks-distro-bot eks-distro-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 31, 2024
@abhay-krishna abhay-krishna force-pushed the packages-registries branch 2 times, most recently from d8246fd to 577815b Compare August 1, 2024 07:11
}
if strings.Contains(pc.chart.Image(), stagingPublicRegistryAlias) {
registry = stagingPublicRegistryAlias
defaultImageRegistry = devRegionalPrivateRegistryURI
Copy link
Member

Choose a reason for hiding this comment

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

Is this not going to be the gamma account?

@sp1999
Copy link
Member

sp1999 commented Aug 5, 2024

/lgtm

if strings.Contains(defaultRegistry, devAccount) {
return devRegionalECR
if strings.Contains(defaultRegistry, devNonRegionalPublicRegistryAlias) {
return devRegionalPrivateRegistryURI
Copy link
Member

Choose a reason for hiding this comment

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

nit: add unit test to cover this line as well

Copy link
Member

@pokearu pokearu left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@eks-distro-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pokearu

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@eks-distro-bot eks-distro-bot merged commit 4bc1f21 into aws:main Aug 6, 2024
12 checks passed
@abhay-krishna
Copy link
Member Author

/cherrypick release-0.20

@eks-distro-pr-bot
Copy link
Contributor

@abhay-krishna: new pull request created: #8571

In response to this:

/cherrypick release-0.20

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@abhay-krishna
Copy link
Member Author

/cherrypick release-0.19

@eks-distro-pr-bot
Copy link
Contributor

@abhay-krishna: #8538 failed to apply on top of branch "release-0.19":

Applying: Use correct registries to integrate with new packages workflows
Using index info to reconstruct a base tree...
M	pkg/curatedpackages/regional_registry.go
M	pkg/docker/registry.go
M	pkg/docker/registry_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/docker/registry_test.go
Auto-merging pkg/docker/registry.go
Auto-merging pkg/curatedpackages/regional_registry.go
CONFLICT (content): Merge conflict in pkg/curatedpackages/regional_registry.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Use correct registries to integrate with new packages workflows
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-0.19

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants