Bump various mentions and places to v5 equivalents

Author: Markus Napp

adoc/admin-centralized-logging.adoc

@@ -153,7 +153,7 @@ Options with empty default values are set as not specified.
 |===
 |Parameter |Function |Default value
 
-| image.repository |specifies image repository to pull from|registry.suse.com/caasp/v4/rsyslog
+| image.repository |specifies image repository to pull from|registry.suse.com/caasp/v5/rsyslog
 |image.tag|specifies image tag to pull|8.39.0
 |kubernetesPodAnnotationsEnabled|enables kubernetes meta annotations in pod logs|false
 |kubernetesPodLabelsEnabled|enables kubernetes meta labels in pod logs| false

adoc/admin-security-ldap.adoc

@@ -5,7 +5,7 @@ Directory Server" (389-ds) and "Active Directory" by updating the built-in Dex L
 
 == Deploying an External 389 Directory Server
 
-The 389 Directory Server image `registry.suse.com/caasp/v4/389-ds:1.4.0`
+The 389 Directory Server image `registry.suse.com/caasp/v5/389-ds:1.4.0`
 will *automatically generate a self-signed certificate* and key.
 The following instructions show how to deploy the "389 Directory Server"
 with a customized configuration using container commands.
@@ -30,7 +30,7 @@ docker run -d \
 -e DS_DM_PASSWORD=<DS_DM_PASSWORD> \
 -e DS_SUFFIX=<DS_SUFFIX> \
 -v <DATA_DIR>:/data \
---name 389-ds registry.suse.com/caasp/v4/389-ds:1.4.0
+--name 389-ds registry.suse.com/caasp/v5/389-ds:1.4.0
 ----
 
 == Deploying a 389 Directory Server with an External Certificate

adoc/admin-software-installation.adoc

@@ -124,7 +124,7 @@ kubectl create clusterrolebinding tiller \
     --serviceaccount=kube-system:tiller
 
 helm init \
-    --tiller-image registry.suse.com/caasp/v4/helm-tiller:{helm_tiller_version} \
+    --tiller-image registry.suse.com/caasp/v5/helm-tiller:{helm_tiller_version} \
     --service-account tiller
 ----
 
@@ -161,7 +161,7 @@ helm init \
     --tiller-tls-cert tiller.crt \
     --tiller-tls-key tiller.key \
     --tls-ca-cert ca.crt \
-    --tiller-image registry.suse.com/caasp/v4/helm-tiller:{helm_tiller_version} \
+    --tiller-image registry.suse.com/caasp/v5/helm-tiller:{helm_tiller_version} \
     --service-account tiller
 ----
 

adoc/admin-velero-deployment-on-aws.adoc

@@ -24,7 +24,7 @@ helm install \
     --set configuration.backupStorageLocation.config.region=<REGION_NAME> \
     --set snapshotsEnabled=false \
     --set initContainers[0].name=velero-plugin-for-aws \
-    --set initContainers[0].image=registry.suse.com/caasp/v4/velero-plugin-for-aws:1.0.1 \
+    --set initContainers[0].image=registry.suse.com/caasp/v5/velero-plugin-for-aws:1.0.1 \
     --set initContainers[0].volumeMounts[0].mountPath=/target \
     --set initContainers[0].volumeMounts[0].name=plugins \
     suse/velero
@@ -62,7 +62,7 @@ helm install \
     --set configuration.volumeSnapshotLocation.name=default \
     --set configuration.volumeSnapshotLocation.config.region=<REGION_NAME> \
     --set initContainers[0].name=velero-plugin-for-aws \
-    --set initContainers[0].image=registry.suse.com/caasp/v4/velero-plugin-for-aws:1.0.1 \
+    --set initContainers[0].image=registry.suse.com/caasp/v5/velero-plugin-for-aws:1.0.1 \
     --set initContainers[0].volumeMounts[0].mountPath=/target \
     --set initContainers[0].volumeMounts[0].name=plugins \
     suse/velero

adoc/admin-velero-deployment-on-premise.adoc

@@ -28,7 +28,7 @@ helm install \
     --set configuration.backupStorageLocation.config.region=<REGION_NAME> \
     --set snapshotsEnabled=false \
     --set initContainers[0].name=velero-plugin-for-aws \
-    --set initContainers[0].image=registry.suse.com/caasp/v4/velero-plugin-for-aws:1.0.1 \
+    --set initContainers[0].image=registry.suse.com/caasp/v5/velero-plugin-for-aws:1.0.1 \
     --set initContainers[0].volumeMounts[0].mountPath=/target \
     --set initContainers[0].volumeMounts[0].name=plugins \
     suse/velero
@@ -67,7 +67,7 @@ helm install \
     --set configuration.backupStorageLocation.bucket=<BUCKET_NAME> \
     --set snapshotsEnabled=false \
     --set initContainers[0].name=velero-plugin-for-gcp \
-    --set initContainers[0].image=registry.suse.com/caasp/v4/velero-plugin-for-gcp:1.0.1 \
+    --set initContainers[0].image=registry.suse.com/caasp/v5/velero-plugin-for-gcp:1.0.1 \
     --set initContainers[0].volumeMounts[0].mountPath=/target \
     --set initContainers[0].volumeMounts[0].name=plugins \
     suse/velero
@@ -109,7 +109,7 @@ helm install \
 	--set configuration.backupStorageLocation.config.storageAccount=<AZURE_STORAGE_ACCOUNT_ID> \
     --set snapshotsEnabled=false \
     --set initContainers[0].name=velero-plugin-for-microsoft-azure \
-    --set initContainers[0].image=registry.suse.com/caasp/v4/velero-plugin-for-microsoft-azure:1.0.1 \
+    --set initContainers[0].image=registry.suse.com/caasp/v5/velero-plugin-for-microsoft-azure:1.0.1 \
     --set initContainers[0].volumeMounts[0].mountPath=/target \
     --set initContainers[0].volumeMounts[0].name=plugins \
     suse/velero
@@ -180,7 +180,7 @@ helm install \
     --set configuration.volumeSnapshotLocation.name=default \
     --set configuration.volumeSnapshotLocation.config.region=<REGION_NAME> \
     --set initContainers[0].name=velero-plugin-for-aws \
-    --set initContainers[0].image=registry.suse.com/caasp/v4/velero-plugin-for-aws:1.0.1 \
+    --set initContainers[0].image=registry.suse.com/caasp/v5/velero-plugin-for-aws:1.0.1 \
     --set initContainers[0].volumeMounts[0].mountPath=/target \
     --set initContainers[0].volumeMounts[0].name=plugins \
     suse/velero
@@ -221,7 +221,7 @@ helm install \
     --set deployRestic=true \
     --set configuration.volumeSnapshotLocation.name=default \
     --set initContainers[0].name=velero-plugin-for-gcp \
-    --set initContainers[0].image=registry.suse.com/caasp/v4/velero-plugin-for-gcp:1.0.1 \
+    --set initContainers[0].image=registry.suse.com/caasp/v5/velero-plugin-for-gcp:1.0.1 \
     --set initContainers[0].volumeMounts[0].mountPath=/target \
     --set initContainers[0].volumeMounts[0].name=plugins \
     suse/velero
@@ -265,7 +265,7 @@ helm install \
     --set deployRestic=true \
     --set configuration.volumeSnapshotLocation.name=default \
     --set initContainers[0].name=velero-plugin-for-microsoft-azure \
-    --set initContainers[0].image=registry.suse.com/caasp/v4/velero-plugin-for-microsoft-azure:1.0.1 \
+    --set initContainers[0].image=registry.suse.com/caasp/v5/velero-plugin-for-microsoft-azure:1.0.1 \
     --set initContainers[0].volumeMounts[0].mountPath=/target \
     --set initContainers[0].volumeMounts[0].name=plugins \
     suse/velero
@@ -321,7 +321,7 @@ helm install \
     --set configuration.volumeSnapshotLocation.name=default \
     --set configuration.volumeSnapshotLocation.config.region=minio \
     --set initContainers[0].name=velero-plugin-for-aws \
-    --set initContainers[0].image=registry.suse.com/caasp/v4/velero-plugin-for-aws:1.0.1 \
+    --set initContainers[0].image=registry.suse.com/caasp/v5/velero-plugin-for-aws:1.0.1 \
     --set initContainers[0].volumeMounts[0].mountPath=/target \
     --set initContainers[0].volumeMounts[0].name=plugins \
     suse/velero

adoc/architecture-description.adoc

@@ -44,12 +44,12 @@ Versioning scheme: `x.y.z`
 |Version |Base OS |{kube} version |Patchlevel
 
 |4.0.0
-|{sle} {base_os_version}
+|{sls} {base_os_version}
 ^|1.15
 ^|0
 
 |4.0.1
-|{sle} {base_os_version}
+|{sls} {base_os_version}
 ^|1.15
 ^|1
 
@@ -59,7 +59,7 @@ Versioning scheme: `x.y.z`
 |
 
 |4.1.0
-|{sle} {base_os_version}
+|{sls} {base_os_version}
 ^|1.16
 ^|0
 

adoc/common_disclaimer.adoc

@@ -14,5 +14,5 @@ The content in this document is subject to change without notice.
 
 [NOTE]
 ====
-This guide assumes a configured {sle} {base_os_version} environment.
+This guide assumes a configured {sls} {base_os_version} environment.
 ====

adoc/deployment-airgapped.adoc

@@ -391,20 +391,23 @@ Mirror those and setup the crio-registries to point to the location they are mir
 ====
 These images need to be available in the external and internal mirrors at the time you try to deploy {productname}.
 Image tags are varies depending on your version of kubernetes you install.
-:===
-CATEGORY:IMAGE:URL
-KUBEADM:hyperkube:registry.suse.com/caasp/v4/hyperkube
-KUBEADM:pause:registry.suse.com/caasp/v4/pause
-KUBEADM:coredns:registry.suse.com/caasp/v4/coredns
-KUBEADM:etcd:egistry.suse.com/caasp/v4/etcd
-ADDONS:cilium:registry.suse.com/caasp/v4/cilium-init
-ADDONS:cilium:registry.suse.com/caasp/v4/cilium-operator
-ADDONS:cilium:registry.suse.com/caasp/v4/cilium
-ADDONS:dex:registry.suse.com/caasp/v4/caasp-dex
-ADDONS:gangway:registry.suse.com/caasp/v4/gangway
-ADDONS:kured:registry.suse.com/caasp/v4/kured
-MISC:skuba-tooling:registry.suse.com/caasp/v4/skuba-tooling
-:===
+
+[cols=3, options="header"]
+|===
+|CATEGORY|IMAGE|URL
+|KUBEADM|hyperkube|registry.suse.com/caasp/v5/hyperkube
+|KUBEADM|pause|registry.suse.com/caasp/v5/pause
+|KUBEADM|coredns|registry.suse.com/caasp/v5/coredns
+|KUBEADM|etcd|registry.suse.com/caasp/v5/etcd
+|ADDONS|cilium|registry.suse.com/caasp/v5/cilium-init
+|ADDONS|cilium|registry.suse.com/caasp/v5/cilium-operator
+|ADDONS|cilium|registry.suse.com/caasp/v5/cilium
+|ADDONS|dex|registry.suse.com/caasp/v5/caasp-dex
+|ADDONS|gangway|registry.suse.com/caasp/v5/gangway
+|ADDONS|kured|registry.suse.com/caasp/v5/kured
+|MISC|skuba-tooling|registry.suse.com/caasp/v5/skuba-tooling
+|===
+
 ====
 
 .Internal Registry Mirror Is Read Only

adoc/deployment-bare-metal-or-kvm.adoc

@@ -10,7 +10,7 @@ You must have completed <<deployment.preparations>> to proceed.
 [NOTE]
 ====
 If deploying on KVM virtual machines, you may use a tool such as `virt-manager`
-to configure the virtual machines and begin the {sle} {base_os_version} installation.
+to configure the virtual machines and begin the {sls} {base_os_version} installation.
 ====
 
 === Environment Description
@@ -70,15 +70,15 @@ The password for root can be enabled by using the `passwd` command.
 ====
 .. `<suse_register>`
 +
-Insert the email address and {productname} registration code in the placeholder fields. This activates {sle} {base_os_version}.
+Insert the email address and {productname} registration code in the placeholder fields. This activates {sls} {base_os_version}.
 .. `<addon>`
 +
 Insert the {productname} registration code in the placeholder field. This enables the {productname} extension module.
 Update the {ay} file with your registration keys and your company's best practices and hardware configurations.
 +
 [NOTE]
 ====
-Your {productname} registration key can be used to both activate {sle} {base_os_version} and enable the extension.
+Your {productname} registration key can be used to both activate {sls} {base_os_version} and enable the extension.
 ====
 
 +
@@ -136,9 +136,9 @@ The load balancer must point at the machines that are assigned to be used as `ma
 [TIP]
 If you do not wish to use infrastructure load balancers, please deploy additional machines and refer to <<loadbalancer>>.
 
-Install {sle} {base_os_version} from your preferred medium and follow the steps for link:https://documentation.suse.com/sles/15-SP1/single-html/SLES-autoyast/#invoking-autoinst[Invoking the Auto-Installation Process]
+Install {sls} {base_os_version} from your preferred medium and follow the steps for link:https://documentation.suse.com/sles/15-SP1/single-html/SLES-autoyast/#invoking-autoinst[Invoking the Auto-Installation Process]
 
-Provide `autoyast=https://[webserver/path/to/autoyast.xml]` during the {sle} {base_os_version} installation.
+Provide `autoyast=https://[webserver/path/to/autoyast.xml]` during the {sls} {base_os_version} installation.
 
 ==== {sls} Installation
 

adoc/deployment-openstack.adoc

@@ -19,13 +19,13 @@ replacing DOWNLOADED_RC_FILE with the name your file:
 source <DOWNLOADED_RC_FILE>.sh
 ----
 .. Enter the password for the RC file. This should be same the credentials that you use to log in to {soc}.
-. Get the SLES15-SP1 image.
-.. Download the pre-built image of SUSE SLES15-SP1 for {soc} from {jeos_product_page_url}.
+. Get the {sls} {base_os_version} image.
+.. Download the pre-built image of SUSE {sls} {base_os_version} for {soc} from {jeos_product_page_url}.
 .. Upload the image to your {soc}.
 
 .The default user is 'sles'
 [NOTE]
-The SUSE SLES15-SP1 images for {soc} come with predefined user `sles`, which you use to log in to the cluster nodes. This user has been configured for password-less 'sudo' and is the one recommended to be used by {tf} and `skuba`.
+The {sls} {base_os_version} images for {soc} come with predefined user `sles`, which you use to log in to the cluster nodes. This user has been configured for password-less 'sudo' and is the one recommended to be used by {tf} and `skuba`.
 
 === Deploying the Cluster Nodes
 

adoc/deployment-preparation.adoc

@@ -1,7 +1,7 @@
 [[deployment.preparations]]
 == Deployment Preparations
 
-In order to deploy {productname} you need a workstation running {sle} {base_os_version} or similar {opensuse} equivalent.
+In order to deploy {productname} you need a workstation running {sls} {base_os_version} or similar {opensuse} equivalent.
 This workstation is called the "Management machine". Important files are generated
 and must be maintained on this machine, but it is not a member of the {productname} cluster.
 
@@ -82,7 +82,7 @@ of `ssh` to learn about the security implications of using this feature.
 ====
 The registration code for {productname}.{productmajor} also contains the activation
 permissions for the underlying {sle} operating system. You can use your {productname}
-registration code to activate the {sle} {base_os_version} subscription during installation.
+registration code to activate the {sls} {base_os_version} subscription during installation.
 ====
 
 You need a subscription registration code to use {productname}. You can retrieve your
@@ -226,6 +226,6 @@ that is being upgraded will have to be marked INACTIVE on the load balancer pool
 at least during the restart of the apiserver. We provide reasonable defaults
 for that on our default openstack load balancer {tf} configuration.
 
-The following contains examples for possible load balancer configurations based on {sle} {base_os_version} and `nginx` or `HAProxy`.
+The following contains examples for possible load balancer configurations based on {sls} {base_os_version} and `nginx` or `HAProxy`.
 
 include::deployment-loadbalancer.adoc[Load Balancer,leveloffset=+2]

adoc/deployment-sles.adoc

@@ -1,6 +1,6 @@
 == Deployment on Existing SLES Installation
 
-If you already have a running {sle} {base_os_version} installation, you can add {productname}
+If you already have a running {sls} {base_os_version} installation, you can add {productname}
 to this installation using SUSE Connect. You also need to enable the "Containers"
 module because it contains some dependencies required by {productname}.
 

adoc/deployment-terraform-example.adoc

@@ -120,15 +120,15 @@ vsphere_network = "VM Network" // <4>
 vsphere_resource_pool = "My_RP" // <5>
 
 # template name the machines will be copied from
-template_name = "sles15-sp1-caasp" // <6>
+template_name = "sles15-sp2-caasp" // <6>
 
 # IMPORTANT: Replace by "efi" string in case your template was created by using EFI firmware
 firmware = "bios"
 
 # prefix that all of the booted machines will use
 # IMPORTANT: please enter unique identifier below as value of
 # stack_name variable to not interfere with other deployments
-stack_name = "caasp-v4" // <7>
+stack_name = "caasp-v5" // <7>
 
 # Number of master nodes
 masters = 1 // <8>
@@ -208,7 +208,7 @@ deployed machines.
 # prefix that all of the booted machines will use
 # IMPORTANT, please enter unique identifier below as value of
 # stack_name variable to not interfere with other deployments
-stack_name = "caasp-v4" // <1>
+stack_name = "caasp-v5" // <1>
 
 # AWS region
 aws_region = "eu-central-1"  // <2>

adoc/deployment-vmware.adoc

@@ -192,7 +192,7 @@ like `sudo`, `cloud-init` and `open-vm-tools`.
 [TIP]
 Steps 1-4 may be skipped, if they were already performed in {yast} during the {sle} installation.
 
-. Register the SLES15-SP1 system. Substitute `<CAASP_REGISTRATION_CODE>` for the code from <<registration_code>>.
+. Register the {sls} {base_os_version} system. Substitute `<CAASP_REGISTRATION_CODE>` for the code from <<registration_code>>.
 +
 ----
 SUSEConnect -r CAASP_REGISTRATION_CODE
@@ -222,7 +222,7 @@ zypper in sudo cloud-init cloud-init-vmware-guestinfo open-vm-tools
 ----
 systemctl enable cloud-init cloud-init-local cloud-config cloud-final
 ----
-
+}
 . Deregister from `scc`:
 +
 ----