Skip to content

Commit 87bcbbb

Browse files
authored
[chore] Update non-automated dependencies (#7260)
* update deps * update nomad version * upgrade nomad version * revert Python to 3.13 to satisfy oracle linux 9 * update nomad supported version * revert ansible Windows 2025 change * revert 2025 to 2019 * bump min supported puppet version
1 parent 6c24c54 commit 87bcbbb

File tree

18 files changed

+50
-23
lines changed

18 files changed

+50
-23
lines changed

.chloggen/upgrade_deps.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: enhancement
3+
4+
# The name of the component, or a single word describing the area of concern, (e.g. crosslink)
5+
component: deployments/nomad
6+
7+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
8+
note: Add official support for `v1.11.2`
9+
10+
# One or more tracking issues related to the change
11+
issues: [7260]
12+
13+
# (Optional) One or more lines of additional information to render under the primary note.
14+
# These lines will be padded with 2 spaces and then inserted directly into the document.
15+
# Use pipe (|) for multiline entries.
16+
subtext:

.github/workflows/ansible.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
- name: Set up Python 3.
9595
uses: actions/setup-python@v6
9696
with:
97-
python-version: '3.11'
97+
python-version: '3.13'
9898

9999
- name: Install dependencies.
100100
run: |
@@ -130,8 +130,7 @@ jobs:
130130
fail-fast: false
131131
matrix:
132132
ansible:
133-
# Testing only the versions currently supported per https://endoflife.date/ansible
134-
- ansible>=12.2.0, <13.0.0
133+
# EOL REFERENCE: https://endoflife.date/ansible
135134
- ansible>=13.0.0, <14.0.0
136135
distro:
137136
- amazonlinux2023
@@ -195,9 +194,10 @@ jobs:
195194
fail-fast: false
196195
matrix:
197196
ansible:
198-
# Testing only the versions currently supported per https://endoflife.date/ansible
197+
# EOL REFERENCE: https://endoflife.date/ansible
199198
- ansible>=13.0.0, <14.0.0
200199
distro:
200+
# EOL REFERENCE: https://endoflife.date/windows-server
201201
- "2019"
202202
- "2022"
203203
scenario:
@@ -254,7 +254,7 @@ jobs:
254254
- name: Set up Python 3.
255255
uses: actions/setup-python@v6
256256
with:
257-
python-version: '3.12'
257+
python-version: '3.13'
258258
cache: 'pip'
259259
cache-dependency-path: "${{ github.workspace }}/requirements.txt"
260260

.github/workflows/auto-instrumentation.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ concurrency:
2020
cancel-in-progress: true
2121

2222
env:
23+
# EOL REFERENCE: https://endoflife.date/python
2324
PYTHON_VERSION: '3.13'
2425
PIP_VERSION: '24.2'
2526
REQUIREMENTS_PATH: "packaging/tests/requirements.txt"

.github/workflows/chef-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ concurrency:
2222
cancel-in-progress: true
2323

2424
env:
25+
# EOL REFERENCE: https://endoflife.date/chef-workstation
2526
CHEF_VERSION: "25.12.1102"
2627
CHEF_LICENSE: accept
2728

.github/workflows/lychee.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ jobs:
2323
id: lychee
2424
uses: lycheeverse/lychee-action@v2.4.1
2525
with:
26-
lycheeVersion: v0.18.1
2726
args: -v -n --config .lychee.toml './*.md' './**/*.md'
2827
fail: true
2928
env:

.github/workflows/nomad.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ jobs:
3030
runs-on: ubuntu-24.04
3131
strategy:
3232
matrix:
33-
nomad: [ "1.7.7-1", "1.9.7-1" ]
33+
# EOL REFERENCE: https://endoflife.date/nomad
34+
nomad: [ "1.9.7-1", "1.11.2-1" ]
3435
fail-fast: false
3536
steps:
3637
- name: Check out the codebase.
@@ -53,8 +54,8 @@ jobs:
5354
5455
- name: Install Nomad and Consul.
5556
run: |
56-
wget -O- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg
57-
echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
57+
wget -O - https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg
58+
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(grep -oP '(?<=UBUNTU_CODENAME=).*' /etc/os-release || lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
5859
sudo apt update
5960
sudo apt install nomad=${{ matrix.nomad }}
6061
sudo apt-get install consul

.github/workflows/puppet-test.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ concurrency:
3232
cancel-in-progress: true
3333

3434
env:
35-
PYTHON_VERSION: "3.13"
35+
PYTHON_VERSION: '3.13'
3636
REQUIREMENTS_PATH: "packaging/tests/requirements.txt"
3737

3838
jobs:
@@ -64,6 +64,7 @@ jobs:
6464
- name: Check out code
6565
uses: actions/checkout@v5
6666

67+
# EOL REFERENCE: https://endoflife.date/puppet
6768
- name: Get matrix
6869
id: get-matrix
6970
run: |
@@ -74,7 +75,7 @@ jobs:
7475
exit 1
7576
fi
7677
distro=$(for d in $dockerfiles; do echo -n "\"$d\","; done)
77-
puppet_release='"7","8"'
78+
puppet_release='"8"'
7879
with_instrumentation='"true","false"'
7980
matrix="{\"DISTRO\": [${distro%,}], \"PUPPET_RELEASE\": [${puppet_release}], \"WITH_INSTRUMENTATION\": [${with_instrumentation}]}"
8081
echo "$matrix" | jq
@@ -256,7 +257,8 @@ jobs:
256257
strategy:
257258
matrix:
258259
OS: [ "windows-2022" ]
259-
PUPPET_RELEASE: [ "7.21.0", "8.1.0" ]
260+
# EOL REFERENCE: https://endoflife.date/puppet
261+
PUPPET_RELEASE: [ "8.10.0" ]
260262
TEST_CASE: [ "default", "custom_vars" ]
261263
fail-fast: false
262264
steps:

.github/workflows/release-requirements.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Setup python
2121
uses: actions/setup-python@v6
2222
with:
23-
python-version: '3.9'
23+
python-version: '3.13'
2424
cache: 'pip'
2525
cache-dependency-path: 'packaging/release/requirements.txt'
2626

.github/workflows/shellcheck.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ jobs:
1212
name: shellcheck
1313
runs-on: ubuntu-24.04
1414
env:
15-
VERSION: v0.10.0
15+
# EOL REFERENCE: https://github.com/koalaman/shellcheck/releases
16+
VERSION: v0.11.0
1617
steps:
1718
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
1819
- name: shellcheck github workflow scripts

.github/workflows/vuln-scans.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ jobs:
2828
- name: Run trivy filesystem scan
2929
uses: aquasecurity/trivy-action@0.34.1
3030
with:
31-
version: v0.57.1
31+
# EOL REFERENCE: https://github.com/aquasecurity/trivy/releases
32+
version: v0.69.1
3233
scan-type: 'fs'
3334
scan-ref: '.'
3435
skip-dirs: 'deployments,examples,instrumentation/packaging,packaging,tests'
@@ -104,7 +105,7 @@ jobs:
104105
- name: Run trivy image scan
105106
uses: aquasecurity/trivy-action@0.34.1
106107
with:
107-
version: v0.57.1
108+
version: v0.69.1
108109
scan-type: 'image'
109110
image-ref: "otelcol${{ matrix.FIPS == true && '-fips' || '' }}:latest"
110111
format: 'table'

0 commit comments

Comments
 (0)