From c611c75b9cdaf6abf590a2236cd128d27e8730d2 Mon Sep 17 00:00:00 2001 From: Jimmy Berry Date: Wed, 20 Feb 2019 18:35:01 -0600 Subject: [PATCH 1/4] dist/kiwi: add origin-manager subpackage. --- dist/kiwi/osrt-worker-obs.kiwi | 1 + 1 file changed, 1 insertion(+) diff --git a/dist/kiwi/osrt-worker-obs.kiwi b/dist/kiwi/osrt-worker-obs.kiwi index 2d003869..1dbc534d 100644 --- a/dist/kiwi/osrt-worker-obs.kiwi +++ b/dist/kiwi/osrt-worker-obs.kiwi @@ -22,6 +22,7 @@ + From dad98d8144e9f10f1275edc55bf262c0b3d42caa Mon Sep 17 00:00:00 2001 From: Jimmy Berry Date: Wed, 20 Feb 2019 18:35:28 -0600 Subject: [PATCH 2/4] dist/kubernetes: add origin-manager component. --- dist/kubernetes/app.yaml | 1 + .../components/origin-manager/params.libsonnet | 13 +++++++++++++ .../components/origin-manager/review.jsonnet | 12 ++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 dist/kubernetes/components/origin-manager/params.libsonnet create mode 100644 dist/kubernetes/components/origin-manager/review.jsonnet diff --git a/dist/kubernetes/app.yaml b/dist/kubernetes/app.yaml index b9e45534..e5e6c7f6 100644 --- a/dist/kubernetes/app.yaml +++ b/dist/kubernetes/app.yaml @@ -9,6 +9,7 @@ environments: targets: #- check-source - obs-operator + - origin-manager #- repo-checker kind: ksonnet.io/app name: openSUSE-release-tools diff --git a/dist/kubernetes/components/origin-manager/params.libsonnet b/dist/kubernetes/components/origin-manager/params.libsonnet new file mode 100644 index 00000000..5c78ee69 --- /dev/null +++ b/dist/kubernetes/components/origin-manager/params.libsonnet @@ -0,0 +1,13 @@ +{ + global: { + cpu: "100m", + memory: "128Mi", + cache: "100Mi", + image: null, + prefix: "origin-manager", + }, + components: { + review: { + }, + }, +} diff --git a/dist/kubernetes/components/origin-manager/review.jsonnet b/dist/kubernetes/components/origin-manager/review.jsonnet new file mode 100644 index 00000000..611053fe --- /dev/null +++ b/dist/kubernetes/components/origin-manager/review.jsonnet @@ -0,0 +1,12 @@ +local params = std.extVar("__ksonnet/params").components.review; +local review_bot = import '../review_bot.libsonnet'; + +[ + review_bot.parts.cache.base( + params.prefix, params.cache), + + review_bot.parts.cron.base( + params.prefix, "review", + "*/5 * * * *", params.cpu, params.memory, params.image, + "osrt-origin-manager --debug review"), +] From fc3f691d2c4927ece5c53135ee9330e3d618a9ca Mon Sep 17 00:00:00 2001 From: Jimmy Berry Date: Tue, 26 Feb 2019 08:24:30 -0600 Subject: [PATCH 3/4] dist/kubernetes: disable origin-manager component. --- dist/kubernetes/app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/kubernetes/app.yaml b/dist/kubernetes/app.yaml index e5e6c7f6..e72e6ed2 100644 --- a/dist/kubernetes/app.yaml +++ b/dist/kubernetes/app.yaml @@ -9,7 +9,7 @@ environments: targets: #- check-source - obs-operator - - origin-manager + #- origin-manager #- repo-checker kind: ksonnet.io/app name: openSUSE-release-tools From efcd08aa1a8d62b1fe0c14ea35dc5a228d1f057e Mon Sep 17 00:00:00 2001 From: Jimmy Berry Date: Tue, 26 Feb 2019 08:29:44 -0600 Subject: [PATCH 4/4] dist/package: include origin-manager source file in source_dir. --- dist/package/openSUSE-release-tools.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dist/package/openSUSE-release-tools.spec b/dist/package/openSUSE-release-tools.spec index fe9f9676..d30f3bd0 100644 --- a/dist/package/openSUSE-release-tools.spec +++ b/dist/package/openSUSE-release-tools.spec @@ -594,6 +594,7 @@ exit 0 %files origin-manager %{_bindir}/osrt-origin-manager +%{_datadir}/%{source_dir}/origin-manager.py %{_unitdir}/osrt-origin-manager.service %{_unitdir}/osrt-origin-manager.timer