Bladeren bron

add patches for template version and connect cluster, bunch of todos

Grega Bremec 4 weken geleden
bovenliggende
commit
b95ef0ded6

+ 8 - 0
playbooks/roles/install-labs/defaults/main.yml

@@ -7,4 +7,12 @@ lab_index_url: https://pypi.apps.tools-na.prod.nextcle.com/repository/labs/simpl
 lab_files_fixes:
   - patch: files/kafka-cluster-template.patch
     target: "{{ ansible_facts['user_dir'] }}/.local/lib/python3.9/site-packages/ad482/common/kubefiles/templates/cluster.yaml"
+  - patch: files/template-apiversion.patch
+    target: "{{ ansible_facts['user_dir'] }}/.local/lib/python3.9/site-packages/ad482/common/kubefiles/templates/cluster.yaml"
+  - patch: files/connect-cluster-template.patch
+    target: "{{ ansible_facts['user_dir'] }}/.local/lib/python3.9/site-packages/ad482/common/kubefiles/templates/connect-cluster.yaml"
+  - patch: files/template-apiversion.patch
+    target: "{{ ansible_facts['user_dir'] }}/.local/lib/python3.9/site-packages/ad482/common/kubefiles/templates/connect-cluster.yaml"
+  - patch: files/template-apiversion.patch
+    target: "{{ ansible_facts['user_dir'] }}/.local/lib/python3.9/site-packages/ad482/common/kubefiles/templates/elasticsearch.yaml"
 ...

+ 11 - 0
playbooks/roles/install-labs/files/connect-cluster-template.patch

@@ -0,0 +1,11 @@
+--- connect-cluster.yaml.orig	2025-11-30 09:50:22
++++ connect-cluster.yaml	2025-11-30 09:52:09
+@@ -22,7 +22,7 @@
+         offset.storage.replication.factor: 1
+         status.storage.replication.factor: 1
+       replicas: 1
+-      version: 2.8.0
++      version: 3.9.0
+ parameters:
+   - name: CLUSTER_NAME
+     description: "Cluster Name"

+ 1 - 1
playbooks/roles/install-labs/files/kafka-cluster-template.patch

@@ -1,4 +1,4 @@
---- cluster.yaml-orig	2025-05-29 08:23:09.286814851 -0400
+--- cluster.yaml.orig	2025-05-29 08:23:09.286814851 -0400
 +++ cluster.yaml	2025-05-29 08:14:35.748238943 -0400
 @@ -11,7 +11,7 @@
        name: ${CLUSTER_NAME}

+ 7 - 0
playbooks/roles/install-labs/files/template-apiversion.patch

@@ -0,0 +1,7 @@
+--- template.yaml.orig	2025-11-30 09:46:25
++++ template.yaml	2025-11-30 09:46:35
+@@ -1,3 +1,3 @@
+-apiVersion: v1
++apiVersion: template.openshift.io/v1
+ kind: Template
+ metadata:

+ 9 - 0
playbooks/roles/install-labs/tasks/main.yml

@@ -10,6 +10,15 @@
 #     - patch: files/patch.patch
 #       target: some/file.txt
 #
+# TODO: ansible.posix.patch not found if you just run from playbook (syntax
+#       error?!?). Re-running goes well and finds the module.
+#
+# TODO: fix .m2/settings.xml
+#
+# TODO: set java to 11 (for the AD482 part)
+#
+# TODO: set java back to 21 (for the custom part)
+#
 - name: Upgrade pip
   ansible.builtin.pip:
     name: pip