From f527519153bdff366dc8243f1f75b84fb369780d Mon Sep 17 00:00:00 2001 From: Christopher Negus Date: Wed, 27 Sep 2023 15:13:45 +0000 Subject: [PATCH 1/2] Fix airgapped optional docs --- .../getting-started/airgapped/airgap-packages.md | 13 ------------- .../docs/getting-started/airgapped/airgap-steps.md | 14 +++++++++++--- 2 files changed, 11 insertions(+), 16 deletions(-) delete mode 100644 docs/content/en/docs/getting-started/airgapped/airgap-packages.md diff --git a/docs/content/en/docs/getting-started/airgapped/airgap-packages.md b/docs/content/en/docs/getting-started/airgapped/airgap-packages.md deleted file mode 100644 index 5bbf540a4c81..000000000000 --- a/docs/content/en/docs/getting-started/airgapped/airgap-packages.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -toc_hide: true ---- -If you are 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. - -The `$BUNDLE_RELEASE_YAML_PATH` should be set to the `eks-anywhere-downloads/bundle-release.yaml` location where you unpacked the tarball from the`eksctl anywhere download artifacts` command. The `$REGISTRY_MIRROR_CERT_PATH` and `$REGISTRY_MIRROR_URL` values must be the same as the `registryMirrorConfiguration` in your EKS Anywhere cluster specification. - -```bash -eksctl anywhere copy packages \ - --bundle ${BUNDLE_RELEASE_YAML_PATH} \ - --dst-cert ${REGISTRY_MIRROR_CERT_PATH} \ - ${REGISTRY_MIRROR_URL} -``` \ No newline at end of file diff --git a/docs/content/en/docs/getting-started/airgapped/airgap-steps.md b/docs/content/en/docs/getting-started/airgapped/airgap-steps.md index 04e861ef50eb..f9ccd58f8c38 100644 --- a/docs/content/en/docs/getting-started/airgapped/airgap-steps.md +++ b/docs/content/en/docs/getting-started/airgapped/airgap-steps.md @@ -31,6 +31,14 @@ toc_hide: true
Expand for curated packages instructions -
- {{% content "airgap-packages.md" %}} -
\ No newline at end of file + If you are 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. + + The `$BUNDLE_RELEASE_YAML_PATH` should be set to the `eks-anywhere-downloads/bundle-release.yaml` location where you unpacked the tarball from the`eksctl anywhere download artifacts` command. The `$REGISTRY_MIRROR_CERT_PATH` and `$REGISTRY_MIRROR_URL` values must be the same as the `registryMirrorConfiguration` in your EKS Anywhere cluster specification. + + ```bash + eksctl anywhere copy packages \ + --bundle ${BUNDLE_RELEASE_YAML_PATH} \ + --dst-cert ${REGISTRY_MIRROR_CERT_PATH} \ + ${REGISTRY_MIRROR_URL} + ``` + From 343df9100982b9d41816e6cd54327d7f24617f6f Mon Sep 17 00:00:00 2001 From: Christopher Negus Date: Wed, 27 Sep 2023 16:48:43 +0000 Subject: [PATCH 2/2] Copy airgapped-packages content into packages/prereq --- docs/content/en/docs/packages/prereq.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/docs/content/en/docs/packages/prereq.md b/docs/content/en/docs/packages/prereq.md index 09a53596a8e5..b3a60445620c 100644 --- a/docs/content/en/docs/packages/prereq.md +++ b/docs/content/en/docs/packages/prereq.md @@ -118,7 +118,16 @@ If the image downloads successfully, it worked! ### Prepare for using curated packages for airgapped environments -{{% content "../getting-started/airgapped/airgap-packages.md" %}} +If you are 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. + +The `$BUNDLE_RELEASE_YAML_PATH` should be set to the `eks-anywhere-downloads/bundle-release.yaml` location where you unpacked the tarball from the`eksctl anywhere download artifacts` command. The `$REGISTRY_MIRROR_CERT_PATH` and `$REGISTRY_MIRROR_URL` values must be the same as the `registryMirrorConfiguration` in your EKS Anywhere cluster specification. + +```bash +eksctl anywhere copy packages \ + --bundle ${BUNDLE_RELEASE_YAML_PATH} \ + --dst-cert ${REGISTRY_MIRROR_CERT_PATH} \ + ${REGISTRY_MIRROR_URL} +``` Once the curated packages images are in your local registry mirror, you must configure the curated packages controller to use your local registry mirror post-cluster creation. Configure the `defaultImageRegistry` and `defaultRegistry` settings for the `PackageBundleController` to point to your local registry mirror by applying a similar `yaml` definition as the one below to your standalone or management cluster. Existing `PackageBundleController` can be changed, and you do not need to deploy a new `PackageBundleController`. See the [Packages configuration documentation]({{< relref "./packages/#packagebundlecontrollerspec" >}}) for more information.