Merge pull request #4215 from ggiguash/bootc_getting_started

USHIFT-4699: Update bootc instructions with 4.17 version

Author: openshift-merge-bot[bot]

docs/config/Containerfile.bootc-rhel9

@@ -1,6 +1,6 @@
 FROM registry.redhat.io/rhel9/rhel-bootc:9.4
 
-ARG USHIFT_VER=4.16
+ARG USHIFT_VER=4.17
 RUN dnf config-manager \
         --set-enabled "rhocp-${USHIFT_VER}-for-rhel-9-$(uname -m)-rpms" \
         --set-enabled "fast-datapath-for-rhel-9-$(uname -m)-rpms"

docs/contributor/image_mode.md

@@ -56,20 +56,20 @@ image from the `registry.redhat.io` registry
 
 ```bash
 PULL_SECRET=~/.pull-secret.json
-USER_PASSWD=<your_redhat_user_password>
-IMAGE_NAME=microshift-4.16-bootc
+USER_PASSWD="<your_redhat_user_password>"
+IMAGE_NAME=microshift-4.17-bootc
 
 sudo podman build --authfile "${PULL_SECRET}" -t "${IMAGE_NAME}" \
     --build-arg USER_PASSWD="${USER_PASSWD}" \
     -f Containerfile
 ```
 
-Verify that the local MicroShift 4.16 `bootc` image was created.
+Verify that the local MicroShift 4.17 `bootc` image was created.
 
 ```bash
 $ sudo podman images "${IMAGE_NAME}"
 REPOSITORY                       TAG         IMAGE ID      CREATED        SIZE
-localhost/microshift-4.16-bootc  latest      193425283c00  2 minutes ago  2.31 GB
+localhost/microshift-4.17-bootc  latest      193425283c00  2 minutes ago  2.31 GB
 ```
 
 ### Publish Image
@@ -110,7 +110,7 @@ $ find /lib/modules/$(uname -r) -name "openvswitch*"
 /lib/modules/6.9.9-200.fc40.x86_64/kernel/net/openvswitch
 /lib/modules/6.9.9-200.fc40.x86_64/kernel/net/openvswitch/openvswitch.ko.xz
 
-$ IMAGE_NAME=microshift-4.16-bootc
+$ IMAGE_NAME=microshift-4.17-bootc
 $ sudo podman inspect "${IMAGE_NAME}" | grep kernel-core
         "created_by": "kernel-core-5.14.0-427.26.1.el9_4.x86_64"
 ```
@@ -183,7 +183,7 @@ The host shares the following configuration with the container:
 
 ```bash
 PULL_SECRET=~/.pull-secret.json
-IMAGE_NAME=microshift-4.16-bootc
+IMAGE_NAME=microshift-4.17-bootc
 
 sudo modprobe openvswitch
 sudo podman run --rm -it --privileged \
@@ -229,10 +229,13 @@ gaining access to private container registries:
 pre-install stage to authenticate `quay.io/myorg` registry access
 * `PULL_SECRET` file contents are copied to `/etc/crio/openshift-pull-secret`
 at the post-install stage to authenticate OpenShift registry access
+* `IMAGE_REF` variable contains the MicroShift bootc container image reference
+to be installed
 
 ```bash
 AUTH_CONFIG=~/.quay-auth.json
 PULL_SECRET=~/.pull-secret.json
+IMAGE_REF="quay.io/<myorg>/<mypath>/microshift-4.17-bootc"
 ```
 
 > See the `containers-auth.json(5)` manual pages for more information on the
@@ -278,7 +281,7 @@ EOF
 %end
 
 # Pull a 'bootc' image from a remote registry
-ostreecontainer --url quay.io/myorg/mypath/microshift-4.16-bootc
+ostreecontainer --url "${IMAGE_REF}"
 
 %post --log=/dev/console --erroronfail
 
@@ -309,7 +312,7 @@ previous step to pull a `bootc` image from the remote registry and use it to ins
 the RHEL operating system.
 
 ```bash
-VMNAME=microshift-4.16-bootc
+VMNAME=microshift-4.17-bootc
 NETNAME=default
 
 sudo virt-install \
@@ -346,24 +349,24 @@ manner to create multi-architecture images.
 
 ```bash
 PULL_SECRET=~/.pull-secret.json
-USER_PASSWD=<your_redhat_user_password>
+USER_PASSWD="<your_redhat_user_password>"
 IMAGE_ARCH=amd64 # Use amd64 or arm64 depending on the current platform
 IMAGE_PLATFORM="linux/${IMAGE_ARCH}"
-IMAGE_NAME="microshift-4.16-bootc:linux-${IMAGE_ARCH}"
+IMAGE_NAME="microshift-4.17-bootc:linux-${IMAGE_ARCH}"
 
 sudo podman build --authfile "${PULL_SECRET}" -t "${IMAGE_NAME}" \
     --platform "${IMAGE_PLATFORM}" \
     --build-arg USER_PASSWD="${USER_PASSWD}" \
     -f Containerfile
 ```
 
-Verify that the local MicroShift 4.16 `bootc` image was created for the specified
+Verify that the local MicroShift 4.17 `bootc` image was created for the specified
 platform.
 
 ```bash
 $ sudo podman images "${IMAGE_NAME}"
 REPOSITORY                       TAG          IMAGE ID      CREATED         SIZE
-localhost/microshift-4.16-bootc  linux-amd64  3f7e136fccb5  13 minutes ago  2.19 GB
+localhost/microshift-4.17-bootc  linux-amd64  3f7e136fccb5  13 minutes ago  2.19 GB
 ```
 
 Repeat the procedure on the other platform (i.e. `arm64`) and proceed by publishing
@@ -383,7 +386,7 @@ and publish it to the remote registry.
 ```bash
 REGISTRY_URL=quay.io
 REGISTRY_ORG=myorg/mypath
-BASE_NAME=microshift-4.16-bootc
+BASE_NAME=microshift-4.17-bootc
 MANIFEST_NAME="${BASE_NAME}:latest"
 
 sudo podman manifest create -a "localhost/${MANIFEST_NAME}" \
@@ -409,6 +412,6 @@ $ sudo podman manifest inspect \
 ```
 
 It is now possible to access images using the manifest name with the `latest` tag
-(e.g. `quay.io/myorg/mypath/microshift-4.16-bootc:latest`). The image for the
+(e.g. `quay.io/myorg/mypath/microshift-4.17-bootc:latest`). The image for the
 current platform will automatically be pulled from the registry if it is part of
 the manifest list.

packaging/imagemode/Makefile

@@ -132,11 +132,9 @@ clean:
 4.16-el94:
 	@$(MAKE) rhocp USHIFT_VER=4.16
 
-.PHONY: 4.17-rc-el94
-4.17-rc-el94:
-	@$(MAKE) repourl \
-		USHIFT_URL=https://mirror.openshift.com/pub/openshift-v4/$$(uname -m)/microshift/ocp/latest-4.17/el9/os/ \
-		OCPDEP_URL=https://mirror.openshift.com/pub/openshift-v4/$$(uname -m)/dependencies/rpms/4.17-el9-beta/
+.PHONY: 4.17-el94
+4.17-el94:
+	@$(MAKE) rhocp USHIFT_VER=4.17
 
 .PHONY: 4.18-ec-cos9
 4.18-ec-cos9: