From be22e19f9af99c5d687f02162c735c3ce0ed7a43 Mon Sep 17 00:00:00 2001 From: Leonardo Rossetti Date: Jan 17 2022 12:12:40 +0000 Subject: [PATCH 1/9] addint NodePort as service type --- diff --git a/operator/roles/koji-hub/templates/service.yml.j2 b/operator/roles/koji-hub/templates/service.yml.j2 index d666c33..872eae6 100644 --- a/operator/roles/koji-hub/templates/service.yml.j2 +++ b/operator/roles/koji-hub/templates/service.yml.j2 @@ -8,6 +8,7 @@ metadata: spec: selector: app: koji-hub + type: NodePort ports: {% if koji_hub_http_enabled %} - name: http From f365af53257eceee7e0331ed8574c39d876283cd Mon Sep 17 00:00:00 2001 From: Leonardo Rossetti Date: Jan 17 2022 12:13:17 +0000 Subject: [PATCH 2/9] removing ingress from koji-hub roles --- diff --git a/operator/roles/koji-hub/tasks/main.yml b/operator/roles/koji-hub/tasks/main.yml index 77ad018..c11eaec 100644 --- a/operator/roles/koji-hub/tasks/main.yml +++ b/operator/roles/koji-hub/tasks/main.yml @@ -77,37 +77,6 @@ when: koji_hub_http_enabled - block: - - name: Apply koji-hub ingress - template: - src: ingress.yml.j2 - dest: /tmp/ingress.yml - vars: - koji_hub_ingress_name: "koji-hub-{{ meta.name }}-http" - koji_hub_ingress_svc: "{{ koji_hub_svc_name }}" - koji_hub_ingress_port: "{{ koji_hub_http_port }}" - - k8s: - state: present - src: /tmp/ingress.yml - wait: true - namespace: "{{ meta.namespace }}" - when: koji_hub_ingress_backend != 'openshift' - -- block: - - name: Apply koji-hub openshift route - template: - src: openshift-route.yml.j2 - dest: /tmp/openshift-route.yml - vars: - koji_hub_route_name: koji - koji_hub_route_svc: "{{ koji_hub_svc_name }}" - - k8s: - state: present - src: /tmp/openshift-route.yml - wait: true - namespace: "{{ meta.namespace }}" - when: koji_hub_ingress_backend == 'openshift' - -- block: - name: Apply koji-hub deployment template: src: deployment.yml.j2 From 33b2682f25621fe55a9de3fcc59d6c03d53d2804 Mon Sep 17 00:00:00 2001 From: Leonardo Rossetti Date: Jan 17 2022 12:17:26 +0000 Subject: [PATCH 3/9] removing when clause for koji-hub service creation --- diff --git a/operator/roles/koji-hub/tasks/main.yml b/operator/roles/koji-hub/tasks/main.yml index c11eaec..286b69f 100644 --- a/operator/roles/koji-hub/tasks/main.yml +++ b/operator/roles/koji-hub/tasks/main.yml @@ -74,7 +74,6 @@ src: /tmp/service.yml wait: true namespace: "{{ meta.namespace }}" - when: koji_hub_http_enabled - block: - name: Apply koji-hub deployment From 2bacb89348def858c45e88b0479f5d2e12ea3cf4 Mon Sep 17 00:00:00 2001 From: Leonardo Rossetti Date: Jan 17 2022 12:24:29 +0000 Subject: [PATCH 4/9] koji-builder image to fedora 35 + entrypoint fix --- diff --git a/images/koji-builder/Dockerfile b/images/koji-builder/Dockerfile index fe66176..85212e9 100644 --- a/images/koji-builder/Dockerfile +++ b/images/koji-builder/Dockerfile @@ -1,8 +1,8 @@ -FROM quay.io/fedora/fedora:34 +FROM quay.io/fedora/fedora:35 -RUN yum install -y koji-builder +RUN dnf install -y koji-builder -COPY entrypoint.sh /entrypoint.sh +COPY entrypoint.sh entrypoint.sh RUN chmod +x /entrypoint.sh && \ chown 1001:root /entrypoint.sh diff --git a/images/koji-builder/entrypoint.sh b/images/koji-builder/entrypoint.sh index c274f23..0dd8b94 100644 --- a/images/koji-builder/entrypoint.sh +++ b/images/koji-builder/entrypoint.sh @@ -1,4 +1,3 @@ #!/bin/bash -update-ca-trust exec /usr/sbin/kojid --fg --force-lock --verbose From a2bdb3ace2c76d7c9bf10ec05ccbd5870345cd82 Mon Sep 17 00:00:00 2001 From: Leonardo Rossetti Date: Jan 17 2022 13:59:50 +0000 Subject: [PATCH 5/9] kojira image changes --- diff --git a/images/kojira/Dockerfile b/images/kojira/Dockerfile index 2eb3c9d..99bbcd6 100644 --- a/images/kojira/Dockerfile +++ b/images/kojira/Dockerfile @@ -1,6 +1,6 @@ -FROM quay.io/fedora/fedora:34 +FROM quay.io/fedora/fedora:35 -RUN yum install -y koji-utils +RUN dnf install -y procps-ng koji-utils COPY entrypoint.sh /entrypoint.sh From db0c9968dc1043b3e82a7d448674af3f51d75ebb Mon Sep 17 00:00:00 2001 From: Leonardo Rossetti Date: Jan 17 2022 14:00:22 +0000 Subject: [PATCH 6/9] kojira koji-hub service url port --- diff --git a/operator/roles/kojira/tasks/main.yml b/operator/roles/kojira/tasks/main.yml index 5693267..017733d 100644 --- a/operator/roles/kojira/tasks/main.yml +++ b/operator/roles/kojira/tasks/main.yml @@ -33,7 +33,7 @@ kojira_replicas: 1 kojira_configmap: "kojira-{{ meta.name }}-conf" kojira_hub_username: "{{ meta.name }}" - kojira_hub_host: "koji-hub-{{ kojira_hub_name }}.{{ kojira_hub_namespace }}.svc.cluster.local" + kojira_hub_host: "koji-hub-{{ kojira_hub_name }}.{{ kojira_hub_namespace }}.svc.cluster.local:8443" kojira_cacert_secret: "koji-hub-{{ kojira_hub_name }}-ca" kojira_client_cert_secret: "kojira-{{ meta.name }}-client-cert" kojira_shared_pvc: "koji-hub-{{ kojira_hub_name }}" From d7b4bc7112e0d9c1fefd686b6bd38c3d61ba33ed Mon Sep 17 00:00:00 2001 From: Leonardo Rossetti Date: Jan 17 2022 14:00:34 +0000 Subject: [PATCH 7/9] koji-builder koji-hub service url port --- diff --git a/operator/roles/koji-builder/tasks/main.yml b/operator/roles/koji-builder/tasks/main.yml index b71c2d3..fe39c2e 100644 --- a/operator/roles/koji-builder/tasks/main.yml +++ b/operator/roles/koji-builder/tasks/main.yml @@ -30,7 +30,7 @@ - name: Play variables setup set_fact: - koji_builder_koji_hub_url: "https://koji-hub-{{ koji_builder_hub_name }}.{{ koji_builder_hub_namespace }}.svc.cluster.local" + koji_builder_koji_hub_url: "https://koji-hub-{{ koji_builder_hub_name }}.{{ koji_builder_hub_namespace }}.svc.cluster.local:8443" koji_builder_cacert_secret: "koji-hub-{{ koji_builder_hub_name }}-ca" koji_dir_path: "{{ koji_dir.path }}" koji_builder_configmap: "kojid-{{ meta.name }}-conf" From 26af7889a1cb49743fe23d96f96b9556096114ba Mon Sep 17 00:00:00 2001 From: Leonardo Rossetti Date: Jan 17 2022 16:03:53 +0000 Subject: [PATCH 8/9] koji-hub image to fedora 35 --- diff --git a/images/koji-hub/Dockerfile b/images/koji-hub/Dockerfile index c96dcb8..91cd305 100644 --- a/images/koji-hub/Dockerfile +++ b/images/koji-hub/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/fedora/fedora:34 +FROM quay.io/fedora/fedora:35 RUN dnf install --setopt=tsflags= -y \ koji koji-hub koji-web koji-hub-plugins \ From 3d225e60b8575c32cfe9c7fcf9db107380f50991 Mon Sep 17 00:00:00 2001 From: Leonardo Rossetti Date: Jan 19 2022 13:48:04 +0000 Subject: [PATCH 9/9] koji-builder-kubevirt image to fedora 35 --- diff --git a/images/koji-builder-kubevirt/Dockerfile b/images/koji-builder-kubevirt/Dockerfile index 8047d5e..f0a9d36 100644 --- a/images/koji-builder-kubevirt/Dockerfile +++ b/images/koji-builder-kubevirt/Dockerfile @@ -1,5 +1,5 @@ FROM scratch -ARG IMAGE=https://download.fedoraproject.org/pub/fedora/linux/releases/34/Cloud/x86_64/images/Fedora-Cloud-Base-34-1.2.x86_64.qcow2 +ARG IMAGE=https://download.fedoraproject.org/pub/fedora/linux/releases/35/Cloud/x86_64/images/Fedora-Cloud-Base-35-1.2.x86_64.qcow2 ADD ${IMAGE} /disk/ diff --git a/operator/molecule/default/tasks/kojihub_test.yml b/operator/molecule/default/tasks/kojihub_test.yml index 6f87df1..986db27 100644 --- a/operator/molecule/default/tasks/kojihub_test.yml +++ b/operator/molecule/default/tasks/kojihub_test.yml @@ -93,21 +93,8 @@ kind: Service namespace: "{{ namespace }}" name: koji-hub-sample - register: kojihub_ingress + register: kojihub_svcs - assert: that: - - kojihub_ingress.resources|length == 1 - - kojihub_ingress.resources[0].metadata.labels['app'] == 'koji-hub' - -- block: - - name: 'TEST: kojihub.ingress.http' - k8s_info: - api_version: networking.k8s.io/v1 - kind: Ingress - namespace: "{{ namespace }}" - name: koji-hub-sample-http - register: kojihub_ingress - - assert: - that: - - kojihub_ingress.resources|length == 1 - - kojihub_ingress.resources[0].metadata.labels['app'] == 'koji-hub' + - kojihub_svcs.resources|length == 1 + - kojihub_svcs.resources[0].metadata.labels['app'] == 'koji-hub'