feat: Changes to support deployment to k8s 1.30

Author: Alan Christie

README.md

@@ -122,14 +122,26 @@ To remove the operator (assuming there are no operator-derived instances)...
 The parameters used to deploy the operator to our 'official' cluster
 are held in this repository.
 
-To deploy: -
+To deploy the operator itself run the main 'site' playbook with
+a suitable set of parameters: -
 
     export KUBECONFIG=~/k8s-config/config-aws-im-main-eks
     export PARAMS=staging
     ansible-playbook -e @${PARAMS}-parameters.yaml site.yaml
 
->   You will need the vault password, held in the company's KeePass under
-    `data-manager-jupyter-operator -> Ansible Vault Password`
+Then, you must run the `site_dm` playbook to for each Data Manager
+you wish to configure: -
+
+    ansible-playbook -e @${PARAMS}-parameters.yaml \
+        -e jo_dmapi_namespace=data-manager-api-dev \
+        site_dm.yaml
+
+    ansible-playbook -e @${PARAMS}-parameters.yaml \
+        -e jo_dmapi_namespace=data-manager-api-test \
+        site_dm.yaml
+
+This wil install the RBAC and configuration objects for Jupyter
+to the DM namespace.
 
 # Data Manager Application Compliance
 In order to expose the CRD as an _Application_ in the Data Manager API service

requirements.txt

@@ -1,2 +1,3 @@
 ansible == 8.2.0
+kubernetes == 31.0.0
 openshift == 0.13.1

roles/operator/templates/rbac.yaml.j2

@@ -34,10 +34,6 @@ rules:
 - apiGroups: [networking.k8s.io]
   resources: [ingresses]
   verbs: [create]
-- apiGroups: ['policy']
-  resources: ['podsecuritypolicies']
-  verbs: ['use']
-  resourceNames: ['{{ jo_sa_psp }}']
 
 ---
 kind: ClusterRoleBinding

xchem-nw-dev-parameters.yaml

@@ -0,0 +1,11 @@
+---
+
+jo_image_tag: 31.0.0
+jo_dmapi_namespace: data-manager-api-dev
+
+jo_ingress_domain: data-manager.xchem-dev.diamond.ac.uk
+jo_ingress_tls_secret: data-manager-api-tls
+jo_namespaces: data-manager-api-dev:data-manager-api-test
+jo_fallback_node_selector_key: informaticsmatters.com/purpose-core
+
+jo_kubeconfig: "{{ lookup('env', 'KUBECONFIG') }}"