From 28e283b1c327a481f1ae4be71f19cf90fb428eee Mon Sep 17 00:00:00 2001 From: Ron Stone Date: Thu, 15 Dec 2022 09:53:52 -0500 Subject: [PATCH] Container version updates Container version updates for r8. Add partial vran updates. Resolve merge conflict. Signed-off-by: Ron Stone Change-Id: Iee462f3d3a9c62a5e526f12ab65cb7827d19e00b --- ...ng-and-provisioning-the-central-cloud.rest | 2 +- .../oran-o2-application-b50a0c899e66.rst | 4 +- ...ng-redfish-platform-management-service.rst | 2 +- ...ntainer-backed-remote-clis-and-clients.rst | 4 +- ...ntainer-backed-remote-clis-and-clients.rst | 6 +-- .../kubernetes/vran-tools-2c3ee49f4b0b.rst | 44 +++++++++---------- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/doc/source/_includes/installing-and-provisioning-the-central-cloud.rest b/doc/source/_includes/installing-and-provisioning-the-central-cloud.rest index 7802b2c2c..c271fcbdb 100644 --- a/doc/source/_includes/installing-and-provisioning-the-central-cloud.rest +++ b/doc/source/_includes/installing-and-provisioning-the-central-cloud.rest @@ -15,4 +15,4 @@ additional_local_registry_images: - quay.io/external_storage/rbd-provisioner:v2.1.1-k8s1.11 - - docker.io/starlingx/ceph-config-helper:v1.15.0 + - docker.io/starlingx/ceph-config-helper:ubuntu_bionic-20220802 diff --git a/doc/source/admintasks/kubernetes/oran-o2-application-b50a0c899e66.rst b/doc/source/admintasks/kubernetes/oran-o2-application-b50a0c899e66.rst index 92ed7e0a3..45271e5fa 100644 --- a/doc/source/admintasks/kubernetes/oran-o2-application-b50a0c899e66.rst +++ b/doc/source/admintasks/kubernetes/oran-o2-application-b50a0c899e66.rst @@ -234,7 +234,7 @@ You can install |O-RAN| O2 application on |prod| from the command line. EOF To deploy other versions of an image required for a quick solution, to - have early access to the features (eg. oranscinf/pti-o2imsdms:2.0.1), and + have early access to the features (eg. oranscinf/pti-o2imsdms:2.0.0), and to authenticate images that are hosted by a private registry, follow the steps below: @@ -260,7 +260,7 @@ You can install |O-RAN| O2 application on |prod| from the command line. serviceaccountname: admin-oran-o2 images: tags: - o2service: ${O2SERVICE_IMAGE_REG}/docker.io/oranscinf/pti-o2imsdms:2.0.1 + o2service: ${O2SERVICE_IMAGE_REG}/docker.io/oranscinf/pti-o2imsdms:2.0.0 postgres: ${O2SERVICE_IMAGE_REG}/docker.io/library/postgres:9.6 redis: ${O2SERVICE_IMAGE_REG}/docker.io/library/redis:alpine pullPolicy: IfNotPresent diff --git a/doc/source/dist_cloud/kubernetes/installing-a-subcloud-using-redfish-platform-management-service.rst b/doc/source/dist_cloud/kubernetes/installing-a-subcloud-using-redfish-platform-management-service.rst index bf2981fdc..873787720 100644 --- a/doc/source/dist_cloud/kubernetes/installing-a-subcloud-using-redfish-platform-management-service.rst +++ b/doc/source/dist_cloud/kubernetes/installing-a-subcloud-using-redfish-platform-management-service.rst @@ -41,7 +41,7 @@ subcloud, the subcloud installation has these phases: .. _installing-a-subcloud-using-redfish-platform-management-service-ul-g5j-3f3-qjb: - The docker **rvmc** image needs to be added to the System Controller - bootstrap override file, ``docker.io/starlingx/rvmc:stx.5.0-v1.0.0``. + bootstrap override file, ``docker.io/starlingx/rvmc:stx.8.0-v1.0.1``. - A new system CLI option ``--active`` is added to the :command:`load-import` command to allow the import into the diff --git a/doc/source/security/kubernetes/security-configure-container-backed-remote-clis-and-clients.rst b/doc/source/security/kubernetes/security-configure-container-backed-remote-clis-and-clients.rst index 7cf926db5..b65a6b8e9 100644 --- a/doc/source/security/kubernetes/security-configure-container-backed-remote-clis-and-clients.rst +++ b/doc/source/security/kubernetes/security-configure-container-backed-remote-clis-and-clients.rst @@ -246,7 +246,7 @@ CLIs and Clients for an admin user with cluster-admin clusterrole. .. parsed-literal:: - $ ./configure_client.sh -t platform -r admin_openrc.sh -k admin-kubeconfig -w $HOME/remote_cli_wd -p /docker.io/starlingx/stx-platformclients:stx.8.0-v1.5.9 + $ ./configure_client.sh -t platform -r admin_openrc.sh -k admin-kubeconfig -w HOME/remote_cli_wd -p |registry-url|/starlingx/stx-platformclients:stx.8.0-v1.5.9 If you specify repositories that require authentication, as shown above, you must first perform a :command:`docker login` to that @@ -301,7 +301,7 @@ CLIs and Clients for an admin user with cluster-admin clusterrole. .. parsed-literal:: - $ ./configure_client.sh -t platform -r admin_openrc.sh -k admin-kubeconfig -w $HOME/remote_cli_wd -p /docker.io/starlingx/stx-platformclients:stx.8.0-v1.5.9 + $ ./configure_client.sh -t platform -r admin-openrc.sh -k admin-kubeconfig -w $HOME/remote_cli_wd -p |registry-url|/starlingx/stx-platformclients:stx.8.0-v1.5.9 If you specify repositories that require authentication, you must first perform a :command:`docker login` to that repository before using diff --git a/doc/source/usertasks/kubernetes/kubernetes-user-tutorials-configuring-container-backed-remote-clis-and-clients.rst b/doc/source/usertasks/kubernetes/kubernetes-user-tutorials-configuring-container-backed-remote-clis-and-clients.rst index b5c5d3429..b1838875d 100644 --- a/doc/source/usertasks/kubernetes/kubernetes-user-tutorials-configuring-container-backed-remote-clis-and-clients.rst +++ b/doc/source/usertasks/kubernetes/kubernetes-user-tutorials-configuring-container-backed-remote-clis-and-clients.rst @@ -180,7 +180,7 @@ and clients for a non-admin user. passed as arguments to the remote |CLI| commands need to be in this directory in order for the container to access the files. The default value is the directory from which the - :command:`configure\_client.sh` command was run. + :command:`configure_client.sh` command was run. **-p** Override the container image for the platform |CLI| and clients. @@ -192,7 +192,7 @@ and clients for a non-admin user. .. parsed-literal:: - $ ./configure_client.sh -t platform -r my-openrc.sh -k user-kubeconfig -w $HOME/remote_cli_wd -p |registry-url|/starlingx/stx-platformclients:stx.5.0-v1.4.3 + $ ./configure_client.sh -t platform -r my-openrc.sh -k user-kubeconfig -w $HOME/remote_cli_wd -p |registry-url|/starlingx/stx-platformclients:stx.8.0-v1.5.9 If you specify repositories that require authentication, you must perform a :command:`docker login` to that repository before using @@ -232,4 +232,4 @@ See :ref:`Using Container-backed Remote CLIs and Clients * :ref:`Installing Kubectl and Helm Clients Directly on a Host ` - * :ref:`Configuring Remote Helm Client ` \ No newline at end of file + * :ref:`Configuring Remote Helm Client ` diff --git a/doc/source/usertasks/kubernetes/vran-tools-2c3ee49f4b0b.rst b/doc/source/usertasks/kubernetes/vran-tools-2c3ee49f4b0b.rst index 3a471b240..6511f48f1 100644 --- a/doc/source/usertasks/kubernetes/vran-tools-2c3ee49f4b0b.rst +++ b/doc/source/usertasks/kubernetes/vran-tools-2c3ee49f4b0b.rst @@ -5,7 +5,7 @@ vRAN Tools ========== The following open-source |vRAN| tools are delivered in the following container -image, ``docker.io/starlingx/stx-centos-tools-dev:stx.7.0-v1.0.1``: +image, ``docker.io/starlingx/stx-debian-tools-dev:stx.8.0-v1.0.3``: - ``dmidecode`` @@ -32,7 +32,7 @@ a Kubernetes pod and ``exec`` into a shell in the container in order to execute the commands. The Kubernetes pod must run in a privileged and host context, such that the above tools provide information on resources in the host context. -The suggested yaml manifest to launch the ``stx-centos-tools-dev`` container is +The suggested yaml manifest to launch the ``stx-debian-tools-dev`` container is as follows: .. code-block:: none @@ -40,20 +40,20 @@ as follows: apiVersion: apps/v1 kind: Deployment metadata: - name: stx-centos-tools + name: stx-debian-tools spec: replicas: 1 selector: matchLabels: - app: stx-centos-tools + app: stx-debian-tools template: metadata: labels: - app: stx-centos-tools + app: stx-debian-tools spec: containers: - - name: stx-centos-tools - image: docker.io/starlingx/stx-centos-tools-dev:stx.7.0-v1.0.1 + - name: stx-debian-tools + image: docker.io/starlingx/stx-debian-tools-dev:stx.8.0-v1.0.3 imagePullPolicy: Always stdin: true tty: true @@ -79,19 +79,19 @@ For example: .. code-block:: none # Create pod - ~(keystone_admin)] $ kubectl apply -f stx-centos-tools.yaml + ~(keystone_admin)] $ kubectl apply -f stx-debian-tools.yaml # Get the running pods ~(keystone_admin)] $ kubectl get pods NAME READY STATUS RESTARTS AGE - stx-centos-tools 1/1 Running 0 6s + stx-debian-tools 1/1 Running 0 6s Then ``exec`` into shell in container: .. code-block:: none # Attach to pod - ~(keystone_admin)] $ kubectl exec -it stx-centos-tools -- bash + ~(keystone_admin)] $ kubectl exec -it stx-debian-tools -- bash [root@controller-0 /]# [root@controller-0 /]# @@ -99,7 +99,7 @@ Then ``exec`` into shell in container: Build, deploy and run non-open-source tools ------------------------------------------- -The ``docker.io/starlingx/stx-centos-tools-dev:stx.7.0-v1.0.1`` container image +The ``docker.io/starlingx/stx-debian-tools-dev:stx.8.0-v1.0.3`` container image also contains the |prod| development tools. Using this container as your base image, this enables the |prod| user to build @@ -123,7 +123,7 @@ Running on Kubernetes: # Creating the Dockerfile cat << EOF > Dockerfile - FROM docker.io/starlingx/stx-centos-tools-dev:stx.7.0-v1.0.1 + FROM docker.io/starlingx/stx-debian-tools-dev:stx.7.0-v1.0.1 USER root WORKDIR /root @@ -139,20 +139,20 @@ Running on Kubernetes: EOF # Building the image with Quartzville - sudo docker build -t stx-centos-tools-quartzville . + sudo docker build -t stx-debian-tools-quartzville . # Create the yml for Kubernetes; note the additional mounting of the host kernel headers from the host - cat << EOF > stx-centos-tools-quartzville.yml + cat << EOF > stx-debian-tools-quartzville.yml apiVersion: v1 kind: Pod metadata: - name: stx-centos-tools-quartzville + name: stx-debian-tools-quartzville spec: hostNetwork: true hostPID: true containers: - - name: stx-centos-tools-quartzville - image: registry.local:9001/public/stx-centos-tools-quartzville + - name: stx-debian-tools-quartzville + image: registry.local:9001/public/stx-debian-tools-quartzville imagePullPolicy: Always stdin: true tty: true @@ -184,16 +184,16 @@ Running on Kubernetes: sudo docker login -u admin -p registry.local:9001 # Tagging for local registry - sudo docker tag stx-centos-tools-quartzville:latest registry.local:9001/public/stx-centos-tools-quartzville:latest + sudo docker tag stx-debian-tools-quartzville:latest registry.local:9001/public/stx-debian-tools-quartzville:latest # Push image to local registry - sudo docker push registry.local:9001/public/stx-centos-tools-quartzville:latest + sudo docker push registry.local:9001/public/stx-debian-tools-quartzville:latest # Create pod - kubectl apply -f stx-centos-tools-quartzville.yml + kubectl apply -f stx-debian-tools-quartzville.yml # Attach to pod - kubectl exec -it stx-centos-tools-quartzville -- scl enable devtoolset-9 /bin/bash + kubectl exec -it stx-debian-tools-quartzville -- scl enable devtoolset-9 /bin/bash # < execute testing with quartzville tool > ------- @@ -211,4 +211,4 @@ commands to uninstall Quartzville driver: exit # Delete the quartzville pod - kubectl delete pods stx-centos-tools-quartzville + kubectl delete pods stx-debian-tools-quartzville