merge master -> prod

.github/workflows/ci.yml

@@ -19,9 +19,9 @@ jobs:
           mv charts/placeos/Chart.yaml.tmp charts/placeos/Chart.yaml
 
       - name: Set Up Helm
-        uses: azure/setup-helm@v1
+        uses: azure/setup-helm@v4.3.0
         with:
-          version: v3.16.3
+          version: v3.18.2
 
       - name: Template Helm Charts
         run: |

ansible/README.md

@@ -11,29 +11,30 @@ Contains 4 roles:
 
 ## Prerequisites
 
-- Ansible >= 2.9 on Python 3
+- Ansible >= 2.17 on Python 3
 
 - Openshift python library. To install `pip install openshift`
 
-- Install the community.kubernetes Ansible collection: `ansible-galaxy collection install community.kubernetes`
+- Install the kubernetes.core Ansible collection: `ansible-galaxy collection install kubernetes.core`
 
-- Review the requirements for the [Ansible helm wrapper](https://docs.ansible.com/ansible/2.10/collections/community/kubernetes/helm_module.html)
+- Review the requirements for the [Ansible helm wrapper](https://docs.ansible.com/ansible/2.10/collections/kubernetes.core/helm_module.html)
 
 - GKE: a Cloud Armor Security must exist for the Load Balancer to associate with
 
 Note: Tested with:
 
-- Ansible collection `community.kubernetes:1.0.0`
-- k8s versions 1.19 - 1.23
-- Helm v3.3.1
+- Ansible: 2.17
+- Ansible collection: `kubernetes.core:6.0.0`
+- Kubernetes: 1.27 - 1.33
+- Helm: v3.17.3
 
 ## Executing
 
 To deploy:
 
 ```sh
 # Install reprequisites
-ansible-galaxy collection install community.kubernetes
+ansible-galaxy collection install kubernetes.core
 
 # Update helm dependencies from charts directory
 helm dependency update ./charts/placeos
@@ -42,6 +43,17 @@ helm dependency update ./charts/placeos
 cd ansible
 ```
 
+Set cluster info values in the relevant inventory `host_vars/k8s.yaml` file:
+(or use `-e` flags to set when running the playbook)
+
+```yaml
+# Cluster Info ConfigMap (used by admins and upgrade jobs)
+cluster_info:
+  name: "default" # eg. PlaceOS PROD
+  environment: "default" # eg. production, staging, development
+  region: "default" # eg. australiaeast
+```
+
 ### Local deployment to k3d
 ```sh
 # Check first be for deploying
@@ -74,6 +86,15 @@ ansible-playbook placeos.yaml -i inventories/aks/ -e "internalLB=true"
 ansible-playbook placeos-network-policies.yaml
 ```
 
+### AWS deployment
+```sh
+# Check first be for deploying
+ansible-playbook placeos.yaml -i inventories/gke/  --check
+# Define the placeDomain value when running:
+ansible-playbook placeos.yaml -i inventories/gke/ -e "placeDomain={domain/{external IP.sslip.io}}"
+ansible-playbook placeos-network-policies.yaml
+```
+
 To cleanup:
 
 ```sh