From 01ace51513f35796641f1b8c11b75217f16de1c5 Mon Sep 17 00:00:00 2001 From: Ryan Lerch Date: Thu, 14 Nov 2024 18:59:42 +1000 Subject: [PATCH] [ansible-lint] prefix variable names for openshift/project role ansible-lint requires that variables for roles are prefixed with the name of the role. This commit prefixes the rvariables for the openshift/project role with project_ as required by ansible-lint Signed-off-by: Ryan Lerch --- playbooks/openshift-apps/application-monitoring.yml | 6 +++--- playbooks/openshift-apps/asknot.yml | 6 +++--- playbooks/openshift-apps/badges.yml | 6 +++--- playbooks/openshift-apps/blockerbugs.yml | 8 ++++---- playbooks/openshift-apps/bodhi.yml | 12 ++++++------ playbooks/openshift-apps/bugzilla2fedmsg.yml | 6 +++--- playbooks/openshift-apps/cloud-image-uploader.yml | 6 +++--- playbooks/openshift-apps/compose-tracker.yml | 6 +++--- playbooks/openshift-apps/coreos-cincinnati.yml | 6 +++--- playbooks/openshift-apps/coreos-koji-tagger.yml | 6 +++--- playbooks/openshift-apps/coreos-ostree-importer.yml | 6 +++--- playbooks/openshift-apps/datagrepper.yml | 12 ++++++------ playbooks/openshift-apps/datanommer.yml | 12 ++++++------ playbooks/openshift-apps/discourse2fedmsg.yml | 6 +++--- playbooks/openshift-apps/docsbuilding.yml | 10 +++++----- playbooks/openshift-apps/docstranslation.yml | 4 ++-- playbooks/openshift-apps/easyfix.yml | 6 +++--- playbooks/openshift-apps/elections.yml | 6 +++--- playbooks/openshift-apps/fasjson.yml | 12 ++++++------ playbooks/openshift-apps/fedocal.yml | 6 +++--- playbooks/openshift-apps/fedora-ostree-pruner.yml | 6 +++--- playbooks/openshift-apps/fedora-packages-static.yml | 6 +++--- playbooks/openshift-apps/flask-oidc-dev.yml | 6 +++--- playbooks/openshift-apps/flatpak-indexer.yml | 6 +++--- playbooks/openshift-apps/fmn.yml | 6 +++--- playbooks/openshift-apps/greenwave.yml | 6 +++--- playbooks/openshift-apps/ipsilon-website.yml | 6 +++--- playbooks/openshift-apps/kanban.yml | 8 ++++---- playbooks/openshift-apps/kerneltest.yml | 6 +++--- playbooks/openshift-apps/languages.yml | 6 +++--- playbooks/openshift-apps/maubot.yml | 6 +++--- playbooks/openshift-apps/mdapi.yml | 6 +++--- playbooks/openshift-apps/messaging-bridges.yml | 6 +++--- playbooks/openshift-apps/mirrormanager.yml | 8 ++++---- playbooks/openshift-apps/monitor_dashboard.yml | 6 +++--- playbooks/openshift-apps/monitor_gating.yml | 6 +++--- playbooks/openshift-apps/mote.yml | 4 ++-- playbooks/openshift-apps/noggin-centos.yml | 12 ++++++------ playbooks/openshift-apps/noggin.yml | 12 ++++++------ playbooks/openshift-apps/openscanhub.yml | 12 ++++++------ playbooks/openshift-apps/openvpn.yml | 4 ++-- playbooks/openshift-apps/oraculum.yml | 6 +++--- playbooks/openshift-apps/planet.yml | 6 +++--- playbooks/openshift-apps/poddlers.yml | 6 +++--- playbooks/openshift-apps/release-monitoring.yml | 6 +++--- playbooks/openshift-apps/resultsdb-ci-listener.yml | 6 +++--- playbooks/openshift-apps/resultsdb.yml | 6 +++--- playbooks/openshift-apps/review-stats.yml | 6 +++--- playbooks/openshift-apps/test-auth.yml | 6 +++--- playbooks/openshift-apps/testdays.yml | 6 +++--- playbooks/openshift-apps/the-new-hotness.yml | 6 +++--- playbooks/openshift-apps/toddlers.yml | 6 +++--- playbooks/openshift-apps/transtats.yml | 6 +++--- playbooks/openshift-apps/waiverdb.yml | 6 +++--- playbooks/openshift-apps/webhook2fedmsg.yml | 6 +++--- playbooks/openshift-apps/websites.yml | 8 ++++---- playbooks/openshift-apps/zezere.yml | 6 +++--- roles/openshift/project/defaults/main.yml | 10 +++++----- roles/openshift/project/tasks/main.yml | 10 +++++----- roles/openshift/project/templates/alertmanager.yml | 4 ++-- roles/openshift/project/templates/appowners.yml | 6 +++--- roles/openshift/project/templates/deployer.yml | 4 ++-- roles/openshift/project/templates/egresspolicy.yml | 4 ++-- roles/openshift/project/templates/imagebuilder.yml | 4 ++-- roles/openshift/project/templates/imagepuller.yml | 6 +++--- roles/openshift/project/templates/project.yml | 6 +++--- .../openshift/project/templates/prometheusRules.yml | 6 +++--- roles/openshift/project/templates/role-appowners.yml | 4 ++-- 68 files changed, 227 insertions(+), 227 deletions(-) diff --git a/playbooks/openshift-apps/application-monitoring.yml b/playbooks/openshift-apps/application-monitoring.yml index 4606164d12..973076cb8a 100644 --- a/playbooks/openshift-apps/application-monitoring.yml +++ b/playbooks/openshift-apps/application-monitoring.yml @@ -12,9 +12,9 @@ roles: # oc new-project application-monitoring - role: openshift/project - app: application-monitoring - description: Hosts the application monitoring operator - appowners: + project_app: application-monitoring + project_description: Hosts the application monitoring operator + project_appowners: - asaleh - siddharthvipul1 diff --git a/playbooks/openshift-apps/asknot.yml b/playbooks/openshift-apps/asknot.yml index df32f5fbd9..c3486cd98b 100644 --- a/playbooks/openshift-apps/asknot.yml +++ b/playbooks/openshift-apps/asknot.yml @@ -11,9 +11,9 @@ roles: - role: openshift/project - app: asknot - description: What can I do for Fedora - appowners: + project_app: asknot + project_description: What can I do for Fedora + project_appowners: - zlopez - kevin diff --git a/playbooks/openshift-apps/badges.yml b/playbooks/openshift-apps/badges.yml index 95f05189d4..5776e2f636 100644 --- a/playbooks/openshift-apps/badges.yml +++ b/playbooks/openshift-apps/badges.yml @@ -84,9 +84,9 @@ - rabbitmq_cluster - role: openshift/project - app: badges - description: "Badges" - appowners: + project_app: badges + project_description: "Badges" + project_appowners: - abompard - nphilipp - ryanlerch diff --git a/playbooks/openshift-apps/blockerbugs.yml b/playbooks/openshift-apps/blockerbugs.yml index fc238ea059..8f545d7529 100644 --- a/playbooks/openshift-apps/blockerbugs.yml +++ b/playbooks/openshift-apps/blockerbugs.yml @@ -76,12 +76,12 @@ roles: - role: openshift/project - app: blockerbugs - description: Blockerbugs - appowners: + project_app: blockerbugs + project_description: Blockerbugs + project_appowners: - frantisekz - adamwill - alert_users: + project_alert_users: - frantisekz tags: - appowners diff --git a/playbooks/openshift-apps/bodhi.yml b/playbooks/openshift-apps/bodhi.yml index 9137e08068..b654080d75 100644 --- a/playbooks/openshift-apps/bodhi.yml +++ b/playbooks/openshift-apps/bodhi.yml @@ -42,9 +42,9 @@ sent_topics: "{{ bodhi_sent_topics }}" - role: openshift/project - app: bodhi - description: bodhi - appowners: + project_app: bodhi + project_description: bodhi + project_appowners: - abompard - mattia - patrikp @@ -55,9 +55,9 @@ - apply-appowners when: env == "production" - role: openshift/project - app: bodhi - description: bodhi - appowners: + project_app: bodhi + project_description: bodhi + project_appowners: - abompard - ryanlerch - mattia diff --git a/playbooks/openshift-apps/bugzilla2fedmsg.yml b/playbooks/openshift-apps/bugzilla2fedmsg.yml index 313e3e50a0..348fda3bac 100644 --- a/playbooks/openshift-apps/bugzilla2fedmsg.yml +++ b/playbooks/openshift-apps/bugzilla2fedmsg.yml @@ -16,9 +16,9 @@ sent_topics: ^org\.fedoraproject\.{{ env_short }}\.bugzilla\..* - role: openshift/project - app: bugzilla2fedmsg - description: bugzilla2fedmsg - appowners: + project_app: bugzilla2fedmsg + project_description: bugzilla2fedmsg + project_appowners: - abompard - kevin tags: diff --git a/playbooks/openshift-apps/cloud-image-uploader.yml b/playbooks/openshift-apps/cloud-image-uploader.yml index e9fdd779dd..86c10b74f6 100644 --- a/playbooks/openshift-apps/cloud-image-uploader.yml +++ b/playbooks/openshift-apps/cloud-image-uploader.yml @@ -24,9 +24,9 @@ critical: 50 - role: openshift/project - app: cloud-image-uploader - description: AMQP consumer that uploads Cloud images to cloud providers - appowners: + project_app: cloud-image-uploader + project_description: AMQP consumer that uploads Cloud images to cloud providers + project_appowners: - jcline - role: openshift/object diff --git a/playbooks/openshift-apps/compose-tracker.yml b/playbooks/openshift-apps/compose-tracker.yml index eb45804b0c..a7e2806236 100644 --- a/playbooks/openshift-apps/compose-tracker.yml +++ b/playbooks/openshift-apps/compose-tracker.yml @@ -11,9 +11,9 @@ roles: - role: openshift/project - app: compose-tracker - description: Opens issues for failed Composes against https://pagure.io/releng/failed-composes/ - appowners: + project_app: compose-tracker + project_description: Opens issues for failed Composes against https://pagure.io/releng/failed-composes/ + project_appowners: - dustymabe - mizdebsk - humaton diff --git a/playbooks/openshift-apps/coreos-cincinnati.yml b/playbooks/openshift-apps/coreos-cincinnati.yml index dc27862c7a..686a45f5df 100644 --- a/playbooks/openshift-apps/coreos-cincinnati.yml +++ b/playbooks/openshift-apps/coreos-cincinnati.yml @@ -22,9 +22,9 @@ # to run: sudo rbac-playbook -l os_control_stg openshift-apps/coreos-cincinnati.yml roles: - role: openshift/project - app: coreos-cincinnati - description: Fedora CoreOS Cincinnati backend - appowners: + project_app: coreos-cincinnati + project_description: Fedora CoreOS Cincinnati backend + project_appowners: - jlebon - dustymabe - siosm diff --git a/playbooks/openshift-apps/coreos-koji-tagger.yml b/playbooks/openshift-apps/coreos-koji-tagger.yml index dfc935ab66..b6db088da5 100644 --- a/playbooks/openshift-apps/coreos-koji-tagger.yml +++ b/playbooks/openshift-apps/coreos-koji-tagger.yml @@ -15,9 +15,9 @@ # to run: sudo rbac-playbook -l os_control_stg openshift-apps/coreos-koji-tagger.yml roles: - role: openshift/project - app: coreos-koji-tagger - description: Tags builds into koji tags within Fedora's Koji instance - appowners: + project_app: coreos-koji-tagger + project_description: Tags builds into koji tags within Fedora's Koji instance + project_appowners: - c4rt0 - dustymabe - jlebon diff --git a/playbooks/openshift-apps/coreos-ostree-importer.yml b/playbooks/openshift-apps/coreos-ostree-importer.yml index a3e01e35a4..f28c77dc04 100644 --- a/playbooks/openshift-apps/coreos-ostree-importer.yml +++ b/playbooks/openshift-apps/coreos-ostree-importer.yml @@ -35,9 +35,9 @@ # to run: sudo rbac-playbook -l os_control_stg openshift-apps/coreos-ostree-importer.yml roles: - role: openshift/project - app: coreos-ostree-importer - description: Imports OSTree commits into Fedora from the Fedora CoreOS pipeline - appowners: + project_app: coreos-ostree-importer + project_description: Imports OSTree commits into Fedora from the Fedora CoreOS pipeline + project_appowners: - dustymabe - jlebon - kevin diff --git a/playbooks/openshift-apps/datagrepper.yml b/playbooks/openshift-apps/datagrepper.yml index 875af01047..9c05ef9647 100644 --- a/playbooks/openshift-apps/datagrepper.yml +++ b/playbooks/openshift-apps/datagrepper.yml @@ -38,9 +38,9 @@ roles: - role: openshift/project - app: datagrepper - description: "Query the message history" - appowners: + project_app: datagrepper + project_description: "Query the message history" + project_appowners: - abompard - ryanlerch - kevin @@ -48,9 +48,9 @@ - apply-appowners when: env == "production" - role: openshift/project - app: datagrepper - description: "Query the message history" - appowners: + project_app: datagrepper + project_description: "Query the message history" + project_appowners: - abompard - ryanlerch - james02135 diff --git a/playbooks/openshift-apps/datanommer.yml b/playbooks/openshift-apps/datanommer.yml index 07b43ce375..e6d13b10cf 100644 --- a/playbooks/openshift-apps/datanommer.yml +++ b/playbooks/openshift-apps/datanommer.yml @@ -22,9 +22,9 @@ sent_topics: ^$ - role: openshift/project - app: datanommer - description: "Fedora messaging consumer" - appowners: + project_app: datanommer + project_description: "Fedora messaging consumer" + project_appowners: - abompard - ryanlerch - james02135 @@ -35,9 +35,9 @@ when: env == "production" - role: openshift/project - app: datanommer - description: "Fedora messaging consumer" - appowners: + project_app: datanommer + project_description: "Fedora messaging consumer" + project_appowners: - abompard - ryanlerch - james02135 diff --git a/playbooks/openshift-apps/discourse2fedmsg.yml b/playbooks/openshift-apps/discourse2fedmsg.yml index 618ca3dc20..75b79471fe 100644 --- a/playbooks/openshift-apps/discourse2fedmsg.yml +++ b/playbooks/openshift-apps/discourse2fedmsg.yml @@ -15,9 +15,9 @@ sent_topics: ^org\.fedoraproject\.{{ env_short }}\.discourse\..* - role: openshift/project - app: discourse2fedmsg - description: "Relay Discourse webhooks to Fedora Messaging" - appowners: + project_app: discourse2fedmsg + project_description: "Relay Discourse webhooks to Fedora Messaging" + project_appowners: - ryanlerch - abompard - kevin diff --git a/playbooks/openshift-apps/docsbuilding.yml b/playbooks/openshift-apps/docsbuilding.yml index 1f861ae59a..bdc0021f90 100644 --- a/playbooks/openshift-apps/docsbuilding.yml +++ b/playbooks/openshift-apps/docsbuilding.yml @@ -11,16 +11,16 @@ roles: - role: openshift/project - app: docsbuilding - description: Documentation building - alerting: true - appowners: + project_app: docsbuilding + project_description: Documentation building + project_alerting: true + project_appowners: - asamalik - jibecfed - dustymabe - darknao - pbokoc - alert_users: + project_alert_users: - darknao - pbokoc - kevin diff --git a/playbooks/openshift-apps/docstranslation.yml b/playbooks/openshift-apps/docstranslation.yml index d43facd201..a29b18f8bb 100644 --- a/playbooks/openshift-apps/docstranslation.yml +++ b/playbooks/openshift-apps/docstranslation.yml @@ -16,8 +16,8 @@ ansible.builtin.include_role: name: openshift/project vars: - description: Documentation translation - appowners: + project_description: Documentation translation + project_appowners: - asamalik - darknao - jibecfed diff --git a/playbooks/openshift-apps/easyfix.yml b/playbooks/openshift-apps/easyfix.yml index 73c536edfd..a5979ff186 100644 --- a/playbooks/openshift-apps/easyfix.yml +++ b/playbooks/openshift-apps/easyfix.yml @@ -17,9 +17,9 @@ roles: - role: openshift/project - app: easyfix - description: "Easyfixes" - appowners: + project_app: easyfix + project_description: "Easyfixes" + project_appowners: - abompard tags: - apply-appowners diff --git a/playbooks/openshift-apps/elections.yml b/playbooks/openshift-apps/elections.yml index 8798b21540..8718274dd8 100644 --- a/playbooks/openshift-apps/elections.yml +++ b/playbooks/openshift-apps/elections.yml @@ -37,9 +37,9 @@ sent_topics: ^org\.fedoraproject\.{{ env_short }}\.fedora_elections\..* - role: openshift/project - app: elections - description: Fedora Elections apps - appowners: + project_app: elections + project_description: Fedora Elections apps + project_appowners: - bcotton tags: - appowners diff --git a/playbooks/openshift-apps/fasjson.yml b/playbooks/openshift-apps/fasjson.yml index 245ea10d0e..ef8405d3de 100644 --- a/playbooks/openshift-apps/fasjson.yml +++ b/playbooks/openshift-apps/fasjson.yml @@ -13,9 +13,9 @@ roles: - role: openshift/project - app: fasjson - description: "Accounts API" - appowners: + project_app: fasjson + project_description: "Accounts API" + project_appowners: - abompard - nils - ryanlerch @@ -24,9 +24,9 @@ - apply-appowners when: env == "production" - role: openshift/project - app: fasjson - description: "Accounts API" - appowners: + project_app: fasjson + project_description: "Accounts API" + project_appowners: - abompard - nils - ryanlerch diff --git a/playbooks/openshift-apps/fedocal.yml b/playbooks/openshift-apps/fedocal.yml index f9f93d6a3e..f413783b5f 100644 --- a/playbooks/openshift-apps/fedocal.yml +++ b/playbooks/openshift-apps/fedocal.yml @@ -15,9 +15,9 @@ sent_topics: ^org\.fedoraproject\.{{ env_short }}\.fedocal\..* - role: openshift/project - app: fedocal - description: Fedora calendar apps - appowners: + project_app: fedocal + project_description: Fedora calendar apps + project_appowners: - kevin - role: openshift/object diff --git a/playbooks/openshift-apps/fedora-ostree-pruner.yml b/playbooks/openshift-apps/fedora-ostree-pruner.yml index 19a3338c11..d666ffe948 100644 --- a/playbooks/openshift-apps/fedora-ostree-pruner.yml +++ b/playbooks/openshift-apps/fedora-ostree-pruner.yml @@ -15,9 +15,9 @@ # to run: sudo rbac-playbook -l os_control_stg openshift-apps/fedora-ostree-pruner.yml roles: - role: openshift/project - app: fedora-ostree-pruner - description: Prunes OSTree repositories based on policy - appowners: + project_app: fedora-ostree-pruner + project_description: Prunes OSTree repositories based on policy + project_appowners: - dustymabe - jlebon - kevin diff --git a/playbooks/openshift-apps/fedora-packages-static.yml b/playbooks/openshift-apps/fedora-packages-static.yml index 4b3f6e6699..39ebb716b4 100644 --- a/playbooks/openshift-apps/fedora-packages-static.yml +++ b/playbooks/openshift-apps/fedora-packages-static.yml @@ -11,9 +11,9 @@ roles: - role: openshift/project - app: fedora-packages-static - description: Fedora fedora-packages-static apps - appowners: + project_app: fedora-packages-static + project_description: Fedora fedora-packages-static apps + project_appowners: - mymindstorm - kevin diff --git a/playbooks/openshift-apps/flask-oidc-dev.yml b/playbooks/openshift-apps/flask-oidc-dev.yml index bcbf26d855..37b97e10c7 100644 --- a/playbooks/openshift-apps/flask-oidc-dev.yml +++ b/playbooks/openshift-apps/flask-oidc-dev.yml @@ -13,9 +13,9 @@ roles: - role: openshift/project - app: flask-oidc-dev - description: "Authentication testing" - appowners: + project_app: flask-oidc-dev + project_description: "Authentication testing" + project_appowners: - abompard - dkirwan - jamricha diff --git a/playbooks/openshift-apps/flatpak-indexer.yml b/playbooks/openshift-apps/flatpak-indexer.yml index 67db805475..a0f72afaba 100644 --- a/playbooks/openshift-apps/flatpak-indexer.yml +++ b/playbooks/openshift-apps/flatpak-indexer.yml @@ -12,9 +12,9 @@ roles: - role: openshift/project - app: flatpak-indexer - description: Fedora Flatpak Indexer apps - appowners: + project_app: flatpak-indexer + project_description: Fedora Flatpak Indexer apps + project_appowners: - otaylor - kevin - kalev diff --git a/playbooks/openshift-apps/fmn.yml b/playbooks/openshift-apps/fmn.yml index 313338ef90..2295ed9bb6 100644 --- a/playbooks/openshift-apps/fmn.yml +++ b/playbooks/openshift-apps/fmn.yml @@ -114,9 +114,9 @@ roles: - role: openshift/project - app: fmn - description: "Fedora Messaging Notifications" - appowners: + project_app: fmn + project_description: "Fedora Messaging Notifications" + project_appowners: - abompard - ryanlerch - nphilipp diff --git a/playbooks/openshift-apps/greenwave.yml b/playbooks/openshift-apps/greenwave.yml index 1121cb8614..28dd7977c6 100644 --- a/playbooks/openshift-apps/greenwave.yml +++ b/playbooks/openshift-apps/greenwave.yml @@ -19,9 +19,9 @@ roles: - role: openshift/project - app: greenwave - description: greenwave - appowners: + project_app: greenwave + project_description: greenwave + project_appowners: - lholecek - vmaljulin - kevin diff --git a/playbooks/openshift-apps/ipsilon-website.yml b/playbooks/openshift-apps/ipsilon-website.yml index 1ffe353054..ed4dc870e7 100644 --- a/playbooks/openshift-apps/ipsilon-website.yml +++ b/playbooks/openshift-apps/ipsilon-website.yml @@ -13,9 +13,9 @@ roles: - role: openshift/project - app: ipsilon-website - description: "ipsilon-project.org" - appowners: + project_app: ipsilon-website + project_description: "ipsilon-project.org" + project_appowners: - abompard tags: - apply-appowners diff --git a/playbooks/openshift-apps/kanban.yml b/playbooks/openshift-apps/kanban.yml index 09aa5ac01a..f9255dfa0d 100644 --- a/playbooks/openshift-apps/kanban.yml +++ b/playbooks/openshift-apps/kanban.yml @@ -76,12 +76,12 @@ roles: - role: openshift/project - app: kanban - description: kanban - appowners: + project_app: kanban + project_description: kanban + project_appowners: - frantisekz - jskladan - alert_users: + project_alert_users: - frantisekz tags: - apply-appowners diff --git a/playbooks/openshift-apps/kerneltest.yml b/playbooks/openshift-apps/kerneltest.yml index c8135133f3..3557cf19bf 100644 --- a/playbooks/openshift-apps/kerneltest.yml +++ b/playbooks/openshift-apps/kerneltest.yml @@ -44,9 +44,9 @@ sent_topics: ^org\.fedoraproject\.{{ env_short }}\.kerneltest\..* - role: openshift/project - app: kerneltest - description: kerneltest - appowners: + project_app: kerneltest + project_description: kerneltest + project_appowners: - pingou - ryanlerch tags: diff --git a/playbooks/openshift-apps/languages.yml b/playbooks/openshift-apps/languages.yml index d8f3237203..208acd8eb8 100644 --- a/playbooks/openshift-apps/languages.yml +++ b/playbooks/openshift-apps/languages.yml @@ -11,9 +11,9 @@ roles: - role: openshift/project - app: languages - description: Localization measurement and tooling - appowners: + project_app: languages + project_description: Localization measurement and tooling + project_appowners: - darknao - jibecfed diff --git a/playbooks/openshift-apps/maubot.yml b/playbooks/openshift-apps/maubot.yml index 8e66ae854d..2a3144c013 100644 --- a/playbooks/openshift-apps/maubot.yml +++ b/playbooks/openshift-apps/maubot.yml @@ -36,9 +36,9 @@ sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(meetbot|maubot)\..* - role: openshift/project - app: maubot - description: Maubot - appowners: + project_app: maubot + project_description: Maubot + project_appowners: - ryanlerch - kevin diff --git a/playbooks/openshift-apps/mdapi.yml b/playbooks/openshift-apps/mdapi.yml index 56d8ef6422..d1d90f2afb 100644 --- a/playbooks/openshift-apps/mdapi.yml +++ b/playbooks/openshift-apps/mdapi.yml @@ -15,9 +15,9 @@ sent_topics: ^org\.fedoraproject\.{{ env_short }}\.mdapi\..* - role: openshift/project - app: mdapi - description: mdapi is a small API exposing the metadata contained in different RPM repositories. - appowners: + project_app: mdapi + project_description: mdapi is a small API exposing the metadata contained in different RPM repositories. + project_appowners: - t0xic0der - kevin diff --git a/playbooks/openshift-apps/messaging-bridges.yml b/playbooks/openshift-apps/messaging-bridges.yml index 3c5909bcd0..f19ea14f79 100644 --- a/playbooks/openshift-apps/messaging-bridges.yml +++ b/playbooks/openshift-apps/messaging-bridges.yml @@ -87,9 +87,9 @@ roles: - role: openshift/project - app: messaging-bridges - description: "ZeroMQ <-> AMQP bridges" - appowners: + project_app: messaging-bridges + project_description: "ZeroMQ <-> AMQP bridges" + project_appowners: - abompard - kevin tags: diff --git a/playbooks/openshift-apps/mirrormanager.yml b/playbooks/openshift-apps/mirrormanager.yml index 878c9cf94c..37e5a71765 100644 --- a/playbooks/openshift-apps/mirrormanager.yml +++ b/playbooks/openshift-apps/mirrormanager.yml @@ -46,13 +46,13 @@ - rabbitmq_cluster - role: openshift/project - app: mirrormanager - description: "MirrorManager" - appowners: + project_app: mirrormanager + project_description: "MirrorManager" + project_appowners: - abompard - nphilipp - adrian - allow_pod_creation: true + project_allow_pod_creation: true tags: - apply-appowners diff --git a/playbooks/openshift-apps/monitor_dashboard.yml b/playbooks/openshift-apps/monitor_dashboard.yml index 8de8d82801..2701c1dd78 100644 --- a/playbooks/openshift-apps/monitor_dashboard.yml +++ b/playbooks/openshift-apps/monitor_dashboard.yml @@ -13,9 +13,9 @@ roles: - role: openshift/project - app: monitor-dashboard - description: POC for the dashboards - appowners: + project_app: monitor-dashboard + project_description: POC for the dashboards + project_appowners: - nphilipp - asaleh diff --git a/playbooks/openshift-apps/monitor_gating.yml b/playbooks/openshift-apps/monitor_gating.yml index e149865056..c1937d6f4e 100644 --- a/playbooks/openshift-apps/monitor_gating.yml +++ b/playbooks/openshift-apps/monitor_gating.yml @@ -13,9 +13,9 @@ roles: - role: openshift/project - app: monitor-gating - description: Monitor the packager and gating workflow - appowners: + project_app: monitor-gating + project_description: Monitor the packager and gating workflow + project_appowners: - nphilipp - zlopez - patrikp diff --git a/playbooks/openshift-apps/mote.yml b/playbooks/openshift-apps/mote.yml index 9369def79e..6aaf87d2f9 100644 --- a/playbooks/openshift-apps/mote.yml +++ b/playbooks/openshift-apps/mote.yml @@ -12,8 +12,8 @@ roles: - role: openshift/project - description: Mote v2 - appowners: + project_description: Mote v2 + project_appowners: - darknao - t0xic0der - ryanlerch diff --git a/playbooks/openshift-apps/noggin-centos.yml b/playbooks/openshift-apps/noggin-centos.yml index 52773803c3..e3b1f9db68 100644 --- a/playbooks/openshift-apps/noggin-centos.yml +++ b/playbooks/openshift-apps/noggin-centos.yml @@ -17,9 +17,9 @@ sent_topics: ^org\.fedoraproject\.{{ env_short }}\.fas\..* - role: openshift/project - app: noggin-centos - description: "Self-service account portal" - appowners: + project_app: noggin-centos + project_description: "Self-service account portal" + project_appowners: - abompard - nils - ryanlerch @@ -27,9 +27,9 @@ - apply-appowners when: env == "production" - role: openshift/project - app: noggin-centos - description: "Self-service account portal" - appowners: + project_app: noggin-centos + project_description: "Self-service account portal" + project_appowners: - abompard - nils - ryanlerch diff --git a/playbooks/openshift-apps/noggin.yml b/playbooks/openshift-apps/noggin.yml index 1c8fa65483..afc6ff520e 100644 --- a/playbooks/openshift-apps/noggin.yml +++ b/playbooks/openshift-apps/noggin.yml @@ -17,9 +17,9 @@ sent_topics: ^org\.fedoraproject\.{{ env_short }}\.fas\..* - role: openshift/project - app: noggin - description: "Self-service account portal" - appowners: + project_app: noggin + project_description: "Self-service account portal" + project_appowners: - abompard - nils - ryanlerch @@ -27,9 +27,9 @@ - apply-appowners when: env == "production" - role: openshift/project - app: noggin - description: "Self-service account portal" - appowners: + project_app: noggin + project_description: "Self-service account portal" + project_appowners: - abompard - nils - ryanlerch diff --git a/playbooks/openshift-apps/openscanhub.yml b/playbooks/openshift-apps/openscanhub.yml index db883d0099..0df2ca5a6b 100644 --- a/playbooks/openshift-apps/openscanhub.yml +++ b/playbooks/openshift-apps/openscanhub.yml @@ -21,9 +21,9 @@ roles: - role: openshift/project - app: openscanhub - description: openscanhub - appowners: + project_app: openscanhub + project_description: openscanhub + project_appowners: - praiskup - svashisht - kevin @@ -32,9 +32,9 @@ - apply-appowners when: env == "production" - role: openshift/project - app: openscanhub - description: openscanhub - appowners: + project_app: openscanhub + project_description: openscanhub + project_appowners: - praiskup - svashisht - kevin diff --git a/playbooks/openshift-apps/openvpn.yml b/playbooks/openshift-apps/openvpn.yml index 8fd0be4215..5da5dd1ce0 100644 --- a/playbooks/openshift-apps/openvpn.yml +++ b/playbooks/openshift-apps/openvpn.yml @@ -14,8 +14,8 @@ roles: - role: openshift/project - description: Openvpn Client - appowners: + project_description: Openvpn Client + project_appowners: - kevin tags: - apply-appowners diff --git a/playbooks/openshift-apps/oraculum.yml b/playbooks/openshift-apps/oraculum.yml index dc678774c1..7124f5800f 100644 --- a/playbooks/openshift-apps/oraculum.yml +++ b/playbooks/openshift-apps/oraculum.yml @@ -50,9 +50,9 @@ roles: - role: openshift/project - app: oraculum - description: Packager Dashboard - appowners: + project_app: oraculum + project_description: Packager Dashboard + project_appowners: - frantisekz - jskladan tags: diff --git a/playbooks/openshift-apps/planet.yml b/playbooks/openshift-apps/planet.yml index 69bddcc41e..dc12379f0f 100644 --- a/playbooks/openshift-apps/planet.yml +++ b/playbooks/openshift-apps/planet.yml @@ -11,9 +11,9 @@ roles: - role: openshift/project - app: planet - description: "Fedora Planet" - appowners: + project_app: planet + project_description: "Fedora Planet" + project_appowners: - phsmoura - kevin tags: diff --git a/playbooks/openshift-apps/poddlers.yml b/playbooks/openshift-apps/poddlers.yml index 1b377c78e4..2763ae45b5 100644 --- a/playbooks/openshift-apps/poddlers.yml +++ b/playbooks/openshift-apps/poddlers.yml @@ -33,9 +33,9 @@ roles: - role: openshift/project - app: poddlers - description: Small fedora-messaging toddlers that keep running around in pods. - appowners: + project_app: poddlers + project_description: Small fedora-messaging toddlers that keep running around in pods. + project_appowners: - abompard - zlopez - kevin diff --git a/playbooks/openshift-apps/release-monitoring.yml b/playbooks/openshift-apps/release-monitoring.yml index 65d9e1ec2e..da19226585 100644 --- a/playbooks/openshift-apps/release-monitoring.yml +++ b/playbooks/openshift-apps/release-monitoring.yml @@ -15,9 +15,9 @@ username: "anitya{{ env_suffix }}" sent_topics: ^org\.release-monitoring\.{{ env_short }}\.anitya\..* - role: openshift/project - app: release-monitoring - description: release-monitoring - appowners: + project_app: release-monitoring + project_description: release-monitoring + project_appowners: - zlopez - role: openshift/secret-file app: release-monitoring diff --git a/playbooks/openshift-apps/resultsdb-ci-listener.yml b/playbooks/openshift-apps/resultsdb-ci-listener.yml index 079ce2c951..4c90be7a21 100644 --- a/playbooks/openshift-apps/resultsdb-ci-listener.yml +++ b/playbooks/openshift-apps/resultsdb-ci-listener.yml @@ -28,9 +28,9 @@ # The openshift/project role breaks if the project already exists: # https://pagure.io/fedora-infrastructure/issue/6404 - role: openshift/project - app: resultsdb-ci-listener - description: resultsdb-ci-listener - appowners: + project_app: resultsdb-ci-listener + project_description: resultsdb-ci-listener + project_appowners: - lholecek - vmaljulin - lrossett diff --git a/playbooks/openshift-apps/resultsdb.yml b/playbooks/openshift-apps/resultsdb.yml index fbb7935643..33c0d10014 100644 --- a/playbooks/openshift-apps/resultsdb.yml +++ b/playbooks/openshift-apps/resultsdb.yml @@ -45,9 +45,9 @@ # The openshift/project role breaks if the project already exists: # https://pagure.io/fedora-infrastructure/issue/6404 - role: openshift/project - app: resultsdb - description: resultsdb - appowners: + project_app: resultsdb + project_description: resultsdb + project_appowners: - lholecek - vmaljulin - lrossett diff --git a/playbooks/openshift-apps/review-stats.yml b/playbooks/openshift-apps/review-stats.yml index 1539de3993..be564b6488 100644 --- a/playbooks/openshift-apps/review-stats.yml +++ b/playbooks/openshift-apps/review-stats.yml @@ -11,9 +11,9 @@ roles: - role: openshift/project - app: review-stats - description: Generate HTML with statistics about Fedora review tickets - appowners: + project_app: review-stats + project_description: Generate HTML with statistics about Fedora review tickets + project_appowners: - mattia - kevin tags: diff --git a/playbooks/openshift-apps/test-auth.yml b/playbooks/openshift-apps/test-auth.yml index 1424383607..3f43b552f0 100644 --- a/playbooks/openshift-apps/test-auth.yml +++ b/playbooks/openshift-apps/test-auth.yml @@ -13,9 +13,9 @@ roles: - role: openshift/project - app: test-auth - description: "Authentication testing" - appowners: + project_app: test-auth + project_description: "Authentication testing" + project_appowners: - abompard tags: - apply-appowners diff --git a/playbooks/openshift-apps/testdays.yml b/playbooks/openshift-apps/testdays.yml index fc96ce2abb..71940ae222 100644 --- a/playbooks/openshift-apps/testdays.yml +++ b/playbooks/openshift-apps/testdays.yml @@ -64,9 +64,9 @@ roles: - role: openshift/project - app: testdays - description: The Fedora QE testdays application - appowners: + project_app: testdays + project_description: The Fedora QE testdays application + project_appowners: - frantisekz - jskladan tags: diff --git a/playbooks/openshift-apps/the-new-hotness.yml b/playbooks/openshift-apps/the-new-hotness.yml index e5bff29fe9..85b9596763 100644 --- a/playbooks/openshift-apps/the-new-hotness.yml +++ b/playbooks/openshift-apps/the-new-hotness.yml @@ -24,9 +24,9 @@ sent_topics: ^org\.fedoraproject\.{{ env_short }}\.hotness\..* - role: openshift/project - app: the-new-hotness - description: Fedora-messaging consumer that listens to the-new-hotness.org and files bugzilla bugs in response. - appowners: + project_app: the-new-hotness + project_description: Fedora-messaging consumer that listens to the-new-hotness.org and files bugzilla bugs in response. + project_appowners: - zlopez - role: openshift/keytab diff --git a/playbooks/openshift-apps/toddlers.yml b/playbooks/openshift-apps/toddlers.yml index 374e292652..5125fb5e0e 100644 --- a/playbooks/openshift-apps/toddlers.yml +++ b/playbooks/openshift-apps/toddlers.yml @@ -11,9 +11,9 @@ roles: - role: openshift/project - app: toddlers - description: Small fedora-messaging toddlers that keep running around - appowners: + project_app: toddlers + project_description: Small fedora-messaging toddlers that keep running around + project_appowners: - abompard - zlopez - kevin diff --git a/playbooks/openshift-apps/transtats.yml b/playbooks/openshift-apps/transtats.yml index 3141f98e64..c0a201059e 100644 --- a/playbooks/openshift-apps/transtats.yml +++ b/playbooks/openshift-apps/transtats.yml @@ -11,9 +11,9 @@ roles: - role: openshift/project - app: transtats - description: transtats - appowners: + project_app: transtats + project_description: transtats + project_appowners: - suanand - role: openshift/object app: transtats diff --git a/playbooks/openshift-apps/waiverdb.yml b/playbooks/openshift-apps/waiverdb.yml index 5431359d91..f3551df1ac 100644 --- a/playbooks/openshift-apps/waiverdb.yml +++ b/playbooks/openshift-apps/waiverdb.yml @@ -48,9 +48,9 @@ # The openshift/project role breaks if the project already exists: # https://pagure.io/fedora-infrastructure/issue/6404 - role: openshift/project - app: waiverdb - description: waiverdb - appowners: + project_app: waiverdb + project_description: waiverdb + project_appowners: - lholecek - vmaljulin - kevin diff --git a/playbooks/openshift-apps/webhook2fedmsg.yml b/playbooks/openshift-apps/webhook2fedmsg.yml index 474810739e..d6f78e6d81 100644 --- a/playbooks/openshift-apps/webhook2fedmsg.yml +++ b/playbooks/openshift-apps/webhook2fedmsg.yml @@ -39,9 +39,9 @@ sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(github|discourse)\..* - role: openshift/project - app: webhook2fedmsg - description: "Relay webhooks to Fedora Messaging" - appowners: + project_app: webhook2fedmsg + project_description: "Relay webhooks to Fedora Messaging" + project_appowners: - ryanlerch - abompard - t0xic0der diff --git a/playbooks/openshift-apps/websites.yml b/playbooks/openshift-apps/websites.yml index fb13e83df4..2d2e3177f0 100644 --- a/playbooks/openshift-apps/websites.yml +++ b/playbooks/openshift-apps/websites.yml @@ -12,10 +12,10 @@ roles: - role: openshift/project - app: websites - description: Fedora websites building - alerting: true - appowners: + project_app: websites + project_description: Fedora websites building + project_alerting: true + project_appowners: - ryanlerch - darknao - kevin diff --git a/playbooks/openshift-apps/zezere.yml b/playbooks/openshift-apps/zezere.yml index 142eb824eb..a8a5219d31 100644 --- a/playbooks/openshift-apps/zezere.yml +++ b/playbooks/openshift-apps/zezere.yml @@ -11,9 +11,9 @@ roles: - role: openshift/project - app: zezere - description: Zezere provisioning service - appowners: + project_app: zezere + project_description: Zezere provisioning service + project_appowners: - pbrobinson - role: openshift/imagestream app: zezere diff --git a/roles/openshift/project/defaults/main.yml b/roles/openshift/project/defaults/main.yml index b5450f1675..90984122b7 100644 --- a/roles/openshift/project/defaults/main.yml +++ b/roles/openshift/project/defaults/main.yml @@ -1,12 +1,12 @@ --- -allow_fas_db: false -allow_iad2: true -allow_pod_creation: false +project_allow_fas_db: false +project_allow_iad2: true +project_allow_pod_creation: false egress_policy_template: "{{roles_path}}/openshift/project/templates/egresspolicy.yml" -alerting: true -alert_rules: +project_alerting: true +project_alert_rules: - pod - cronjob - buildconfig diff --git a/roles/openshift/project/tasks/main.yml b/roles/openshift/project/tasks/main.yml index f67e418350..7eba090667 100644 --- a/roles/openshift/project/tasks/main.yml +++ b/roles/openshift/project/tasks/main.yml @@ -1,14 +1,14 @@ --- - name: Create project directory file: - path: /etc/openshift_apps/{{app}} + path: /etc/openshift_apps/{{project_app}} state: directory owner: root group: root mode: "0750" - name: Determine if project already exists - command: oc get project {{app}} + command: oc get project {{project_app}} register: project_exists failed_when: false changed_when: "'not found' in project_exists.stderr" @@ -16,10 +16,10 @@ - name: Copy project template template: src="{{roles_path}}/openshift/project/templates/project.yml" - dest=/etc/openshift_apps/{{app}}/project.yml + dest=/etc/openshift_apps/{{project_app}}/project.yml - name: Create project - shell: oc apply --validate=strict -f /etc/openshift_apps/{{app}}/project.yml + shell: oc apply --validate=strict -f /etc/openshift_apps/{{project_app}}/project.yml when: "'not found' in project_exists.stderr" - name: deployer.yml @@ -70,4 +70,4 @@ vars: objectname: prometheusRules.yml template_fullpath: "{{roles_path}}/openshift/project/templates/prometheusRules.yml" - when: alerting + when: project_alerting diff --git a/roles/openshift/project/templates/alertmanager.yml b/roles/openshift/project/templates/alertmanager.yml index 1bba28a134..bcafec246b 100644 --- a/roles/openshift/project/templates/alertmanager.yml +++ b/roles/openshift/project/templates/alertmanager.yml @@ -3,12 +3,12 @@ apiVersion: monitoring.coreos.com/v1beta1 kind: AlertmanagerConfig metadata: name: appowners-alerts - namespace: "{{app}}" + namespace: "{{project_app}}" spec: receivers: - emailConfigs: - sendResolved: true - to: "{{ alert_users | default(appowners) | product(['fedoraproject.org']) | map('join', '@') | join(',') }}" + to: "{{ project_alert_users | default(project_appowners) | product(['fedoraproject.org']) | map('join', '@') | join(',') }}" name: default route: groupBy: diff --git a/roles/openshift/project/templates/appowners.yml b/roles/openshift/project/templates/appowners.yml index 01155e0572..bde056c77e 100644 --- a/roles/openshift/project/templates/appowners.yml +++ b/roles/openshift/project/templates/appowners.yml @@ -2,12 +2,12 @@ apiVersion: authorization.openshift.io/v1 kind: RoleBinding metadata: - namespace: "{{app}}" + namespace: "{{project_app}}" name: appowners roleRef: name: appowner - namespace: "{{app}}" + namespace: "{{project_app}}" userNames: -{% for owner in appowners %} +{% for owner in project_appowners %} - {{ owner }} {% endfor %} diff --git a/roles/openshift/project/templates/deployer.yml b/roles/openshift/project/templates/deployer.yml index 736e69ce27..05feecb99f 100644 --- a/roles/openshift/project/templates/deployer.yml +++ b/roles/openshift/project/templates/deployer.yml @@ -5,11 +5,11 @@ kind: RoleBinding metadata: creationTimestamp: null name: system:deployers - namespace: "{{app}}" + namespace: "{{project_app}}" roleRef: name: system:deployer subjects: - kind: ServiceAccount name: deployer userNames: -- system:serviceaccount:{{app}}:deployer +- system:serviceaccount:{{project_app}}:deployer diff --git a/roles/openshift/project/templates/egresspolicy.yml b/roles/openshift/project/templates/egresspolicy.yml index cfffc41592..23b2362bac 100644 --- a/roles/openshift/project/templates/egresspolicy.yml +++ b/roles/openshift/project/templates/egresspolicy.yml @@ -5,7 +5,7 @@ metadata: name: default spec: egress: -{% if not allow_fas_db %} +{% if not project_allow_fas_db %} {% if env == "staging" %} - type: Deny to: @@ -16,7 +16,7 @@ spec: cidrSelector: "10.3.163.42/32" {% endif %} {% endif %} -{% if not allow_iad2 %} +{% if not project_allow_iad2 %} - type: Deny to: cidrSelector: "10.0.0.0/8" diff --git a/roles/openshift/project/templates/imagebuilder.yml b/roles/openshift/project/templates/imagebuilder.yml index 05da74afb3..8869776fe7 100644 --- a/roles/openshift/project/templates/imagebuilder.yml +++ b/roles/openshift/project/templates/imagebuilder.yml @@ -5,11 +5,11 @@ kind: RoleBinding metadata: creationTimestamp: null name: system:image-builders - namespace: "{{app}}" + namespace: "{{project_app}}" roleRef: name: system:image-builder subjects: - kind: ServiceAccount name: builder userNames: -- system:serviceaccount:{{app}}:builder +- system:serviceaccount:{{project_app}}:builder diff --git a/roles/openshift/project/templates/imagepuller.yml b/roles/openshift/project/templates/imagepuller.yml index 7ea30f73e1..6290f389fa 100644 --- a/roles/openshift/project/templates/imagepuller.yml +++ b/roles/openshift/project/templates/imagepuller.yml @@ -1,15 +1,15 @@ --- apiVersion: authorization.openshift.io/v1 groupNames: -- system:serviceaccounts:{{app}} +- system:serviceaccounts:{{project_app}} kind: RoleBinding metadata: creationTimestamp: null name: system:image-pullers - namespace: "{{app}}" + namespace: "{{project_app}}" roleRef: name: system:image-puller subjects: - kind: SystemGroup - name: system:serviceaccounts:{{app}} + name: system:serviceaccounts:{{project_app}} userNames: [] diff --git a/roles/openshift/project/templates/project.yml b/roles/openshift/project/templates/project.yml index b04b76f3c5..ad45f3d7c5 100644 --- a/roles/openshift/project/templates/project.yml +++ b/roles/openshift/project/templates/project.yml @@ -3,9 +3,9 @@ apiVersion: project.openshift.io/v1 kind: Project metadata: annotations: - openshift.io/description: "{{description}}" - openshift.io/display-name: "{{app}}" + openshift.io/description: "{{project_description}}" + openshift.io/display-name: "{{project_app}}" creationTimestamp: null - name: "{{app}}" + name: "{{project_app}}" spec: {} status: {} diff --git a/roles/openshift/project/templates/prometheusRules.yml b/roles/openshift/project/templates/prometheusRules.yml index 0d36427ad1..150a2e89ae 100644 --- a/roles/openshift/project/templates/prometheusRules.yml +++ b/roles/openshift/project/templates/prometheusRules.yml @@ -6,7 +6,7 @@ metadata: name: alerts spec: groups: -{% if 'cronjob' in alert_rules %} +{% if 'cronjob' in project_alert_rules %} - name: CronjobFailed rules: - alert: CronjobFailed @@ -18,7 +18,7 @@ spec: labels: severity: warning {% endif %} -{% if 'buildconfig' in alert_rules %} +{% if 'buildconfig' in project_alert_rules %} - name: BuildFailed rules: - alert: BuildFailed @@ -32,7 +32,7 @@ spec: labels: severity: warning {% endif %} -{% if 'pod' in alert_rules %} +{% if 'pod' in project_alert_rules %} - name: PodFailing rules: - alert: PodPending diff --git a/roles/openshift/project/templates/role-appowners.yml b/roles/openshift/project/templates/role-appowners.yml index ad5a95bed6..21ad7faf76 100644 --- a/roles/openshift/project/templates/role-appowners.yml +++ b/roles/openshift/project/templates/role-appowners.yml @@ -5,7 +5,7 @@ metadata: annotations: openshift.io/description: An application owner. Can view everything but ConfigMaps. name: appowner - namespace: "{{ app }}" + namespace: "{{ project_app }}" rules: {% if env == "staging" %} - apiGroups: ["monitoring.coreos.com"] @@ -42,7 +42,7 @@ rules: - get - list - watch -{% if env == "staging" or allow_pod_creation %} +{% if env == "staging" or project_allow_pod_creation %} - create - delete - update