Merge pull request #48766 from xenolinux/mirror-reg-config

BZ2056385: Adds mirror registry example

Author: mburke5678

modules/images-configuration-registry-mirror.adoc

@@ -77,17 +77,32 @@ spec:
   repositoryDigestMirrors:
   - mirrors:
     - example.io/example/ubi-minimal <1>
-    source: registry.access.redhat.com/ubi8/ubi-minimal <2>
-  - mirrors:
-    - example.com/example/ubi-minimal
-    source: registry.access.redhat.com/ubi8/ubi-minimal
+    - example.com/example/ubi-minimal <2>
+    source: registry.access.redhat.com/ubi8/ubi-minimal <3>
   - mirrors:
     - mirror.example.com/redhat
-    source: registry.redhat.io/openshift4 <3>
+    source: registry.redhat.io/openshift4 <4>
+  - mirrors:
+    - mirror.example.com
+    source: registry.redhat.io <5>
+  - mirrors:
+    - mirror.example.net/image
+    source: registry.example.com/example/myimage <6>
+  - mirrors:
+    - mirror.example.net
+    source: registry.example.com/example <7>
+  - mirrors:
+    - mirror.example.net/registry-example-com
+    source: registry.example.com <8>
 ----
 <1> Indicates the name of the image registry and repository.
-<2> Indicates the registry and repository containing the content that is mirrored.
-<3> You can configure a namespace inside a registry to use any image in that namespace. If you use a registry domain as a source, the `ImageContentSourcePolicy` resource is applied to all repositories from the registry.
+<2> Indicates multiple mirror repositories for each target repository. If one mirror is down, the target repository can use another mirror.
+<3> Indicates the registry and repository containing the content that is mirrored.
+<4> You can configure a namespace inside a registry to use any image in that namespace. If you use a registry domain as a source, the `ImageContentSourcePolicy` resource is applied to all repositories from the registry.
+<5> If you configure the registry name, the `ImageContentSourcePolicy` resource is applied to all repositories from a source registry to a mirror registry.
+<6> Pulls the image `mirror.example.net/image@sha256:...`.
+<7> Pulls the image `myimage` in the source registry namespace from the mirror `mirror.example.net/myimage@sha256:...`.
+<8> Pulls the image `registry.example.com/example/myimage` from the mirror registry `mirror.example.net/registry-example-com/example/myimage@sha256:...`. The `ImageContentSourcePolicy` resource is applied to all repositories from a source registry to a mirror registry `mirror.example.net/registry-example-com`.
 
 . Create the new `ImageContentSourcePolicy` object:
 +
@@ -114,12 +129,12 @@ NAME                           STATUS                     ROLES    AGE  VERSION
 ip-10-0-137-44.ec2.internal    Ready                      worker   7m   v1.24.0
 ip-10-0-138-148.ec2.internal   Ready                      master   11m  v1.24.0
 ip-10-0-139-122.ec2.internal   Ready                      master   11m  v1.24.0
-ip-10-0-147-35.ec2.internal    Ready,SchedulingDisabled   worker   7m   v1.24.0
+ip-10-0-147-35.ec2.internal    Ready                      worker   7m   v1.24.0
 ip-10-0-153-12.ec2.internal    Ready                      worker   7m   v1.24.0
 ip-10-0-154-10.ec2.internal    Ready                      master   11m  v1.24.0
 ----
 +
-You can see that scheduling on each worker node is disabled as the change is being applied.
+The `Imagecontentsourcepolicy` resource does not restart the nodes.
 
 .. Start the debugging process to access the node:
 +
@@ -154,20 +169,58 @@ sh-4.2# cat /etc/containers/registries.conf
 [source,terminal]
 ----
 unqualified-search-registries = ["registry.access.redhat.com", "docker.io"]
+short-name-mode = ""
+
+[[registry]]
+  prefix = ""
+  location = "registry.access.redhat.com/ubi8/ubi-minimal"
+  mirror-by-digest-only = true
+
+  [[registry.mirror]]
+    location = "example.io/example/ubi-minimal"
+
+  [[registry.mirror]]
+    location = "example.com/example/ubi-minimal"
+
+[[registry]]
+  prefix = ""
+  location = "registry.example.com"
+  mirror-by-digest-only = true
+
+  [[registry.mirror]]
+    location = "mirror.example.net/registry-example-com"
+
 [[registry]]
-  location = "registry.access.redhat.com/ubi8/"
-  insecure = false
-  blocked = false
+  prefix = ""
+  location = "registry.example.com/example"
+  mirror-by-digest-only = true
+
+  [[registry.mirror]]
+    location = "mirror.example.net"
+
+[[registry]]
+  prefix = ""
+  location = "registry.example.com/example/myimage"
   mirror-by-digest-only = true
+
+  [[registry.mirror]]
+    location = "mirror.example.net/image"
+
+[[registry]]
   prefix = ""
+  location = "registry.redhat.io"
+  mirror-by-digest-only = true
 
   [[registry.mirror]]
-    location = "example.io/example/ubi8-minimal"
-    insecure = false
+    location = "mirror.example.com"
+
+[[registry]]
+  prefix = ""
+  location = "registry.redhat.io/openshift4"
+  mirror-by-digest-only = true
 
   [[registry.mirror]]
-    location = "example.com/example/ubi8-minimal"
-    insecure = false
+    location = "mirror.example.com/redhat"
 ----
 
 .. Pull an image digest to the node from the source and check if it is resolved by the mirror. `ImageContentSourcePolicy` objects support image digests only, not image tags.