Skip to content

Commit dfac7ab

Browse files
gardargardar
authored
Merge pull request #67 from prometheus-community/superq/version_bump_fix
Fixup version bumper job
2 parents 5bb3ada + 7522f15 commit dfac7ab

File tree

21 files changed

+40
-35
lines changed

21 files changed

+40
-35
lines changed

‎.github/scripts/discover_role_repos.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/usr/bin/env bash
2+
3+
for defaults_file in roles/*/vars/main.yml ; do
4+
role="$(echo "${defaults_file}" | cut -f2 -d'/')"
5+
yq eval "[{\"repo\": ._${role}_repo, \"role\": \"${role}\"}]" "${defaults_file}"
6+
done | yq -o json -I=0

version_updater.sh renamed to .github/scripts/version_updater.sh

File renamed without changes.

‎.github/workflows/version_bumper.yml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: Sync repo files
2+
name: Check for new upstream releases
33
on:
44
schedule:
55
- cron: '21 14 * * *'
@@ -20,13 +20,9 @@ jobs:
2020
id: discovered-role-repos
2121
uses: mikefarah/yq@master
2222
with:
23-
cmd: |
24-
for defaults_file in roles/*/defaults/main.yml ; do
25-
role="$(echo "${defaults_file}" | cut -f2 -d'/')"
26-
yq eval "[{\"repo\": .${role}_repo, \"role\": \"${role}\"}]" "${defaults_file}"
27-
done | yq -o json -I=0
23+
cmd: ./.github/scripts/discover_role_repos.sh
2824

29-
repo_sync:
25+
check_for_new_versions:
3026
runs-on: ubuntu-latest
3127
needs: discover-role-repos
3228
permissions:
@@ -43,4 +39,4 @@ jobs:
4339
with:
4440
fetch-depth: 0
4541

46-
- run: ./version_bumper.sh ${{ matrix.repo }} ${{ matrix.role }}
42+
- run: ./.github/scripts/version_bumper.sh ${{ matrix.repo }} ${{ matrix.role }}

‎roles/alertmanager/defaults/main.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
---
22
alertmanager_version: 0.21.0
33
alertmanager_binary_local_dir: ''
4-
alertmanager_repo: "prometheus/alertmanager"
5-
alertmanager_binary_url: "https://github.com/{{ alertmanager_repo }}/releases/download/v{{ alertmanager_version }}/\
4+
alertmanager_binary_url: "https://github.com/{{ _alertmanager_repo }}/releases/download/v{{ alertmanager_version }}/\
65
alertmanager-{{ alertmanager_version }}.linux-{{ go_arch }}.tar.gz"
7-
alertmanager_checksums_url: "https://github.com/{{ alertmanager_repo }}/releases/download/v{{ alertmanager_version }}/sha256sums.txt"
6+
alertmanager_checksums_url: "https://github.com/{{ _alertmanager_repo }}/releases/download/v{{ alertmanager_version }}/sha256sums.txt"
87

98
alertmanager_config_dir: /etc/alertmanager
109
alertmanager_db_dir: /var/lib/alertmanager

‎roles/alertmanager/meta/argument_specs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ argument_specs:
1818
- "This overrides I(alertmanager_version) parameter"
1919
alertmanager_binary_url:
2020
description: "URL of the alertmanager binaries .tar.gz file"
21-
default: "https://github.com/prometheus/alertmanager/releases/download/v{{ alertmanager_version }}/alertmanager-{{ alertmanager_version }}.linux-{{ go_arch }}.tar.gz"
21+
default: "https://github.com/{{ _alertmanager_repo }}/releases/download/v{{ alertmanager_version }}/alertmanager-{{ alertmanager_version }}.linux-{{ go_arch }}.tar.gz"
2222
alertmanager_checksums_url:
2323
description: "URL of the alertmanager checksums file"
24-
default: "https://github.com/prometheus/alertmanager/releases/download/v{{ alertmanager_version }}/sha256sums.txt"
24+
default: "https://github.com/{{ _alertmanager_repo }}/releases/download/v{{ alertmanager_version }}/sha256sums.txt"
2525
alertmanager_web_listen_address:
2626
description: "Address on which alertmanager will be listening"
2727
default: "0.0.0.0:9093"

‎roles/alertmanager/vars/main.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ _alertmanager_binary_install_dir: '/usr/local/bin'
1111

1212
# The expected location of the amtool configuration file
1313
_alertmanager_amtool_config_dir: '/etc/amtool'
14+
_alertmanager_repo: "prometheus/alertmanager"

‎roles/blackbox_exporter/defaults/main.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
blackbox_exporter_version: 0.18.0
3-
blackbox_exporter_repo: "prometheus/blackbox_exporter"
4-
blackbox_exporter_binary_url: "https://github.com/{{ blackbox_exporter_repo }}/releases/download/v{{ blackbox_exporter_version }}/\
3+
blackbox_exporter_binary_url: "https://github.com/{{ _blackbox_exporter_repo }}/releases/download/v{{ blackbox_exporter_version }}/\
54
blackbox_exporter-{{ blackbox_exporter_version }}.linux-{{ go_arch_map[ansible_architecture] |
65
default(ansible_architecture) }}.tar.gz"
76

‎roles/blackbox_exporter/meta/argument_specs.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ argument_specs:
1111
blackbox_exporter_version:
1212
description: "Blackbox exporter package version"
1313
default: "0.18.0"
14+
blackbox_exporter_binary_url:
15+
description: "URL of the blackbox_exporter binaries .tar.gz file"
16+
default: "https://github.com/{{ _blackbox_exporter_repo }}/releases/download/v{{ blackbox_exporter_version }}/blackbox_exporter-{{ blackbox_exporter_version }}.linux-{{ go_arch_map[ansible_architecture] | default(ansible_architecture) }}.tar.gz"
1417
blackbox_exporter_web_listen_address:
1518
description: "Address on which blackbox exporter will be listening"
1619
default: "0.0.0.0:9115"

‎roles/blackbox_exporter/vars/main.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ go_arch_map:
55
aarch64: 'arm64'
66
armv7l: 'armv7'
77
armv6l: 'armv6'
8+
_blackbox_exporter_repo: "prometheus/blackbox_exporter"

‎roles/node_exporter/defaults/main.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
---
22
node_exporter_version: 1.1.2
33
node_exporter_binary_local_dir: ""
4-
node_exporter_repo: "prometheus/node_exporter"
5-
node_exporter_binary_url: "https://github.com/{{ node_exporter_repo }}/releases/download/v{{ node_exporter_version }}/\
4+
node_exporter_binary_url: "https://github.com/{{ _node_exporter_repo }}/releases/download/v{{ node_exporter_version }}/\
65
node_exporter-{{ node_exporter_version }}.linux-{{ go_arch }}.tar.gz"
7-
node_exporter_checksums_url: "https://github.com/{{ node_exporter_repo }}/releases/download/v{{ node_exporter_version }}/sha256sums.txt"
6+
node_exporter_checksums_url: "https://github.com/{{ _node_exporter_repo }}/releases/download/v{{ node_exporter_version }}/sha256sums.txt"
87

98
node_exporter_web_listen_address: "0.0.0.0:9100"
109
node_exporter_web_telemetry_path: "/metrics"

0 commit comments

Comments
 (0)