Skip to content

Commit 66513a2

Browse files
Merge remote-tracking branch 'origin/develop' into fix/replace-bitnami-mongodb
# Conflicts: # charts/splunk-connect-for-snmp/Chart.lock
2 parents a8603ac + 5aa9ae9 commit 66513a2

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
lines changed

.github/workflows/ci-main.yaml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -198,22 +198,31 @@ jobs:
198198
uses: actions/setup-python@v5
199199
with:
200200
python-version: "3.10"
201-
- name: Install docker compose
201+
- name: Install docker compose on version 27.x
202202
run: |
203-
# Add Docker's official GPG key:
204203
sudo apt-get update
205-
sudo apt-get install ca-certificates curl
204+
sudo apt-get install -y ca-certificates curl
206205
sudo install -m 0755 -d /etc/apt/keyrings
207206
sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
208207
sudo chmod a+r /etc/apt/keyrings/docker.asc
209208
210-
# Add the repository to Apt sources:
211209
echo \
212210
"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
213211
$(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
214212
sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
213+
215214
sudo apt-get update
216-
sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
215+
216+
CODENAME=$(. /etc/os-release && echo "$VERSION_CODENAME")
217+
sudo apt-get install -y \
218+
docker-ce=5:27.0.1-1~ubuntu.24.04~${CODENAME} \
219+
docker-ce-cli=5:27.0.1-1~ubuntu.24.04~${CODENAME} \
220+
containerd.io \
221+
docker-buildx-plugin \
222+
docker-compose-plugin --allow-downgrades
223+
224+
sudo systemctl restart docker
225+
docker --version
217226
- name: run automatic_setup_compose.sh
218227
run: integration_tests/automatic_setup_compose.sh integration
219228
- name: run tests

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
## Unreleased
44

55
### Changed
6+
- add support for Redis HA with Sentinel integration
67
- **Redis Migration**: Replaced Bitnami Redis chart with custom Kubernetes manifests
78
- Updated to official Redis image version 8.2.2 (addresses security vulnerabilities)
89
- Added authentication support (password or Kubernetes Secret)

charts/splunk-connect-for-snmp/Chart.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ dependencies:
22
- name: mibserver
33
repository: https://pysnmp.github.io/mibs/charts/
44
version: 1.15.29
5-
digest: sha256:30add0440089c1ba64f803f322a36e8731cb7b39aa47631596472327247e7501
6-
generated: "2025-11-18T14:42:20.357132+01:00"
5+
digest: sha256:b18ae3309cb649bd4542aa8917912a5cd6189b6ff998aaba0c5f6d05a976a0c5
6+
generated: "2025-12-03T15:22:56.10436+01:00"

0 commit comments

Comments
 (0)