From 5bf200d0ded1b3d849574611d956159138913316 Mon Sep 17 00:00:00 2001 From: Jean-Fabrice Bobo <2949987+jeanfabrice@users.noreply.github.com> Date: Fri, 14 Jul 2023 00:23:59 +0200 Subject: [PATCH 1/8] Update air-gapped.asciidoc Add a chapter how to run the ECK operator itself in an air-gapped environment --- docs/operating-eck/air-gapped.asciidoc | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/docs/operating-eck/air-gapped.asciidoc b/docs/operating-eck/air-gapped.asciidoc index 726df73637..b45f7ad2a2 100644 --- a/docs/operating-eck/air-gapped.asciidoc +++ b/docs/operating-eck/air-gapped.asciidoc @@ -33,6 +33,23 @@ To make use of your mirrored images you can either set the image for each applic +[float] +[id="{p}-use-internal-operator-image"] +== Use an internal image of the ECK operator + +To deploy the ECK operator in an air-gapped environment, you first have to mirror the operator image itself from `docker.elastic.co` to a private container registry, for example `my-registry`. + +Once the ECK operator image has been copied, you have to replace the original image name `docker.elastic.co/eck/eck-operator:{eck_version}` with the private name of the image, for example `my-registry/eck/eck-operator:{eck_version}`, in the <<{p}-install-yaml-manifests,operator manifests>>. When using <<{p}-install-helm,Helm charts>>, you have to replace the `image.repository` Helm value with, for example, `my-registry/eck/eck-operator`. + +Container registry vendors generally offer native solutions to mirror container images internally. As an alternative, you can use a Docker client which has access to both the public `docker.elastic.co` registry and to the private container registry as follows: + +[source,sh] +---- +docker pull docker.elastic.co/eck/eck-operator:{eck_version} +docker tag docker.elastic.co/eck/eck-operator:{eck_version} my-registry/eck/eck-operator:{eck_version} +docker push my-registry/eck/eck-operator:{eck_version} +---- + [float] [id="{p}-container-registry-override"] == Override the default container registry From c7c22000d92bf03b0d23c5c2979656eedaf3f4eb Mon Sep 17 00:00:00 2001 From: Jean-Fabrice Bobo Date: Sat, 15 Jul 2023 08:14:22 +0200 Subject: [PATCH 2/8] Don't suggest an example with docker commands --- docs/operating-eck/air-gapped.asciidoc | 9 --------- 1 file changed, 9 deletions(-) diff --git a/docs/operating-eck/air-gapped.asciidoc b/docs/operating-eck/air-gapped.asciidoc index b45f7ad2a2..6431f2b537 100644 --- a/docs/operating-eck/air-gapped.asciidoc +++ b/docs/operating-eck/air-gapped.asciidoc @@ -41,15 +41,6 @@ To deploy the ECK operator in an air-gapped environment, you first have to mirro Once the ECK operator image has been copied, you have to replace the original image name `docker.elastic.co/eck/eck-operator:{eck_version}` with the private name of the image, for example `my-registry/eck/eck-operator:{eck_version}`, in the <<{p}-install-yaml-manifests,operator manifests>>. When using <<{p}-install-helm,Helm charts>>, you have to replace the `image.repository` Helm value with, for example, `my-registry/eck/eck-operator`. -Container registry vendors generally offer native solutions to mirror container images internally. As an alternative, you can use a Docker client which has access to both the public `docker.elastic.co` registry and to the private container registry as follows: - -[source,sh] ----- -docker pull docker.elastic.co/eck/eck-operator:{eck_version} -docker tag docker.elastic.co/eck/eck-operator:{eck_version} my-registry/eck/eck-operator:{eck_version} -docker push my-registry/eck/eck-operator:{eck_version} ----- - [float] [id="{p}-container-registry-override"] == Override the default container registry From 73034eedcd6213e30f68ee8eafb3d49977831fe8 Mon Sep 17 00:00:00 2001 From: Jean-Fabrice Bobo Date: Sat, 15 Jul 2023 13:17:23 +0200 Subject: [PATCH 3/8] fix attributes in monospace --- docs/operating-eck/air-gapped.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/operating-eck/air-gapped.asciidoc b/docs/operating-eck/air-gapped.asciidoc index 6431f2b537..a0130c3b7b 100644 --- a/docs/operating-eck/air-gapped.asciidoc +++ b/docs/operating-eck/air-gapped.asciidoc @@ -39,7 +39,7 @@ To make use of your mirrored images you can either set the image for each applic To deploy the ECK operator in an air-gapped environment, you first have to mirror the operator image itself from `docker.elastic.co` to a private container registry, for example `my-registry`. -Once the ECK operator image has been copied, you have to replace the original image name `docker.elastic.co/eck/eck-operator:{eck_version}` with the private name of the image, for example `my-registry/eck/eck-operator:{eck_version}`, in the <<{p}-install-yaml-manifests,operator manifests>>. When using <<{p}-install-helm,Helm charts>>, you have to replace the `image.repository` Helm value with, for example, `my-registry/eck/eck-operator`. +Once the ECK operator image has been copied, you have to replace the original image name +docker.elastic.co/eck/eck-operator:{eck_version}+ with the private name of the image, for example +my-registry/eck/eck-operator:{eck_version}+, in the <<{p}-install-yaml-manifests,operator manifests>>. When using <<{p}-install-helm,Helm charts>>, you have to replace the `image.repository` Helm value with, for example, `my-registry/eck/eck-operator`. [float] [id="{p}-container-registry-override"] From 716117393913e329aa8cc200e110ef4e2e8c09eb Mon Sep 17 00:00:00 2001 From: Jean-Fabrice Bobo Date: Sat, 15 Jul 2023 13:19:27 +0200 Subject: [PATCH 4/8] Reword --- docs/operating-eck/air-gapped.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/operating-eck/air-gapped.asciidoc b/docs/operating-eck/air-gapped.asciidoc index a0130c3b7b..6a0f532c33 100644 --- a/docs/operating-eck/air-gapped.asciidoc +++ b/docs/operating-eck/air-gapped.asciidoc @@ -39,7 +39,7 @@ To make use of your mirrored images you can either set the image for each applic To deploy the ECK operator in an air-gapped environment, you first have to mirror the operator image itself from `docker.elastic.co` to a private container registry, for example `my-registry`. -Once the ECK operator image has been copied, you have to replace the original image name +docker.elastic.co/eck/eck-operator:{eck_version}+ with the private name of the image, for example +my-registry/eck/eck-operator:{eck_version}+, in the <<{p}-install-yaml-manifests,operator manifests>>. When using <<{p}-install-helm,Helm charts>>, you have to replace the `image.repository` Helm value with, for example, `my-registry/eck/eck-operator`. +Once the ECK operator image is copied internally, replace the original image name +docker.elastic.co/eck/eck-operator:{eck_version}+ with the private name of the image, for example +my-registry/eck/eck-operator:{eck_version}+, in the <<{p}-install-yaml-manifests,operator manifests>>. When using <<{p}-install-helm,Helm charts>>, you have to replace the `image.repository` Helm value with, for example, `my-registry/eck/eck-operator`. [float] [id="{p}-container-registry-override"] From 2ec111ed4130a3e9351390830bff6bd8dea3fd92 Mon Sep 17 00:00:00 2001 From: Jean-Fabrice Bobo Date: Sat, 15 Jul 2023 13:20:43 +0200 Subject: [PATCH 5/8] Reword --- docs/operating-eck/air-gapped.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/operating-eck/air-gapped.asciidoc b/docs/operating-eck/air-gapped.asciidoc index 6a0f532c33..c1f9648b20 100644 --- a/docs/operating-eck/air-gapped.asciidoc +++ b/docs/operating-eck/air-gapped.asciidoc @@ -39,7 +39,7 @@ To make use of your mirrored images you can either set the image for each applic To deploy the ECK operator in an air-gapped environment, you first have to mirror the operator image itself from `docker.elastic.co` to a private container registry, for example `my-registry`. -Once the ECK operator image is copied internally, replace the original image name +docker.elastic.co/eck/eck-operator:{eck_version}+ with the private name of the image, for example +my-registry/eck/eck-operator:{eck_version}+, in the <<{p}-install-yaml-manifests,operator manifests>>. When using <<{p}-install-helm,Helm charts>>, you have to replace the `image.repository` Helm value with, for example, `my-registry/eck/eck-operator`. +Once the ECK operator image is copied internally, replace the original image name +docker.elastic.co/eck/eck-operator:{eck_version}+ with the private name of the image, for example +my-registry/eck/eck-operator:{eck_version}+, in the <<{p}-install-yaml-manifests,operator manifests>>. When using <<{p}-install-helm,Helm charts>>, replace the `image.repository` Helm value with, for example, `my-registry/eck/eck-operator`. [float] [id="{p}-container-registry-override"] From 256b6b0d1d7e820c79a501c91198310c658ea867 Mon Sep 17 00:00:00 2001 From: Jean-Fabrice Bobo <2949987+jeanfabrice@users.noreply.github.com> Date: Wed, 19 Jul 2023 08:43:56 +0200 Subject: [PATCH 6/8] typo Co-authored-by: Peter Brachwitz --- docs/operating-eck/air-gapped.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/operating-eck/air-gapped.asciidoc b/docs/operating-eck/air-gapped.asciidoc index c1f9648b20..ea24234381 100644 --- a/docs/operating-eck/air-gapped.asciidoc +++ b/docs/operating-eck/air-gapped.asciidoc @@ -37,7 +37,7 @@ To make use of your mirrored images you can either set the image for each applic [id="{p}-use-internal-operator-image"] == Use an internal image of the ECK operator -To deploy the ECK operator in an air-gapped environment, you first have to mirror the operator image itself from `docker.elastic.co` to a private container registry, for example `my-registry`. +To deploy the ECK operator in an air-gapped environment, you first have to mirror the operator image itself from `docker.elastic.co` to a private container registry, for example `my.registry`. Once the ECK operator image is copied internally, replace the original image name +docker.elastic.co/eck/eck-operator:{eck_version}+ with the private name of the image, for example +my-registry/eck/eck-operator:{eck_version}+, in the <<{p}-install-yaml-manifests,operator manifests>>. When using <<{p}-install-helm,Helm charts>>, replace the `image.repository` Helm value with, for example, `my-registry/eck/eck-operator`. From 73890f3e65d88e6d8d257c51ef5a156541872570 Mon Sep 17 00:00:00 2001 From: Jean-Fabrice Bobo Date: Wed, 19 Jul 2023 08:47:32 +0200 Subject: [PATCH 7/8] less ambiguous qualifier --- docs/operating-eck/air-gapped.asciidoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/operating-eck/air-gapped.asciidoc b/docs/operating-eck/air-gapped.asciidoc index ea24234381..2a0e000ee9 100644 --- a/docs/operating-eck/air-gapped.asciidoc +++ b/docs/operating-eck/air-gapped.asciidoc @@ -34,8 +34,8 @@ To make use of your mirrored images you can either set the image for each applic [float] -[id="{p}-use-internal-operator-image"] -== Use an internal image of the ECK operator +[id="{p}-use-mirrored-operator-image"] +== Use a mirrored image of the ECK operator To deploy the ECK operator in an air-gapped environment, you first have to mirror the operator image itself from `docker.elastic.co` to a private container registry, for example `my.registry`. From 97d8363f06a7dded804346d47a81f475829e7568 Mon Sep 17 00:00:00 2001 From: Peter Brachwitz Date: Wed, 19 Jul 2023 18:00:03 +0200 Subject: [PATCH 8/8] replace other occurrences of my-registry --- docs/operating-eck/air-gapped.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/operating-eck/air-gapped.asciidoc b/docs/operating-eck/air-gapped.asciidoc index 2a0e000ee9..03fdbf52e1 100644 --- a/docs/operating-eck/air-gapped.asciidoc +++ b/docs/operating-eck/air-gapped.asciidoc @@ -39,7 +39,7 @@ To make use of your mirrored images you can either set the image for each applic To deploy the ECK operator in an air-gapped environment, you first have to mirror the operator image itself from `docker.elastic.co` to a private container registry, for example `my.registry`. -Once the ECK operator image is copied internally, replace the original image name +docker.elastic.co/eck/eck-operator:{eck_version}+ with the private name of the image, for example +my-registry/eck/eck-operator:{eck_version}+, in the <<{p}-install-yaml-manifests,operator manifests>>. When using <<{p}-install-helm,Helm charts>>, replace the `image.repository` Helm value with, for example, `my-registry/eck/eck-operator`. +Once the ECK operator image is copied internally, replace the original image name +docker.elastic.co/eck/eck-operator:{eck_version}+ with the private name of the image, for example +my.registry/eck/eck-operator:{eck_version}+, in the <<{p}-install-yaml-manifests,operator manifests>>. When using <<{p}-install-helm,Helm charts>>, replace the `image.repository` Helm value with, for example, `my.registry/eck/eck-operator`. [float] [id="{p}-container-registry-override"]