Fixes

Signed-off-by: Anatolii Bazko <[email protected]>
eclipse-che · Apr 9, 2024 · 6692dba · 6692dba
1 parent 5171849
commit 6692dba
Show file tree

Hide file tree

Showing 10 changed files with 112 additions and 122 deletions.
diff --git a/modules/administration-guide/examples/snip_che-cloning-image-puller-project.adoc b/modules/administration-guide/examples/snip_che-cloning-image-puller-project.adoc
diff --git a/modules/administration-guide/nav.adoc b/modules/administration-guide/nav.adoc
@@ -45,10 +45,10 @@
 *** xref:configuring-the-open-vsx-registry-url.adoc[]
 *** xref:configuring-a-user-namespace.adoc[]
 ** xref:caching-images-for-faster-workspace-start.adoc[]
-*** xref:installing-image-puller-by-using-cli.adoc[]
-*** xref:installing-image-puller-on-openshift-using-the-web-console.adoc[]
+*** xref:installing-image-puller-on-kubernetes-by-using-cli.adoc[]
+*** xref:installing-image-puller-on-openshift-by-using-the-web-console.adoc[]
 *** xref:configuring-image-puller-to-pre-pull-default-che-images.adoc[]
-*** xref:configuring-image-puller-to-override-default-che-images.adoc[]
+*** xref:configuring-image-puller-to-pre-pull-custom-images.adoc[]
 *** xref:configuring-image-puller-to-pre-pull-additional-images.adoc[]
 ** xref:configuring-observability.adoc[]
 **** xref:the-woopra-telemetry-plugin.adoc[]

diff --git a/modules/administration-guide/pages/caching-images-for-faster-workspace-start.adoc b/modules/administration-guide/pages/caching-images-for-faster-workspace-start.adoc
@@ -10,19 +10,21 @@
 
 To improve the start time performance of {prod-short} workspaces,
 use the {image-puller-name-short}, a {prod-short}-agnostic component that can be used
-to pre-pull images for {platforms-name} clusters. The {image-puller-name-short} is an
+to pre-pull images for {platforms-name} clusters.
+
+The {image-puller-name-short} is an
 additional {platforms-name} deployment which creates a _DaemonSet_ that can be
 configured to pre-pull relevant {prod-short} workspace images on each node.
 These images would already be available when a {prod-short} workspace starts,
 therefore improving the workspace start time.
 
-* xref:installing-image-puller-by-using-cli.adoc[]
+* xref:installing-image-puller-on-kubernetes-by-using-cli.adoc[]
 
-* xref:installing-image-puller-on-openshift-using-the-web-console.adoc[]
+* xref:installing-image-puller-on-openshift-by-using-the-web-console.adoc[]
 
 * xref:configuring-image-puller-to-pre-pull-default-che-images.adoc[]
 
-* xref:configuring-image-puller-to-override-default-che-images.adoc[]
+* xref:configuring-image-puller-to-pre-pull-custom-images.adoc[]
 
 * xref:configuring-image-puller-to-pre-pull-additional-images.adoc[]
 

diff --git a/...ration-guide/pages/configuring-image-puller-to-override-default-che-images.adoc b/...ration-guide/pages/configuring-image-puller-to-override-default-che-images.adoc
diff --git a/...tration-guide/pages/configuring-image-puller-to-pre-pull-additional-images.adoc b/...tration-guide/pages/configuring-image-puller-to-pre-pull-additional-images.adoc
@@ -7,9 +7,7 @@
 [id="configuring-image-puller-to-pre-pull-additional-images"]
 = Configuring {image-puller-name-short} to pre-pull additional images
 
-You can configure {image-puller-name} to pre-pull {prod-short} images.
-{prod} operator will control the list of images to pre-pull and automatically updates them
-on {prod-short} upgrade.
+You can configure {image-puller-name} to pre-pull additional {prod-short} images.
 
 .Prerequisites
 
@@ -21,20 +19,32 @@ on {prod-short} upgrade.
 
 .Procedure
 
-. Configure the {image-puller-name-short} to pre-pull {prod-short} images.
+. Create `{image-puller-namespace}` namespace:
 +
 [source,shell,subs="+attributes,"]
 ----
-{orch-cli} patch checluster/{prod-checluster} \
-    --namespace {prod-namespace} \
-    --type='merge' \
-    --patch '{
-                "spec": {
-                    "components": {
-                        "imagePuller": {
-                            "enable": true,
-                        }
-                    }
-                }
-            }'
-----
+{orch-cli} create namespace {image-puller-namespace}
+----
+
+. Create `{image-puller-cr-name}` Custom Resource:
++
+[source,shell,subs="+attributes,"]
+----
+{orch-cli} apply -f - <<EOF
+apiVersion: che.eclipse.org/v1alpha1
+kind: KubernetesImagePuller
+metadata:
+  name: k8s-image-puller-images
+  namespace: {image-puller-namespace}
+spec:
+  images: "__NAME-1__=__IMAGE-1__;__NAME-2__=__IMAGE-2__" <1>
+EOF
+----
+<1> The semicolon separated list of images
+
+.Addition resources
+
+* https://github.com/che-incubator/kubernetes-image-puller[{image-puller-name} source code repository]
+
+* https://github.com/che-incubator/kubernetes-image-puller-operator[{image-puller-operator-name} source code repository]
+
diff --git a/...inistration-guide/pages/configuring-image-puller-to-pre-pull-custom-images.adoc b/...inistration-guide/pages/configuring-image-puller-to-pre-pull-custom-images.adoc
@@ -0,0 +1,42 @@
+:_content-type: PROCEDURE
+:description: Configuring {image-puller-name-short} to pre-pull custom images
+:keywords: administration-guide, image-puller, CLI
+:navtitle: You can configure {image-puller-name} to pre-pull custom images
+:page-aliases:
+
+[id="configuring-image-puller-to-pre-pull-custom-images"]
+= Configuring {image-puller-name-short} to pre-pull custom images
+
+You can configure {image-puller-name} to pre-pull custom images.
+
+.Prerequisites
+
+* Your organization's instance of {prod-short} is installed and running on {kubernetes} cluster.
+
+* {image-puller-name-short} is installed on {kubernetes} cluster.
+
+* An active `{orch-cli}` session with administrative permissions to the destination {orch-name} cluster. See {orch-cli-link}.
+
+.Procedure
+
+. Configure the {image-puller-name-short} to pre-pull custom images.
++
+[source,shell,subs="+attributes,+quotes"]
+----
+{orch-cli} patch checluster/{prod-checluster} \
+    --namespace {prod-namespace} \
+    --type='merge' \
+    --patch '{
+              "spec": {
+                "components": {
+                  "imagePuller": {
+                    "enable": true,
+                    "spec": {
+                      "images": "__NAME-1__=__IMAGE-1__;__NAME-2__=__IMAGE-2__" <1>
+                    }
+                  }
+                }
+              }
+            }'
+----
+<1> The semicolon separated list of images
diff --git a/...ration-guide/pages/configuring-image-puller-to-pre-pull-default-che-images.adoc b/...ration-guide/pages/configuring-image-puller-to-pre-pull-default-che-images.adoc
@@ -29,12 +29,12 @@ on {prod-short} upgrade.
     --namespace {prod-namespace} \
     --type='merge' \
     --patch '{
-                "spec": {
-                    "components": {
-                        "imagePuller": {
-                            "enable": true,
-                        }
-                    }
+              "spec": {
+                "components": {
+                  "imagePuller": {
+                    "enable": true
+                  }
                 }
+              }
             }'
 ----
diff --git a/modules/administration-guide/pages/installing-image-puller-by-using-cli.adoc b/modules/administration-guide/pages/installing-image-puller-by-using-cli.adoc
diff --git a/...inistration-guide/pages/installing-image-puller-on-kubernetes-by-using-cli.adoc b/...inistration-guide/pages/installing-image-puller-on-kubernetes-by-using-cli.adoc
@@ -0,0 +1,24 @@
+:_content-type: PROCEDURE
+:description: Installing the {image-puller-name} operator on {kubernetes} cluster by using CLI
+:keywords: administration-guide, image-puller, operator, CLI
+:navtitle: Installing the {image-puller-name} operator on {kubernetes} cluster by using CLI
+:page-aliases: .:installing-image-puller-on-openshift-using-openshift-templates.adoc,installing-image-puller-on-openshift-using-openshift-templates.adoc
+
+[id="installing-image-puller-on-kubernetes-cluster-by-using-the-cli"]
+= Installing {image-puller-name-short} operator on {kubernetes} cluster by using CLI
+
+You can install the {image-puller-name} operator on {kubernetes} cluster by using CLI.
+
+.Prerequisites
+
+* An active `{orch-cli}` session with administrative permissions to the destination {orch-name} cluster. See {orch-cli-link}.
+
+.Procedure
+
+. Visit link:https://operatorhub.io/operator/kubernetes-imagepuller-operator[{image-puller-operator-name}] page.
+
+. Click the `Install` button and follow the instruction.
+
+.Addition resources
+
+* https://github.com/che-incubator/kubernetes-image-puller-operator[{image-puller-operator-name} source code repository]
diff --git a/...r-on-openshift-using-the-web-console.adoc → ...n-openshift-by-using-the-web-console.adoc b/...r-on-openshift-using-the-web-console.adoc → ...n-openshift-by-using-the-web-console.adoc
@@ -1,13 +1,13 @@
 :_content-type: PROCEDURE
-:description: Installing {image-puller-name-short} on OpenShift using the web console
+:description: Installing {image-puller-name-short} on OpenShift by using the web console
 :keywords: administration-guide, image-puller, openshift, operator, operatorhub
-:navtitle: Installing {image-puller-name-short} on OpenShift using the web console
-:page-aliases: .:installing-image-puller-on-openshift-using-operatorhub.adoc, installing-image-puller-on-openshift-using-operatorhub.adoc
+:navtitle: Installing {image-puller-name-short} on OpenShift by using the web console
+:page-aliases: .:installing-image-puller-on-openshift-by-using-operatorhub.adoc, installing-image-puller-on-openshift-using-operatorhub.adoc
 
 [id="installing-image-puller-on-openshift-by-using-the-web-console"]
 = Installing {image-puller-name-short} on OpenShift by using the web console
 
-You can install the {image-puller-operator-name} on OpenShift using the OpenShift web console.
+You can install the {image-puller-operator-name} on OpenShift by using the OpenShift web console.
 
 .Prerequisites