Refactor copy packages command to support regional ECR #6747

d8660091 · 2023-09-29T17:08:54Z

Issue #, if available:

Description of changes:

no more dependency on running docker containers
support for regional curated packages

Testing (if applicable):

Manually tested copy packages from regional ECR to local registry
Manually tested copy packages from global ECRs to local registry
Manually tested copy packages from global ECRs to regional ECR

Documentation added/planned (if applicable):

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

codecov · 2023-09-29T17:19:50Z

Codecov Report

Attention: 114 lines in your changes are missing coverage. Please review.

Comparison is base (c6ff83b) 75.66% compared to head (c45e857) 71.68%.
Report is 6 commits behind head on main.

❗ Current head c45e857 differs from pull request most recent head c2b44bf. Consider uploading reports for the commit c2b44bf to get more accurate results

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #6747      +/-   ##
==========================================
- Coverage   75.66%   71.68%   -3.99%     
==========================================
  Files         475      531      +56     
  Lines       38404    41051    +2647     
==========================================
+ Hits        29059    29427     +368     
- Misses       7733     9978    +2245     
- Partials     1612     1646      +34

Files	Coverage Δ
cmd/eksctl-anywhere/cmd/copypackages.go	`22.09% <18.57%> (ø)`

... and 56 files with indirect coverage changes

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

d8660091 · 2023-09-29T18:51:24Z

/retest

chrisnegus

I left a few comments.

chrisnegus · 2023-10-02T16:26:53Z

docs/content/en/docs/getting-started/airgapped/airgap-steps.md

-     --dst-cert ${REGISTRY_MIRROR_CERT_PATH} \
-     ${REGISTRY_MIRROR_URL}
-   ```
+      If your EKSA cluster is running in an airgapped environment and you set up a local registry mirror, you can copy curated packages from Amazon ECR to your local registry mirror with the following command. 


Suggested change

If your EKSA cluster is running in an airgapped environment and you set up a local registry mirror, you can copy curated packages from Amazon ECR to your local registry mirror with the following command.

If your EKS Anywhere cluster is running in an airgapped environment and you set up a local registry mirror, you can copy curated packages from Amazon ECR to your local registry mirror with the following command.

docs/content/en/docs/getting-started/airgapped/airgap-steps.md

chrisnegus · 2023-10-02T18:45:05Z

docs/content/en/docs/getting-started/airgapped/airgap-steps.md

-   ```
+      If your EKSA cluster is running in an airgapped environment and you set up a local registry mirror, you can copy curated packages from Amazon ECR to your local registry mirror with the following command. 
+
+      `$KUBEVERSION` must equals to the `spec.kubernetesVersion` of your EKS Anywhere cluster specification.


Suggested change

`$KUBEVERSION` must equals to the `spec.kubernetesVersion` of your EKS Anywhere cluster specification.

`$KUBEVERSION` be must equal to the `spec.kubernetesVersion` of your EKS Anywhere cluster specification.

chrisnegus · 2023-10-02T18:46:10Z

docs/content/en/docs/reference/eksctl/anywhere_copy.md

@@ -26,5 +26,5 @@ Copy EKS Anywhere resources and artifacts
 ### SEE ALSO

 * [anywhere](../anywhere/)	 - Amazon EKS Anywhere
-* [anywhere copy packages](../anywhere_copy_packages/)	 - Copy curated package images and charts from a source to a destination
+* [anywhere copy packages](../anywhere_copy_packages/)	 - Copy curated package images and charts from source regisries to a destination registry


Suggested change

* [anywhere copy packages](../anywhere_copy_packages/) - Copy curated package images and charts from source regisries to a destination registry

* [anywhere copy packages](../anywhere_copy_packages/) - Copy curated package images and charts from source registries to a destination registry

chrisnegus · 2023-10-02T18:46:27Z

docs/content/en/docs/reference/eksctl/anywhere_copy_packages.md

@@ -5,11 +5,11 @@ linkTitle: "anywhere copy packages"

 ## anywhere copy packages

-Copy curated package images and charts from a source to a destination
+Copy curated package images and charts from source regisries to a destination registry


Suggested change

Copy curated package images and charts from source regisries to a destination registry

Copy curated package images and charts from source registries to a destination registry

chrisnegus · 2023-10-02T18:47:51Z

docs/content/en/docs/reference/eksctl/anywhere_copy_packages.md

-  -h, --help                help for packages
-      --insecure            Skip TLS verification while copying images and charts
-      --src-cert string     TLS certificate for source registry
+      --dry-run                     Dry run will not really copy the artifacts, but shows what artifacts would be copied


Suggested change

--dry-run Dry run will not really copy the artifacts, but shows what artifacts would be copied

--dry-run Dry run will show what artifacts would be copied, but not actually copy them

chrisnegus · 2023-10-02T18:48:44Z

docs/content/en/docs/reference/eksctl/anywhere_copy_packages.md

-      --src-cert string     TLS certificate for source registry
+      --dry-run                     Dry run will not really copy the artifacts, but shows what artifacts would be copied
+      --dst-insecure                Skip TLS verification against the destination registry
+      --dst-plain-http              Whether to use plain http for destination registry


Suggested change

--dst-plain-http Whether to use plain http for destination registry

--dst-plain-http Whether or not to use plain http for destination registry

Is the alternative https?

chrisnegus · 2023-10-02T18:49:02Z

docs/content/en/docs/reference/eksctl/anywhere_copy_packages.md

+      --dst-insecure                Skip TLS verification against the destination registry
+      --dst-plain-http              Whether to use plain http for destination registry
+  -h, --help                        help for packages
+      --kube-version string         The kube version of the package bundle to copy


Suggested change

--kube-version string The kube version of the package bundle to copy

--kube-version string The Kubernetes version of the package bundle to copy

docs/content/en/docs/getting-started/airgapped/airgap-steps.md

jonathanmeier5

Generally lgtm, I think it's fine to refactor for testing later.

jonathanmeier5 · 2023-10-03T17:28:20Z

cmd/eksctl-anywhere/cmd/copypackages.go

 }

-// Since package bundle doesn't contain tags, we get tags from chart values.
 func getTagsFromCharts(ctx context.Context, helm *executables.Helm, charts []registry.Artifact) (map[string]string, error) {


Is this used any more? Should we remove it?

Good catch, removed

eks-distro-bot · 2023-10-03T17:52:23Z

New changes are detected. LGTM label has been removed.

d8660091 · 2023-10-03T19:10:19Z

/approve

eks-distro-bot · 2023-10-03T19:10:23Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: d8660091

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:

~~OWNERS~~ [d8660091]

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

github-actions bot added area/docs Documentation documentation labels Sep 29, 2023

eks-distro-bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Sep 29, 2023

d8660091 force-pushed the refactor-cp-package branch from fa4a0d4 to 8da5e4b Compare September 29, 2023 18:15

eks-distro-bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 29, 2023

d8660091 force-pushed the refactor-cp-package branch 2 times, most recently from 9c00867 to c45e857 Compare September 29, 2023 18:35

eks-distro-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Sep 29, 2023

chrisnegus reviewed Oct 2, 2023

View reviewed changes

chrisnegus reviewed Oct 3, 2023

View reviewed changes

docs/content/en/docs/getting-started/airgapped/airgap-steps.md Outdated Show resolved Hide resolved

jonathanmeier5 approved these changes Oct 3, 2023

View reviewed changes

eks-distro-bot assigned jonathanmeier5 Oct 3, 2023

eks-distro-bot added the lgtm label Oct 3, 2023

Refactor copy packages command to support regional ECR

c2b44bf

d8660091 force-pushed the refactor-cp-package branch from c45e857 to c2b44bf Compare October 3, 2023 17:52

eks-distro-bot removed the lgtm label Oct 3, 2023

eks-distro-bot added the approved label Oct 3, 2023

d8660091 added lgtm approved and removed approved labels Oct 3, 2023

eks-distro-bot merged commit 45aaee6 into aws:main Oct 3, 2023
3 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor copy packages command to support regional ECR #6747

Refactor copy packages command to support regional ECR #6747

d8660091 commented Sep 29, 2023 •

edited

Loading

codecov bot commented Sep 29, 2023 •

edited

Loading

d8660091 commented Sep 29, 2023

chrisnegus left a comment

chrisnegus Oct 2, 2023

chrisnegus Oct 2, 2023

chrisnegus Oct 2, 2023

chrisnegus Oct 2, 2023

chrisnegus Oct 2, 2023

chrisnegus Oct 2, 2023

chrisnegus Oct 2, 2023

jonathanmeier5 left a comment

jonathanmeier5 Oct 3, 2023

d8660091 Oct 3, 2023

eks-distro-bot commented Oct 3, 2023

d8660091 commented Oct 3, 2023

eks-distro-bot commented Oct 3, 2023

	If your EKSA cluster is running in an airgapped environment and you set up a local registry mirror, you can copy curated packages from Amazon ECR to your local registry mirror with the following command.
	If your EKS Anywhere cluster is running in an airgapped environment and you set up a local registry mirror, you can copy curated packages from Amazon ECR to your local registry mirror with the following command.

	`$KUBEVERSION` must equals to the `spec.kubernetesVersion` of your EKS Anywhere cluster specification.
	`$KUBEVERSION` be must equal to the `spec.kubernetesVersion` of your EKS Anywhere cluster specification.

	* [anywhere copy packages](../anywhere_copy_packages/) - Copy curated package images and charts from source regisries to a destination registry
	* [anywhere copy packages](../anywhere_copy_packages/) - Copy curated package images and charts from source registries to a destination registry

	Copy curated package images and charts from source regisries to a destination registry
	Copy curated package images and charts from source registries to a destination registry

	--dry-run Dry run will not really copy the artifacts, but shows what artifacts would be copied
	--dry-run Dry run will show what artifacts would be copied, but not actually copy them

	--dst-plain-http Whether to use plain http for destination registry
	--dst-plain-http Whether or not to use plain http for destination registry

	--kube-version string The kube version of the package bundle to copy
	--kube-version string The Kubernetes version of the package bundle to copy

Refactor copy packages command to support regional ECR #6747

Refactor copy packages command to support regional ECR #6747

Conversation

d8660091 commented Sep 29, 2023 • edited Loading

codecov bot commented Sep 29, 2023 • edited Loading

Codecov Report

d8660091 commented Sep 29, 2023

chrisnegus left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jonathanmeier5 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eks-distro-bot commented Oct 3, 2023

d8660091 commented Oct 3, 2023

eks-distro-bot commented Oct 3, 2023

d8660091 commented Sep 29, 2023 •

edited

Loading

codecov bot commented Sep 29, 2023 •

edited

Loading