Skip to content

Commit 49b0506

Browse files
hippogrRui Gao
andauthored
Security update for version 1.6
* fix the problems found when deploying version 1.6 * add dpkg fix for some VMSS extension deployment error * fix the CIDR ranges to avoid same IP address issues * update csi-blob driver to 1.27.4 * update cilium to 1.18.10 * fix security warnings for different docker images * fix the rdma plugin GO package and toolchain version * update GO to 1.25.10 with net package version for different images * change all go versions with minor version --------- Co-authored-by: Rui Gao <ruigao@microsoft.com>
1 parent 719396b commit 49b0506

43 files changed

Lines changed: 392 additions & 187 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

contrib/aks/k8s-deploy/cilium.yaml

Lines changed: 11 additions & 11 deletions
Large diffs are not rendered by default.

contrib/aks/scripts/config-ipoib.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ wait_for_dpkg_lock() {
1515
echo "Timed out waiting for dpkg lock."
1616
exit 124
1717
fi
18+
dpkg --configure -a || true
1819
bash -c 'exec "$@"' -- "$@"
1920
}
2021

contrib/aks/scripts/install-fuse.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ wait_for_dpkg_lock() {
2121
echo "Timed out waiting for dpkg lock."
2222
exit 124
2323
fi
24+
dpkg --configure -a || true
2425
bash -c 'exec "$@"' -- "$@"
2526
}
2627

contrib/kubespray/script/modify_csi_blob_node_yaml.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,13 @@ def modify(yaml_url):
4242
node_selector_terms = data['spec']['template']['spec']['affinity']['nodeAffinity']['requiredDuringSchedulingIgnoredDuringExecution']['nodeSelectorTerms']
4343
node_selector_terms[0]['matchExpressions'].extend(node_affinity_config['matchExpressions'])
4444

45-
# Convert the modified YAML content back to a string
45+
# Convert the modified YAML content back to a string, filtering out empty documents
46+
documents = [doc for doc in documents if doc]
4647
modified_yaml_content = yaml.dump_all(documents, default_flow_style=False)
4748
return modified_yaml_content
4849

4950
if __name__ == "__main__":
50-
url = sys.argv[1] if len(sys.argv) > 1 else "https://raw.githubusercontent.com/kubernetes-sigs/blob-csi-driver/refs/heads/master/deploy/csi-blob-node.yaml"
51+
url = sys.argv[1] if len(sys.argv) > 1 else "https://raw.githubusercontent.com/kubernetes-sigs/blob-csi-driver/refs/tags/v1.27.4/deploy/csi-blob-node.yaml"
5152
output_file = sys.argv[2] if len(sys.argv) > 2 else "modified_csi-blob-node.yaml"
5253
modified_yaml_content = modify(url)
5354
with open(output_file, 'w') as yaml_file:

src/alert-manager/build/job-status-change-notification.common.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ WORKDIR /usr/src/app
1010

1111
# Copy package files and openpaidbsdk source (needed for file: dependency resolution)
1212
COPY ./src/job-status-change-notification/package.json ./src/job-status-change-notification/yarn.lock* ./src/job-status-change-notification/.yarnrc.yml ./
13-
COPY ./src/job-status-change-notification/openpaidbsdk/package.json ./openpaidbsdk/package.json
13+
COPY ./src/job-status-change-notification/openpaidbsdk ./openpaidbsdk
1414

1515
RUN corepack enable && corepack install -g yarn@4.2.2
1616
RUN yarn workspaces focus --production

src/alert-manager/build/node-issue-classifier.common.dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ RUN tdnf update -y && tdnf clean all
1010
# install kusto sdk
1111
COPY ./src/node-issue-classifier .
1212

13-
RUN pip3 install --no-cache-dir -r requirements.txt
13+
RUN tdnf remove -y python3-pip && \
14+
python3 -m ensurepip && \
15+
python3 -m pip install --no-cache-dir --upgrade pip && \
16+
pip3 install --no-cache-dir -r requirements.txt
1417

1518
# Run the service
1619
ENTRYPOINT ["python3", "classifier_scheduler.py"]

src/alert-manager/build/node-recycler.common.dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ RUN tdnf update -y && tdnf clean all
99

1010
COPY ./src/node-recycler .
1111

12-
RUN pip3 install -r requirements.txt
12+
RUN tdnf remove -y python3-pip && \
13+
python3 -m ensurepip && \
14+
python3 -m pip install --no-cache-dir --upgrade pip && \
15+
pip3 install -r requirements.txt
1316

1417
ENTRYPOINT ["python3", "recycler.py"]

src/alert-manager/build/redis-monitoring.common.dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# Redis with Built-in Monitoring Tools for Node Failure Detection
22
# Based on official Redis Alpine image with custom monitoring capabilities
3-
FROM golang:1.25 AS gosu
3+
FROM golang:1.25.10 AS gosu
44

55
WORKDIR /src
66

77
RUN git clone --branch 1.19 --depth 1 https://github.com/tianon/gosu.git .
88

9-
RUN go mod edit -go=1.25 \
10-
&& go mod edit -toolchain=go1.25 \
11-
&& go mod tidy -compat=1.25
9+
RUN go mod edit -go=1.25.10 \
10+
&& go mod edit -toolchain=go1.25.10 \
11+
&& go mod tidy -compat=1.25.10
1212

13-
RUN go get -u ./... && go mod tidy -compat=1.25
13+
RUN go get -u ./... && go mod tidy -compat=1.25.10
1414

1515
RUN go mod download
1616

src/alert-manager/src/alert-handler/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@
7474
"flatted": "^3.4.2",
7575
"ajv": "^6.14.0",
7676
"nodemailer": "^8.0.5",
77-
"follow-redirects": "^1.16.0"
77+
"follow-redirects": "^1.16.0",
78+
"ip-address": "^10.1.1"
7879
},
7980
"scripts": {
8081
"lint": "eslint .",

src/alert-manager/src/alert-handler/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2632,10 +2632,10 @@ __metadata:
26322632
languageName: node
26332633
linkType: hard
26342634

2635-
"ip-address@npm:^10.0.1":
2636-
version: 10.1.0
2637-
resolution: "ip-address@npm:10.1.0"
2638-
checksum: 10c0/0103516cfa93f6433b3bd7333fa876eb21263912329bfa47010af5e16934eeeff86f3d2ae700a3744a137839ddfad62b900c7a445607884a49b5d1e32a3d7566
2635+
"ip-address@npm:^10.1.1":
2636+
version: 10.2.0
2637+
resolution: "ip-address@npm:10.2.0"
2638+
checksum: 10c0/5a00aada6e922c9c69dfc800ed5d0fa3348675ebdeed0e1575f503f27ca385b5f534363c9af7ad1daf64c1f1409388cdd3cc2e9b9b0fe1c924a431378d55075a
26392639
languageName: node
26402640
linkType: hard
26412641

0 commit comments

Comments
 (0)