Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/alert-manager/build/alert-handler.common.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# Licensed under the MIT License.

# Build stage
FROM node:20 AS builder
FROM node:24 AS builder

RUN npm install -g npm@11
RUN npm install -g npm@latest
Comment thread
hippogr marked this conversation as resolved.

WORKDIR /usr/src/app

Expand All @@ -19,7 +19,7 @@ RUN for dep in $(node -pe "Object.keys(require('./package.json').devDependencies
COPY ./src/alert-handler .

# Production stage - use slim image
FROM node:20-slim
FROM node:24-slim

WORKDIR /usr/src/app

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.

FROM python:3.10-slim
FROM python:3.12-slim

RUN apt-get update && apt-get upgrade -y && \
apt-get clean && rm -rf /var/lib/apt/lists/*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.

FROM python:3.10-slim
FROM python:3.12-slim

RUN apt-get update && apt-get upgrade -y && \
apt-get clean && rm -rf /var/lib/apt/lists/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# Licensed under the MIT License.

# Build stage
FROM node:20 AS builder
FROM node:24 AS builder

RUN npm install -g npm@11
RUN npm install -g npm@latest
Comment thread
hippogr marked this conversation as resolved.

WORKDIR /usr/src/app

Expand All @@ -25,7 +25,7 @@ COPY ./src/job-status-change-notification .
RUN rm -rf openpaidbsdk/node_modules

# Production stage - use slim image
FROM node:20-slim
FROM node:24-slim

WORKDIR /usr/src/app

Expand Down
2 changes: 1 addition & 1 deletion src/alert-manager/src/alert-handler/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"url": "https://github.com/Microsoft/pai/issues"
},
"engines": {
"node": "^20"
"node": "^24"
},
"_moduleAliases": {
"@alert-handler": "."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"url": "https://github.com/Microsoft/pai/issues"
},
"engines": {
"node": "^20"
"node": "^24"
},
"_moduleAliases": {
"@job-status-change-notification": "."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# Licensed under the MIT License.

# Build stage
FROM node:20 AS builder
FROM node:24 AS builder

RUN npm install -g npm@11
RUN npm install -g npm@latest
Comment thread
hippogr marked this conversation as resolved.

WORKDIR /database-controller

Expand All @@ -23,7 +23,7 @@ RUN json -I -f package.json -e "this.paiVersion=\"`cat ../version/PAI.VERSION`\"
RUN json -I -f package.json -e "this.paiCommitVersion=\"`cat ../version/COMMIT.VERSION`\""

# Production stage - use slim image
FROM node:20-slim
FROM node:24-slim

WORKDIR /database-controller/src

Expand Down
1 change: 0 additions & 1 deletion src/database-controller/src/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"body-parser": "^2.2.1",
"compression": "^1.8.0",
"cors": "^2.8.5",
"diskusage": "^1.2.0",
"dotenv": "^16.5.0",
"express": "^5.2.0",
"http-errors": "^2.0.0",
Expand Down
7 changes: 5 additions & 2 deletions src/database-controller/src/watcher/cluster-event/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require('@dbc/common/init');
const logger = require('@dbc/common/logger');
const { getEventInformer } = require('@dbc/common/k8s');
const { alwaysRetryDecorator } = require('@dbc/common/util');
const disk = require('diskusage');
const { statfs } = require('fs/promises');
const config = require('@dbc/watcher/cluster-event/config');

// Here, we use AsyncLock to control the concurrency of events with the same uid;
Expand Down Expand Up @@ -85,7 +85,10 @@ const eventHandler = (eventType, apiObject) => {

async function assertDiskUsageHealthy() {
try {
const { available, total } = await disk.check(config.diskPath);
const stats = await statfs(config.diskPath);
const blockSize = stats.frsize ?? stats.bsize;
const available = stats.bavail * blockSize;
const total = stats.blocks * blockSize;
const currentUsage = ((total - available) / total) * 100;
logger.info(`Current internal storage usage is ${currentUsage}% .`);
if (currentUsage > config.maxDiskUsagePercent) {
Expand Down
18 changes: 0 additions & 18 deletions src/database-controller/src/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -730,14 +730,6 @@ depd@^2.0.0, depd@~2.0.0:
resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==

diskusage@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/diskusage/-/diskusage-1.2.0.tgz#3e8ae42333d5d7e0c7d93e055d7fea9ea841bc88"
integrity sha512-2u3OG3xuf5MFyzc4MctNRUKjjwK+UkovRYdD2ed/NZNZPrt0lqHnLKxGhlFVvAb4/oufIgQG3nWgwmeTbHOvXA==
dependencies:
es6-promise "^4.2.8"
nan "^2.18.0"

doctrine@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
Expand Down Expand Up @@ -897,11 +889,6 @@ es-to-primitive@^1.3.0:
is-date-object "^1.1.0"
is-symbol "^1.1.1"

es6-promise@^4.2.8:
version "4.2.8"
resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==

escape-html@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
Expand Down Expand Up @@ -1861,11 +1848,6 @@ ms@^2.1.1, ms@^2.1.3:
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==

nan@^2.18.0:
version "2.28.0"
resolved "https://registry.yarnpkg.com/nan/-/nan-2.28.0.tgz#126717fd359d5a03d3edf7c44e6ce9b707fb57f5"
integrity sha512-fTsDz99OTq2sVePhGdp4qQhggZFtKr64ZNVyVajRKtMOkJxYekplBh577PiJB12v/D3s2E5cGtOI45LWp6rnLQ==

natural-compare@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
Expand Down
4 changes: 2 additions & 2 deletions src/grafana/build/grafana.common.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
FROM node:20 AS build
FROM node:24 AS build

ARG TARGETOS
ARG TARGETARCH
Expand All @@ -35,7 +35,7 @@ RUN git clone --branch ${PLUGINVERSION} --depth 1 https://github.com/grafana/gra

RUN go install github.com/magefile/mage@latest

RUN yarn && yarn build
RUN corepack enable && yarn && yarn build

RUN if [ "$TARGETARCH" = "amd64" ]; then \
mage build:linux; \
Expand Down
12 changes: 6 additions & 6 deletions src/openpai-runtime/build/openpai-runtime.common.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@

# Package Cache Data Layer Starts

FROM ubuntu:20.04 AS ubuntu_20_04_cache
FROM ubuntu:22.04 AS ubuntu_22_04_cache

WORKDIR /src
COPY src/src/package_cache ./
RUN chmod -R +x ./
RUN /bin/bash ubuntu_build.sh package_cache_info ubuntu20.04
RUN /bin/bash ubuntu_build.sh package_cache_info ubuntu22.04
Comment thread
hippogr marked this conversation as resolved.


FROM ubuntu:22.04 AS ubuntu_22_04_cache
FROM ubuntu:24.04 AS ubuntu_24_04_cache

WORKDIR /src
COPY src/src/package_cache ./
RUN chmod -R +x ./
RUN /bin/bash ubuntu_build.sh package_cache_info ubuntu22.04
RUN /bin/bash ubuntu_build.sh package_cache_info ubuntu24.04

# Package Cache Data Layer Ends

Expand Down Expand Up @@ -67,11 +67,11 @@ COPY src/frameworkcontroller ${PROJECT_DIR}
RUN ${PROJECT_DIR}/build/frameworkbarrier/go-build.sh && \
mv ${PROJECT_DIR}/dist/frameworkbarrier/* ${INSTALL_DIR}

FROM python:3.10-alpine
FROM python:3.12-alpine

RUN mkdir -p /opt/package_cache
COPY --from=ubuntu_20_04_cache /package_cache /opt/package_cache/
COPY --from=ubuntu_22_04_cache /package_cache /opt/package_cache/
COPY --from=ubuntu_24_04_cache /package_cache /opt/package_cache/

ENV INSTALL_DIR=/opt/kube-runtime
ARG BARRIER_DIR=/opt/frameworkcontroller/frameworkbarrier
Expand Down
8 changes: 4 additions & 4 deletions src/openpai-runtime/src/src/package_cache/package_cache_info
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# group_name, os, packages(space-gapped)
# "#" can be used for comments
ssh,ubuntu20.04,openssh-client openssh-server
ssh,ubuntu22.04,openssh-client openssh-server
nfs,ubuntu20.04,nfs-common
ssh,ubuntu24.04,openssh-client openssh-server
nfs,ubuntu22.04,nfs-common
samba,ubuntu20.04,cifs-utils
nfs,ubuntu24.04,nfs-common
samba,ubuntu22.04,cifs-utils
azurefile,ubuntu20.04,cifs-utils sshpass
samba,ubuntu24.04,cifs-utils
azurefile,ubuntu22.04,cifs-utils sshpass
azurefile,ubuntu24.04,cifs-utils sshpass
2 changes: 1 addition & 1 deletion src/postgresql-sdk/build/postgresql-sdk.k8s.dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.

FROM python:3.10-slim
FROM python:3.12-slim

# Install system dependencies
RUN apt-get update && \
Expand Down
6 changes: 3 additions & 3 deletions src/rest-server/build/rest-server.common.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

# Build stage
FROM node:20 AS builder
FROM node:24 AS builder

RUN npm install -g npm@11
RUN npm install -g npm@latest
Comment thread
hippogr marked this conversation as resolved.

WORKDIR /usr/src/app

Expand All @@ -38,7 +38,7 @@ RUN for dep in $(node -pe "Object.keys(require('./package.json').devDependencies
done

# Production stage - use slim image
FROM node:20-slim
FROM node:24-slim

WORKDIR /usr/src/app

Expand Down
2 changes: 1 addition & 1 deletion src/rest-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"url": "https://github.com/Microsoft/pai/issues"
},
"engines": {
"node": "^20"
"node": "^24"
},
"dependencies": {
"@azure/storage-blob": "^12.27.0",
Expand Down
4 changes: 2 additions & 2 deletions src/rest-server/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4302,11 +4302,11 @@ __metadata:

"openpaidbsdk@file:./openpaidbsdk::locator=pai-rest-server%40workspace%3A.":
version: 1.0.2
resolution: "openpaidbsdk@file:./openpaidbsdk#./openpaidbsdk::hash=9a36d0&locator=pai-rest-server%40workspace%3A."
resolution: "openpaidbsdk@file:./openpaidbsdk#./openpaidbsdk::hash=e146c8&locator=pai-rest-server%40workspace%3A."
dependencies:
pg: "npm:^8.15.6"
sequelize: "npm:6.37.8"
checksum: 10c0/59e6c0f200a02f4e312e220d845b1daeaa2fa96cf089876c6a76f10375a20650ac4b66c60c1b9317ae61b0d62e7b9a1dd21cbb0016df11549d9cc8a276997a07
checksum: 10c0/e40aa120c1c2bcf0236ffe40fad7f5a0d7ce0d4e6dadd5c968b390d4e143cddae6b4db029080cbb6ff7c8075781ffe7c9c6b97b0161ffe2b97284aac96619887
languageName: node
linkType: hard

Expand Down