From f7fb7cbe03bebee98d197351c7aca18b8a8262f7 Mon Sep 17 00:00:00 2001 From: David Kirwan Date: Tue, 21 Oct 2025 11:58:16 +0100 Subject: [PATCH] forgejo: add task for creating runnerhost vm Signed-off-by: David Kirwan --- .../tasks/{call-helm.yml => call-helm.yaml} | 0 .../tasks/create-forgejo-namespace.yaml | 11 ++++ .../tasks/create-forgejo-namespace.yml | 11 ---- ...orgejo-pvc.yml => create-forgejo-pvc.yaml} | 0 .../tasks/create-forgejo-runnerhost-vm.yaml | 11 ++++ ...l => create-postgres-operator-config.yaml} | 0 .../{deploy-valkey.yml => deploy-valkey.yaml} | 0 roles/openshift-apps/forgejo/tasks/main.yaml | 12 ++++ roles/openshift-apps/forgejo/tasks/main.yml | 11 ---- ...space.yml.j2 => forgejo-namespace.yaml.j2} | 0 .../templates/forgejo-runnerhost-vm.yaml.j2 | 60 +++++++++++++++++++ 11 files changed, 94 insertions(+), 22 deletions(-) rename roles/openshift-apps/forgejo/tasks/{call-helm.yml => call-helm.yaml} (100%) create mode 100644 roles/openshift-apps/forgejo/tasks/create-forgejo-namespace.yaml delete mode 100644 roles/openshift-apps/forgejo/tasks/create-forgejo-namespace.yml rename roles/openshift-apps/forgejo/tasks/{create-forgejo-pvc.yml => create-forgejo-pvc.yaml} (100%) create mode 100644 roles/openshift-apps/forgejo/tasks/create-forgejo-runnerhost-vm.yaml rename roles/openshift-apps/forgejo/tasks/{create-postgres-operator-config.yml => create-postgres-operator-config.yaml} (100%) rename roles/openshift-apps/forgejo/tasks/{deploy-valkey.yml => deploy-valkey.yaml} (100%) create mode 100644 roles/openshift-apps/forgejo/tasks/main.yaml delete mode 100644 roles/openshift-apps/forgejo/tasks/main.yml rename roles/openshift-apps/forgejo/templates/{forgejo-namespace.yml.j2 => forgejo-namespace.yaml.j2} (100%) create mode 100644 roles/openshift-apps/forgejo/templates/forgejo-runnerhost-vm.yaml.j2 diff --git a/roles/openshift-apps/forgejo/tasks/call-helm.yml b/roles/openshift-apps/forgejo/tasks/call-helm.yaml similarity index 100% rename from roles/openshift-apps/forgejo/tasks/call-helm.yml rename to roles/openshift-apps/forgejo/tasks/call-helm.yaml diff --git a/roles/openshift-apps/forgejo/tasks/create-forgejo-namespace.yaml b/roles/openshift-apps/forgejo/tasks/create-forgejo-namespace.yaml new file mode 100644 index 0000000000..152744f23a --- /dev/null +++ b/roles/openshift-apps/forgejo/tasks/create-forgejo-namespace.yaml @@ -0,0 +1,11 @@ +--- +- name: Generate the forgejo-namespace.yaml from template + ansible.builtin.template: + src: "forgejo-namespace.yaml.j2" + dest: "/root/ocp4/openshift-apps/forgejo/forgejo-namespace.yaml" + mode: "0770" + +- name: Deploy the forgejo-namespace.yaml config + kubernetes.core.k8s: + state: present + src: "/root/ocp4/openshift-apps/forgejo/forgejo-namespace.yaml" diff --git a/roles/openshift-apps/forgejo/tasks/create-forgejo-namespace.yml b/roles/openshift-apps/forgejo/tasks/create-forgejo-namespace.yml deleted file mode 100644 index eebbd08fcc..0000000000 --- a/roles/openshift-apps/forgejo/tasks/create-forgejo-namespace.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -- name: Generate the forgejo-namespace.yml from template - ansible.builtin.template: - src: "forgejo-namespace.yml.j2" - dest: "/root/ocp4/openshift-apps/forgejo/forgejo-namespace.yml" - mode: "0770" - -- name: Deploy the forgejo-namespace.yml config - kubernetes.core.k8s: - state: present - src: "/root/ocp4/openshift-apps/forgejo/forgejo-namespace.yml" diff --git a/roles/openshift-apps/forgejo/tasks/create-forgejo-pvc.yml b/roles/openshift-apps/forgejo/tasks/create-forgejo-pvc.yaml similarity index 100% rename from roles/openshift-apps/forgejo/tasks/create-forgejo-pvc.yml rename to roles/openshift-apps/forgejo/tasks/create-forgejo-pvc.yaml diff --git a/roles/openshift-apps/forgejo/tasks/create-forgejo-runnerhost-vm.yaml b/roles/openshift-apps/forgejo/tasks/create-forgejo-runnerhost-vm.yaml new file mode 100644 index 0000000000..fe5ae1b45f --- /dev/null +++ b/roles/openshift-apps/forgejo/tasks/create-forgejo-runnerhost-vm.yaml @@ -0,0 +1,11 @@ +--- +- name: Generate the forgejo-runnerhost-vm.yaml from template + ansible.builtin.template: + src: "forgejo-runnerhost-vm.yaml.j2" + dest: "/root/ocp4/openshift-apps/forgejo/forgejo-runnerhost-vm.yaml" + mode: "0770" + +- name: Deploy the forgejo-runnerhost-vm.yaml config + kubernetes.core.k8s: + state: present + src: "/root/ocp4/openshift-apps/forgejo/forgejo-runnerhost-vm.yaml" diff --git a/roles/openshift-apps/forgejo/tasks/create-postgres-operator-config.yml b/roles/openshift-apps/forgejo/tasks/create-postgres-operator-config.yaml similarity index 100% rename from roles/openshift-apps/forgejo/tasks/create-postgres-operator-config.yml rename to roles/openshift-apps/forgejo/tasks/create-postgres-operator-config.yaml diff --git a/roles/openshift-apps/forgejo/tasks/deploy-valkey.yml b/roles/openshift-apps/forgejo/tasks/deploy-valkey.yaml similarity index 100% rename from roles/openshift-apps/forgejo/tasks/deploy-valkey.yml rename to roles/openshift-apps/forgejo/tasks/deploy-valkey.yaml diff --git a/roles/openshift-apps/forgejo/tasks/main.yaml b/roles/openshift-apps/forgejo/tasks/main.yaml new file mode 100644 index 0000000000..debc6e0e91 --- /dev/null +++ b/roles/openshift-apps/forgejo/tasks/main.yaml @@ -0,0 +1,12 @@ +--- +- name: Ensures /root/ocp4/openshift-apps/forgejo/ dir exists + ansible.builtin.file: + path: "/root/ocp4/openshift-apps/forgejo/" + state: directory + +- include_tasks: create-forgejo-namespace.yaml +- include_tasks: create-forgejo-pvc.yaml +- include_tasks: create-postgres-operator-config.yaml +#- include_tasks: deploy-valkey.yaml +- include_tasks: call-helm.yaml +- include_tasks: create-forgejo-runnerhost-vm.yaml diff --git a/roles/openshift-apps/forgejo/tasks/main.yml b/roles/openshift-apps/forgejo/tasks/main.yml deleted file mode 100644 index bd66fe2448..0000000000 --- a/roles/openshift-apps/forgejo/tasks/main.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -- name: Ensures /root/ocp4/openshift-apps/forgejo/ dir exists - ansible.builtin.file: - path: "/root/ocp4/openshift-apps/forgejo/" - state: directory - -- include_tasks: create-forgejo-namespace.yml -- include_tasks: create-forgejo-pvc.yml -- include_tasks: create-postgres-operator-config.yml -#- include_tasks: deploy-valkey.yml -- include_tasks: call-helm.yml diff --git a/roles/openshift-apps/forgejo/templates/forgejo-namespace.yml.j2 b/roles/openshift-apps/forgejo/templates/forgejo-namespace.yaml.j2 similarity index 100% rename from roles/openshift-apps/forgejo/templates/forgejo-namespace.yml.j2 rename to roles/openshift-apps/forgejo/templates/forgejo-namespace.yaml.j2 diff --git a/roles/openshift-apps/forgejo/templates/forgejo-runnerhost-vm.yaml.j2 b/roles/openshift-apps/forgejo/templates/forgejo-runnerhost-vm.yaml.j2 new file mode 100644 index 0000000000..31561ed403 --- /dev/null +++ b/roles/openshift-apps/forgejo/templates/forgejo-runnerhost-vm.yaml.j2 @@ -0,0 +1,60 @@ +apiVersion: kubevirt.io/v1 +kind: VirtualMachine +metadata: + annotations: + name: forgejo-runnerhost-vm + namespace: forgejo +spec: + dataVolumeTemplates: + - metadata: + creationTimestamp: null + name: forgejo-runnerhost-vm-volume + spec: + sourceRef: + kind: DataSource + name: fedora + namespace: openshift-virtualization-os-images + storage: + resources: + requests: + storage: 30Gi + instancetype: + kind: virtualmachineclusterinstancetype + name: u1.xlarge + preference: + kind: virtualmachineclusterpreference + name: fedora + runStrategy: Always + template: + metadata: + creationTimestamp: null + labels: + network.kubevirt.io/headlessService: headless + spec: + architecture: amd64 + domain: + devices: + autoattachPodInterface: false + interfaces: + - macAddress: 02:79:58:00:00:00 + masquerade: {} + name: default + machine: + type: pc-q35-rhel9.6.0 + resources: {} + networks: + - name: default + pod: {} + subdomain: headless + volumes: + - dataVolume: + name: fedora-forgejo-runnerhost-volume + name: rootdisk + - cloudInitNoCloud: + userData: | + #cloud-config + chpasswd: + expire: false + password: japx-h11n-xufh + user: fedora + name: cloudinitdisk