Merge branch 'main' into akd/release/1.30

pages/k8s/1.29/release-notes.md

@@ -46,7 +46,8 @@ The release bundle can also be
     stored in etcd are encrypted and can only be unlocked by a key which is
     stored in Vault.
 - Kubernetes-Worker:
-  - LP#2066049: The charm returns support for the `ingress-proxy` relation.
+  - [LP#2066049](https://bugs.launchpad.net/bugs/2066049): The charm returns
+    support for the `ingress-proxy` relation.
 
 ## Notable Fixes
 
@@ -237,4 +238,4 @@ relevant sections of the [upstream release notes][upstream-changelog-1.29].
 [gpu-workers]: /kubernetes/docs/gpu-workers
 [install-local]: /kubernetes/docs/install-local
 [install-existing]: /kubernetes/docs/install-existing
-[ldap]: /kuberntes/docs/ldap
+[ldap]: /kubernetes/docs/ldap

pages/k8s/1.29/upgrading.md

@@ -16,11 +16,11 @@ toc: False
 <div class="p-notification--caution is-inline">
   <div markdown="1" class="p-notification__content">
     <span class="p-notification__title">Caution:</span>
-    <p class="p-notification__message">This release includes topology changes and new best practices for integrating <strong>Charmed Kubernetes</strong> with other Juju ecosystem solutions. Be sure to read and understand the *What's new* section of the <a href="/kubernetes/docs/1.29/release-notes">1.29 release notes</a> prior to upgrading your cluster.<br/>
+    <p class="p-notification__message">This release includes topology changes and new best practices for integrating <strong>Charmed Kubernetes</strong> with other Juju ecosystem solutions. Be sure to read and understand the <strong>What's new</strong> section of the <a href="/kubernetes/docs/1.29/release-notes">1.29 release notes</a> prior to upgrading your cluster.<br/>
     <br/>
-    Additionally, some features from previous <strong>Charmed Kubernetes</strong> releases are not yet available in this release. If you rely on a component identified as an *Integration gap* in the <a href="/kubernetes/docs/1.29/release-notes#notes-issues">Notes and Known Issues</a> section of the release notes, remain on release 1.28 (or earlier) and do not upgrade to 1.29 at this time.<br/>
+    Additionally, some features from previous <strong>Charmed Kubernetes</strong> releases are not yet available in this release. If you rely on a component identified as an <strong>Integration gap</strong> in the <a href="/kubernetes/docs/1.29/release-notes#notes-issues">Notes and Known Issues</a> section of the release notes, remain on release 1.28 (or earlier) and do not upgrade to 1.29 at this time.<br/>
     <br/>
-    Some specific scenarios for thoese using particular configurations are also covered in the 
+    Some specific scenarios for those using particular configurations are also covered in the 
     <a href="/kubernetes/docs/upgrade-notes"> Upgrade notes document</a>, particularly concerning those using 
     observability, LDAP/Keystone integration and Ceph.<br/>
     </p>
@@ -50,7 +50,7 @@ The 'App' section of the output lists each application and its version number. N
 
 ## Before you begin
 
-<div class="p-notification--warning is-inline">
+<div class="p-notification--caution is-inline">
   <div markdown="1" class="p-notification__content">
     <span class="p-notification__title">Warning!:</span>
     <p class="p-notification__message"><strong>Juju compatibility</strong>: Juju version 3.1 or better is required to deploy Charmed Kubernetes 1.29. See the <a href="https://juju.is/docs/juju/upgrade-your-juju-deployment-from-2-9-to-3-x">Juju documentation</a> for information on upgrading controllers and models to Juju 3.x.</p>

pages/k8s/how-to-cos-lite.md

@@ -46,27 +46,27 @@ Use the Ubuntu charm to deploy an application named “microk8s”:
 juju deploy ubuntu microk8s --series=focal --constraints="mem=8G cores=4 root-disk=30G"
 ```
 
-Deploy Microk8s on Ubuntu by accessing the unit you created at the last step
+Deploy MicroK8s on Ubuntu by accessing the unit you created at the last step
 with `juju ssh microk8s/0` and following the [Install Microk8s][how-to-install-microk8s]
 guide for configuration.
 
-Export the Microk8s kubeconfig file to your current directory after configuration:
+Export the MicroK8s kubeconfig file to your current directory after configuration:
 
 ```
 juju ssh microk8s/0 -- microk8s config > microk8s-config.yaml
 ```
 
-Register Microk8s as a Juju cloud using add-k8s (see ["juju
+Register MicroK8s as a Juju cloud using add-k8s (see ["juju
 add-k8s"][add-k8s] for details on the add-k8s
 command):
 
 ```
 KUBECONFIG=microk8s-config.yaml juju add-k8s microk8s
 ```
 
-## Deploying COS Lite on the Microk8s cloud
+## Deploying COS Lite on the MicroK8s cloud
 
-On the Microk8s cloud, create a new model and deploy the cos-lite charm:
+On the MicroK8s cloud, create a new model and deploy the cos-lite charm:
 
 ```
 juju add-model cos-lite microk8s
@@ -83,7 +83,7 @@ juju offer prometheus:receive-remote-write
 Use juju status --relations to verify that both grafana and prometheus
 offerings are listed.
 
-At this point, you’ve established a Microk8s model on Ubuntu and incorporated
+At this point, you’ve established a MicroK8s model on Ubuntu and incorporated
 it into Juju as a Kubernetes cloud. You then used this cloud as a substrate for
 the COS Lite deployment. You therefore have 2 models on the same controller.
 
@@ -109,7 +109,7 @@ Deploy the grafana-agent:
 Juju deploy grafana-agent
 ```
 
-Relate `grafana-agent` to charmed kubernetes applications:
+Relate `grafana-agent` to the Charmed Kubernetes applications:
 
 ```
 juju integrate grafana-agent:cos-agent kubernetes-control-plane:cos-agent
@@ -130,7 +130,7 @@ Get the credentials and login URL for Grafana:
 juju run grafana/0 get-admin-password -m cos-lite
 ```
 
-The above command will output:
+The above command will output credential information:
 
 ```
 admin-password: b9OhxF5ndUDO

pages/k8s/openstack-integration.md

@@ -192,7 +192,7 @@ relations:
   - [easyrsa:client,                                     cinder-csi:certificates]
   - [kubernetes-control-plane:kube-control,              cinder-csi:kube-control]
   - [openstack-integrator:clients,                       cinder-csi:openstack]
-  - [kubernetes-control-plane:loadbalancer-external,     openstack-integrator:lb-consumer]
+  - [kubernetes-control-plane:loadbalancer-external,     openstack-integrator:lb-consumers]
 ```
 
 You will also need to set the `lb-subnet` config to the appropriate tenant subnet where your nodes
@@ -293,7 +293,7 @@ juju refresh openstack-integrator --switch --channel=1.29/stable
 **2. Integrate the kubernetes-control-plane application:**
 
 ```bash
-juju integrate openstack-integrator:lb-consumer kubernetes-control-plane:loadbalancer-external
+juju integrate openstack-integrator:lb-consumers kubernetes-control-plane:loadbalancer-external
 ```
 
 **3. Deploy and migrate to the `openstack-cloud-controller` charm** (See its [charm docs][openstack-cloud-controller-readme] for details).

pages/k8s/upgrade-notes.md

@@ -59,7 +59,7 @@ upgrade of the charms but prior to an upgrade of the Kubernetes cluster.
 
 The `kubernetes-control-plane:kube-api-endpoint` and
 `kubernetes-worker:kube-api-endpoint` relations have been removed since these
-APIs are are provided by the `kube-control` relation. Ensure these two apps are
+APIs are provided by the `kube-control` relation. Ensure these two apps are
 linked by `kube-control` relation before removing this relation.
 
 ```
@@ -185,8 +185,9 @@ The [upstream Keystone docs][keystone-auth] cover keystone-auth in detail and
 should be the main reference for implementation details.
 
 Keystone has two "Auth" options:
-1) Authentication of users only called [keystone-authentication][]
-2) Authentication and authorisation of users, called [keystone-authorization][]
+
+1. Authentication of users only called [keystone-authentication][]
+2. Authentication and authorisation of users, called [keystone-authorization][]
 
 Both options require the deployment and management of the
 [k8s-keystone-auth webhook service][keystone-auth-webhook], a deployment which
@@ -278,7 +279,7 @@ present, but are slated to be reintroduced:
 The `kubernetes-control-plane` and `kubernetes-worker` action for cis-benchmark
 were removed during the development of the 1.29 charms and an engineering
 decision to reintroduce these actions are on-going, but development and testing
-incomplete.  Details in [LP#2044219][]
+incomplete. Details in [LP#2044219][]
 
 ### Automatic labelling of GPU nodes