Skip to content

Commit bbdc877

Browse files
committed
Merge branch 'bugfix/MK8S-198-avoid-not-trace-attribute' into tmp/octopus/w/133.0/bugfix/MK8S-198-avoid-not-trace-attribute
2 parents 714a581 + 05da2e3 commit bbdc877

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@
6868

6969
## Release 132.0.3 (in development)
7070

71+
### Bug Fixes
72+
73+
- Fix a bug where Salt master process may report an error about `VerboseLogger`
74+
not having attributes `trace`
75+
(PR[#4831](https://github.com/scality/metalk8s/pull/4831))
76+
7177
## Release 132.0.2
7278

7379
## Release 132.0.1

images/salt-master/Dockerfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,14 @@ gpgkey=https://downloads.scality.com/repository/redhat/\$releasever/saltstack/%s
1717
&& microdnf clean all \
1818
&& microdnf update -y \
1919
&& microdnf install -y glibc-all-langpacks langpacks-en python3-pip epel-release \
20-
&& pip3 install "pip == 21.3.1" \
20+
# NOTE: We pin the pip version to 21.1.3 since it's the last version that do not have
21+
# the VerboseLogger that may cause issues with salt logger
22+
# Sees: https://github.com/saltstack/salt/issues/62279
23+
# Sees: https://github.com/pypa/pip/pull/9450
24+
# It seems newer versions of Salt workaround this issue so it has to be removed
25+
# when we will bump the Salt version to a version that does not have this issue
26+
# Sees: https://github.com/saltstack/salt/issues/62279
27+
&& pip3 install "pip == 21.1.3" \
2128
&& pip3 install "protobuf ~= 3.19.4" "etcd3 != 0.11.0" "kubernetes ~= 30.1.0" \
2229
&& microdnf install -y salt-master salt-api salt-ssh openssh-clients procps-ng \
2330
&& microdnf remove -y epel-release \

0 commit comments

Comments
 (0)