diff --git a/contrib/aks/k8s-deploy/cilium.yaml b/contrib/aks/k8s-deploy/cilium.yaml index 00339847..2e54c334 100644 --- a/contrib/aks/k8s-deploy/cilium.yaml +++ b/contrib/aks/k8s-deploy/cilium.yaml @@ -253,7 +253,7 @@ data: hubble-tls-client-ca-files: /var/lib/cilium/tls/hubble/client-ca.crt ipam: "cluster-pool" ipam-cilium-node-update-rate: "15s" - cluster-pool-ipv4-cidr: "10.20.0.0/8" + cluster-pool-ipv4-cidr: "10.20.0.0/16" cluster-pool-ipv4-mask-size: "24" default-lb-service-ipam: "lbipam" @@ -327,7 +327,7 @@ metadata: data: # Keep the key name as bootstrap-config.json to avoid breaking changes bootstrap-config.json: | - {"admin":{"address":{"pipe":{"mode":432,"path":"/var/run/cilium/envoy/sockets/admin.sock"}}},"applicationLogConfig":{"logFormat":{"textFormat":"[%Y-%m-%d %T.%e][%t][%l][%n] [%g:%#] %v"}},"bootstrapExtensions":[{"name":"envoy.bootstrap.internal_listener","typedConfig":{"@type":"type.googleapis.com/envoy.extensions.bootstrap.internal_listener.v3.InternalListener"}}],"dynamicResources":{"cdsConfig":{"apiConfigSource":{"apiType":"GRPC","grpcServices":[{"envoyGrpc":{"clusterName":"xds-grpc-cilium"}}],"setNodeOnFirstMessageOnly":true,"transportApiVersion":"V3"},"initialFetchTimeout":"30s","resourceApiVersion":"V3"},"ldsConfig":{"apiConfigSource":{"apiType":"GRPC","grpcServices":[{"envoyGrpc":{"clusterName":"xds-grpc-cilium"}}],"setNodeOnFirstMessageOnly":true,"transportApiVersion":"V3"},"initialFetchTimeout":"30s","resourceApiVersion":"V3"}},"node":{"cluster":"ingress-cluster","id":"host~127.0.0.1~no-id~localdomain"},"overloadManager":{"resourceMonitors":[{"name":"envoy.resource_monitors.global_downstream_max_connections","typedConfig":{"@type":"type.googleapis.com/envoy.extensions.resource_monitors.downstream_connections.v3.DownstreamConnectionsConfig","max_active_downstream_connections":"50000"}}]},"staticResources":{"clusters":[{"circuitBreakers":{"thresholds":[{"maxRetries":128}]},"cleanupInterval":"2.500s","connectTimeout":"2s","lbPolicy":"CLUSTER_PROVIDED","name":"ingress-cluster","type":"ORIGINAL_DST","typedExtensionProtocolOptions":{"envoy.extensions.upstreams.http.v3.HttpProtocolOptions":{"@type":"type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions","commonHttpProtocolOptions":{"idleTimeout":"60s","maxConnectionDuration":"0s","maxRequestsPerConnection":0},"useDownstreamProtocolConfig":{}}}},{"circuitBreakers":{"thresholds":[{"maxRetries":128}]},"cleanupInterval":"2.500s","connectTimeout":"2s","lbPolicy":"CLUSTER_PROVIDED","name":"egress-cluster-tls","transportSocket":{"name":"cilium.tls_wrapper","typedConfig":{"@type":"type.googleapis.com/cilium.UpstreamTlsWrapperContext"}},"type":"ORIGINAL_DST","typedExtensionProtocolOptions":{"envoy.extensions.upstreams.http.v3.HttpProtocolOptions":{"@type":"type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions","commonHttpProtocolOptions":{"idleTimeout":"60s","maxConnectionDuration":"0s","maxRequestsPerConnection":0},"upstreamHttpProtocolOptions":{},"useDownstreamProtocolConfig":{}}}},{"circuitBreakers":{"thresholds":[{"maxRetries":128}]},"cleanupInterval":"2.500s","connectTimeout":"2s","lbPolicy":"CLUSTER_PROVIDED","name":"egress-cluster","type":"ORIGINAL_DST","typedExtensionProtocolOptions":{"envoy.extensions.upstreams.http.v3.HttpProtocolOptions":{"@type":"type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions","commonHttpProtocolOptions":{"idleTimeout":"60s","maxConnectionDuration":"0s","maxRequestsPerConnection":0},"useDownstreamProtocolConfig":{}}}},{"circuitBreakers":{"thresholds":[{"maxRetries":128}]},"cleanupInterval":"2.500s","connectTimeout":"2s","lbPolicy":"CLUSTER_PROVIDED","name":"ingress-cluster-tls","transportSocket":{"name":"cilium.tls_wrapper","typedConfig":{"@type":"type.googleapis.com/cilium.UpstreamTlsWrapperContext"}},"type":"ORIGINAL_DST","typedExtensionProtocolOptions":{"envoy.extensions.upstreams.http.v3.HttpProtocolOptions":{"@type":"type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions","commonHttpProtocolOptions":{"idleTimeout":"60s","maxConnectionDuration":"0s","maxRequestsPerConnection":0},"upstreamHttpProtocolOptions":{},"useDownstreamProtocolConfig":{}}}},{"connectTimeout":"2s","loadAssignment":{"clusterName":"xds-grpc-cilium","endpoints":[{"lbEndpoints":[{"endpoint":{"address":{"pipe":{"path":"/var/run/cilium/envoy/sockets/xds.sock"}}}}]}]},"name":"xds-grpc-cilium","type":"STATIC","typedExtensionProtocolOptions":{"envoy.extensions.upstreams.http.v3.HttpProtocolOptions":{"@type":"type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions","explicitHttpConfig":{"http2ProtocolOptions":{}}}}},{"connectTimeout":"2s","loadAssignment":{"clusterName":"/envoy-admin","endpoints":[{"lbEndpoints":[{"endpoint":{"address":{"pipe":{"path":"/var/run/cilium/envoy/sockets/admin.sock"}}}}]}]},"name":"/envoy-admin","type":"STATIC"}],"listeners":[{"address":{"socketAddress":{"address":"0.0.0.0","portValue":9964}},"filterChains":[{"filters":[{"name":"envoy.filters.network.http_connection_manager","typedConfig":{"@type":"type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager","httpFilters":[{"name":"envoy.filters.http.router","typedConfig":{"@type":"type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"}}],"internalAddressConfig":{"cidrRanges":[{"addressPrefix":"10.20.0.0","prefixLen":8},{"addressPrefix":"172.16.0.0","prefixLen":12},{"addressPrefix":"192.168.0.0","prefixLen":16},{"addressPrefix":"127.0.0.1","prefixLen":32}]},"routeConfig":{"virtualHosts":[{"domains":["*"],"name":"prometheus_metrics_route","routes":[{"match":{"prefix":"/metrics"},"name":"prometheus_metrics_route","route":{"cluster":"/envoy-admin","prefixRewrite":"/stats/prometheus"}}]}]},"statPrefix":"envoy-prometheus-metrics-listener","streamIdleTimeout":"300s"}}]}],"name":"envoy-prometheus-metrics-listener"},{"address":{"socketAddress":{"address":"127.0.0.1","portValue":9878}},"filterChains":[{"filters":[{"name":"envoy.filters.network.http_connection_manager","typedConfig":{"@type":"type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager","httpFilters":[{"name":"envoy.filters.http.router","typedConfig":{"@type":"type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"}}],"internalAddressConfig":{"cidrRanges":[{"addressPrefix":"10.20.0.0","prefixLen":8},{"addressPrefix":"172.16.0.0","prefixLen":12},{"addressPrefix":"192.168.0.0","prefixLen":16},{"addressPrefix":"127.0.0.1","prefixLen":32}]},"routeConfig":{"virtual_hosts":[{"domains":["*"],"name":"health","routes":[{"match":{"prefix":"/healthz"},"name":"health","route":{"cluster":"/envoy-admin","prefixRewrite":"/ready"}}]}]},"statPrefix":"envoy-health-listener","streamIdleTimeout":"300s"}}]}],"name":"envoy-health-listener"}]}} + {"admin":{"address":{"pipe":{"mode":432,"path":"/var/run/cilium/envoy/sockets/admin.sock"}}},"applicationLogConfig":{"logFormat":{"textFormat":"[%Y-%m-%d %T.%e][%t][%l][%n] [%g:%#] %v"}},"bootstrapExtensions":[{"name":"envoy.bootstrap.internal_listener","typedConfig":{"@type":"type.googleapis.com/envoy.extensions.bootstrap.internal_listener.v3.InternalListener"}}],"dynamicResources":{"cdsConfig":{"apiConfigSource":{"apiType":"GRPC","grpcServices":[{"envoyGrpc":{"clusterName":"xds-grpc-cilium"}}],"setNodeOnFirstMessageOnly":true,"transportApiVersion":"V3"},"initialFetchTimeout":"30s","resourceApiVersion":"V3"},"ldsConfig":{"apiConfigSource":{"apiType":"GRPC","grpcServices":[{"envoyGrpc":{"clusterName":"xds-grpc-cilium"}}],"setNodeOnFirstMessageOnly":true,"transportApiVersion":"V3"},"initialFetchTimeout":"30s","resourceApiVersion":"V3"}},"node":{"cluster":"ingress-cluster","id":"host~127.0.0.1~no-id~localdomain"},"overloadManager":{"resourceMonitors":[{"name":"envoy.resource_monitors.global_downstream_max_connections","typedConfig":{"@type":"type.googleapis.com/envoy.extensions.resource_monitors.downstream_connections.v3.DownstreamConnectionsConfig","max_active_downstream_connections":"50000"}}]},"staticResources":{"clusters":[{"circuitBreakers":{"thresholds":[{"maxRetries":128}]},"cleanupInterval":"2.500s","connectTimeout":"2s","lbPolicy":"CLUSTER_PROVIDED","name":"ingress-cluster","type":"ORIGINAL_DST","typedExtensionProtocolOptions":{"envoy.extensions.upstreams.http.v3.HttpProtocolOptions":{"@type":"type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions","commonHttpProtocolOptions":{"idleTimeout":"60s","maxConnectionDuration":"0s","maxRequestsPerConnection":0},"useDownstreamProtocolConfig":{}}}},{"circuitBreakers":{"thresholds":[{"maxRetries":128}]},"cleanupInterval":"2.500s","connectTimeout":"2s","lbPolicy":"CLUSTER_PROVIDED","name":"egress-cluster-tls","transportSocket":{"name":"cilium.tls_wrapper","typedConfig":{"@type":"type.googleapis.com/cilium.UpstreamTlsWrapperContext"}},"type":"ORIGINAL_DST","typedExtensionProtocolOptions":{"envoy.extensions.upstreams.http.v3.HttpProtocolOptions":{"@type":"type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions","commonHttpProtocolOptions":{"idleTimeout":"60s","maxConnectionDuration":"0s","maxRequestsPerConnection":0},"upstreamHttpProtocolOptions":{},"useDownstreamProtocolConfig":{}}}},{"circuitBreakers":{"thresholds":[{"maxRetries":128}]},"cleanupInterval":"2.500s","connectTimeout":"2s","lbPolicy":"CLUSTER_PROVIDED","name":"egress-cluster","type":"ORIGINAL_DST","typedExtensionProtocolOptions":{"envoy.extensions.upstreams.http.v3.HttpProtocolOptions":{"@type":"type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions","commonHttpProtocolOptions":{"idleTimeout":"60s","maxConnectionDuration":"0s","maxRequestsPerConnection":0},"useDownstreamProtocolConfig":{}}}},{"circuitBreakers":{"thresholds":[{"maxRetries":128}]},"cleanupInterval":"2.500s","connectTimeout":"2s","lbPolicy":"CLUSTER_PROVIDED","name":"ingress-cluster-tls","transportSocket":{"name":"cilium.tls_wrapper","typedConfig":{"@type":"type.googleapis.com/cilium.UpstreamTlsWrapperContext"}},"type":"ORIGINAL_DST","typedExtensionProtocolOptions":{"envoy.extensions.upstreams.http.v3.HttpProtocolOptions":{"@type":"type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions","commonHttpProtocolOptions":{"idleTimeout":"60s","maxConnectionDuration":"0s","maxRequestsPerConnection":0},"upstreamHttpProtocolOptions":{},"useDownstreamProtocolConfig":{}}}},{"connectTimeout":"2s","loadAssignment":{"clusterName":"xds-grpc-cilium","endpoints":[{"lbEndpoints":[{"endpoint":{"address":{"pipe":{"path":"/var/run/cilium/envoy/sockets/xds.sock"}}}}]}]},"name":"xds-grpc-cilium","type":"STATIC","typedExtensionProtocolOptions":{"envoy.extensions.upstreams.http.v3.HttpProtocolOptions":{"@type":"type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions","explicitHttpConfig":{"http2ProtocolOptions":{}}}}},{"connectTimeout":"2s","loadAssignment":{"clusterName":"/envoy-admin","endpoints":[{"lbEndpoints":[{"endpoint":{"address":{"pipe":{"path":"/var/run/cilium/envoy/sockets/admin.sock"}}}}]}]},"name":"/envoy-admin","type":"STATIC"}],"listeners":[{"address":{"socketAddress":{"address":"0.0.0.0","portValue":9964}},"filterChains":[{"filters":[{"name":"envoy.filters.network.http_connection_manager","typedConfig":{"@type":"type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager","httpFilters":[{"name":"envoy.filters.http.router","typedConfig":{"@type":"type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"}}],"internalAddressConfig":{"cidrRanges":[{"addressPrefix":"10.20.0.0","prefixLen":16},{"addressPrefix":"172.16.0.0","prefixLen":12},{"addressPrefix":"192.168.0.0","prefixLen":16},{"addressPrefix":"127.0.0.1","prefixLen":32}]},"routeConfig":{"virtualHosts":[{"domains":["*"],"name":"prometheus_metrics_route","routes":[{"match":{"prefix":"/metrics"},"name":"prometheus_metrics_route","route":{"cluster":"/envoy-admin","prefixRewrite":"/stats/prometheus"}}]}]},"statPrefix":"envoy-prometheus-metrics-listener","streamIdleTimeout":"300s"}}]}],"name":"envoy-prometheus-metrics-listener"},{"address":{"socketAddress":{"address":"127.0.0.1","portValue":9878}},"filterChains":[{"filters":[{"name":"envoy.filters.network.http_connection_manager","typedConfig":{"@type":"type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager","httpFilters":[{"name":"envoy.filters.http.router","typedConfig":{"@type":"type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"}}],"internalAddressConfig":{"cidrRanges":[{"addressPrefix":"10.20.0.0","prefixLen":16},{"addressPrefix":"172.16.0.0","prefixLen":12},{"addressPrefix":"192.168.0.0","prefixLen":16},{"addressPrefix":"127.0.0.1","prefixLen":32}]},"routeConfig":{"virtual_hosts":[{"domains":["*"],"name":"health","routes":[{"match":{"prefix":"/healthz"},"name":"health","route":{"cluster":"/envoy-admin","prefixRewrite":"/ready"}}]}]},"statPrefix":"envoy-health-listener","streamIdleTimeout":"300s"}}]}],"name":"envoy-health-listener"}]}} --- # Source: cilium/templates/cilium-agent/clusterrole.yaml apiVersion: rbac.authorization.k8s.io/v1 @@ -903,7 +903,7 @@ spec: type: Unconfined containers: - name: cilium-agent - image: "luciaopenpai.azurecr.io/cilium/cilium:v1.18.9-update" + image: "luciaopenpai.azurecr.io/cilium/cilium:v1.18.10-update" imagePullPolicy: Always command: - cilium-agent @@ -1067,7 +1067,7 @@ spec: initContainers: - name: config - image: "luciaopenpai.azurecr.io/cilium/cilium:v1.18.9-update" + image: "luciaopenpai.azurecr.io/cilium/cilium:v1.18.10-update" imagePullPolicy: Always command: - cilium-dbg @@ -1090,7 +1090,7 @@ spec: # Required to mount cgroup2 filesystem on the underlying Kubernetes node. # We use nsenter command with host's cgroup and mount namespaces enabled. - name: mount-cgroup - image: "luciaopenpai.azurecr.io/cilium/cilium:v1.18.9-update" + image: "luciaopenpai.azurecr.io/cilium/cilium:v1.18.10-update" imagePullPolicy: Always env: - name: CGROUP_ROOT @@ -1127,7 +1127,7 @@ spec: #drop: # - ALL - name: apply-sysctl-overwrites - image: "luciaopenpai.azurecr.io/cilium/cilium:v1.18.9-update" + image: "luciaopenpai.azurecr.io/cilium/cilium:v1.18.10-update" imagePullPolicy: Always env: - name: BIN_PATH @@ -1165,7 +1165,7 @@ spec: # from a privileged container because the mount propagation bidirectional # only works from privileged containers. - name: mount-bpf-fs - image: "luciaopenpai.azurecr.io/cilium/cilium:v1.18.9-update" + image: "luciaopenpai.azurecr.io/cilium/cilium:v1.18.10-update" imagePullPolicy: Always args: - 'mount | grep "/sys/fs/bpf type bpf" || mount -t bpf bpf /sys/fs/bpf' @@ -1181,7 +1181,7 @@ spec: mountPath: /sys/fs/bpf mountPropagation: Bidirectional - name: clean-cilium-state - image: "luciaopenpai.azurecr.io/cilium/cilium:v1.18.9-update" + image: "luciaopenpai.azurecr.io/cilium/cilium:v1.18.10-update" imagePullPolicy: Always command: - /init-container.sh @@ -1228,7 +1228,7 @@ spec: mountPath: /var/run/cilium # wait-for-kube-proxy # Install the CNI binaries in an InitContainer so we don't have a writable host mount in the agent - name: install-cni-binaries - image: "luciaopenpai.azurecr.io/cilium/cilium:v1.18.9-update" + image: "luciaopenpai.azurecr.io/cilium/cilium:v1.18.10-update" imagePullPolicy: Always command: - "/install-plugin.sh" @@ -1412,7 +1412,7 @@ spec: type: Unconfined containers: - name: cilium-envoy - image: "luciaopenpai.azurecr.io/cilium/cilium-envoy:v1.36.6-1776000132-update" + image: "luciaopenpai.azurecr.io/cilium/cilium-envoy:v1.36.6-1778235340-update" imagePullPolicy: Always command: - /usr/bin/cilium-envoy-starter @@ -1590,7 +1590,7 @@ spec: type: RuntimeDefault containers: - name: cilium-operator - image: "luciaopenpai.azurecr.io/cilium/operator-generic:v1.18.9-update" + image: "luciaopenpai.azurecr.io/cilium/operator-generic:v1.18.10-update" imagePullPolicy: Always command: - cilium-operator-generic diff --git a/contrib/aks/scripts/config-ipoib.sh b/contrib/aks/scripts/config-ipoib.sh index 806bba99..f254aab5 100644 --- a/contrib/aks/scripts/config-ipoib.sh +++ b/contrib/aks/scripts/config-ipoib.sh @@ -15,6 +15,7 @@ wait_for_dpkg_lock() { echo "Timed out waiting for dpkg lock." exit 124 fi + dpkg --configure -a || true bash -c 'exec "$@"' -- "$@" } diff --git a/contrib/aks/scripts/install-fuse.sh b/contrib/aks/scripts/install-fuse.sh index b8c54444..e59efff0 100644 --- a/contrib/aks/scripts/install-fuse.sh +++ b/contrib/aks/scripts/install-fuse.sh @@ -21,6 +21,7 @@ wait_for_dpkg_lock() { echo "Timed out waiting for dpkg lock." exit 124 fi + dpkg --configure -a || true bash -c 'exec "$@"' -- "$@" } diff --git a/contrib/kubespray/script/modify_csi_blob_node_yaml.py b/contrib/kubespray/script/modify_csi_blob_node_yaml.py index 9755175b..8e38e521 100644 --- a/contrib/kubespray/script/modify_csi_blob_node_yaml.py +++ b/contrib/kubespray/script/modify_csi_blob_node_yaml.py @@ -42,12 +42,13 @@ def modify(yaml_url): node_selector_terms = data['spec']['template']['spec']['affinity']['nodeAffinity']['requiredDuringSchedulingIgnoredDuringExecution']['nodeSelectorTerms'] node_selector_terms[0]['matchExpressions'].extend(node_affinity_config['matchExpressions']) - # Convert the modified YAML content back to a string + # Convert the modified YAML content back to a string, filtering out empty documents + documents = [doc for doc in documents if doc] modified_yaml_content = yaml.dump_all(documents, default_flow_style=False) return modified_yaml_content if __name__ == "__main__": - 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" + 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" output_file = sys.argv[2] if len(sys.argv) > 2 else "modified_csi-blob-node.yaml" modified_yaml_content = modify(url) with open(output_file, 'w') as yaml_file: diff --git a/src/alert-manager/build/job-status-change-notification.common.dockerfile b/src/alert-manager/build/job-status-change-notification.common.dockerfile index 8b5a4696..09774dd3 100644 --- a/src/alert-manager/build/job-status-change-notification.common.dockerfile +++ b/src/alert-manager/build/job-status-change-notification.common.dockerfile @@ -10,7 +10,7 @@ WORKDIR /usr/src/app # Copy package files and openpaidbsdk source (needed for file: dependency resolution) COPY ./src/job-status-change-notification/package.json ./src/job-status-change-notification/yarn.lock* ./src/job-status-change-notification/.yarnrc.yml ./ -COPY ./src/job-status-change-notification/openpaidbsdk/package.json ./openpaidbsdk/package.json +COPY ./src/job-status-change-notification/openpaidbsdk ./openpaidbsdk RUN corepack enable && corepack install -g yarn@4.2.2 RUN yarn workspaces focus --production diff --git a/src/alert-manager/build/node-issue-classifier.common.dockerfile b/src/alert-manager/build/node-issue-classifier.common.dockerfile index 9d6bc1c5..6f41843c 100644 --- a/src/alert-manager/build/node-issue-classifier.common.dockerfile +++ b/src/alert-manager/build/node-issue-classifier.common.dockerfile @@ -10,7 +10,10 @@ RUN tdnf update -y && tdnf clean all # install kusto sdk COPY ./src/node-issue-classifier . -RUN pip3 install --no-cache-dir -r requirements.txt +RUN tdnf remove -y python3-pip && \ + python3 -m ensurepip && \ + python3 -m pip install --no-cache-dir --upgrade pip && \ + pip3 install --no-cache-dir -r requirements.txt # Run the service ENTRYPOINT ["python3", "classifier_scheduler.py"] \ No newline at end of file diff --git a/src/alert-manager/build/node-recycler.common.dockerfile b/src/alert-manager/build/node-recycler.common.dockerfile index 39e22049..990686b4 100644 --- a/src/alert-manager/build/node-recycler.common.dockerfile +++ b/src/alert-manager/build/node-recycler.common.dockerfile @@ -9,6 +9,9 @@ RUN tdnf update -y && tdnf clean all COPY ./src/node-recycler . -RUN pip3 install -r requirements.txt +RUN tdnf remove -y python3-pip && \ + python3 -m ensurepip && \ + python3 -m pip install --no-cache-dir --upgrade pip && \ + pip3 install -r requirements.txt ENTRYPOINT ["python3", "recycler.py"] diff --git a/src/alert-manager/build/redis-monitoring.common.dockerfile b/src/alert-manager/build/redis-monitoring.common.dockerfile index e13e2b51..cde4c08e 100644 --- a/src/alert-manager/build/redis-monitoring.common.dockerfile +++ b/src/alert-manager/build/redis-monitoring.common.dockerfile @@ -1,16 +1,16 @@ # Redis with Built-in Monitoring Tools for Node Failure Detection # Based on official Redis Alpine image with custom monitoring capabilities -FROM golang:1.25 AS gosu +FROM golang:1.25.10 AS gosu WORKDIR /src RUN git clone --branch 1.19 --depth 1 https://github.com/tianon/gosu.git . -RUN go mod edit -go=1.25 \ - && go mod edit -toolchain=go1.25 \ - && go mod tidy -compat=1.25 +RUN go mod edit -go=1.25.10 \ + && go mod edit -toolchain=go1.25.10 \ + && go mod tidy -compat=1.25.10 -RUN go get -u ./... && go mod tidy -compat=1.25 +RUN go get -u ./... && go mod tidy -compat=1.25.10 RUN go mod download diff --git a/src/alert-manager/src/alert-handler/package.json b/src/alert-manager/src/alert-handler/package.json index fb71ce66..d8dee36a 100644 --- a/src/alert-manager/src/alert-handler/package.json +++ b/src/alert-manager/src/alert-handler/package.json @@ -74,7 +74,8 @@ "flatted": "^3.4.2", "ajv": "^6.14.0", "nodemailer": "^8.0.5", - "follow-redirects": "^1.16.0" + "follow-redirects": "^1.16.0", + "ip-address": "^10.1.1" }, "scripts": { "lint": "eslint .", diff --git a/src/alert-manager/src/alert-handler/yarn.lock b/src/alert-manager/src/alert-handler/yarn.lock index 54a06075..682450cc 100644 --- a/src/alert-manager/src/alert-handler/yarn.lock +++ b/src/alert-manager/src/alert-handler/yarn.lock @@ -2632,10 +2632,10 @@ __metadata: languageName: node linkType: hard -"ip-address@npm:^10.0.1": - version: 10.1.0 - resolution: "ip-address@npm:10.1.0" - checksum: 10c0/0103516cfa93f6433b3bd7333fa876eb21263912329bfa47010af5e16934eeeff86f3d2ae700a3744a137839ddfad62b900c7a445607884a49b5d1e32a3d7566 +"ip-address@npm:^10.1.1": + version: 10.2.0 + resolution: "ip-address@npm:10.2.0" + checksum: 10c0/5a00aada6e922c9c69dfc800ed5d0fa3348675ebdeed0e1575f503f27ca385b5f534363c9af7ad1daf64c1f1409388cdd3cc2e9b9b0fe1c924a431378d55075a languageName: node linkType: hard diff --git a/src/alert-manager/src/job-status-change-notification/package.json b/src/alert-manager/src/job-status-change-notification/package.json index 776186d9..64397ead 100644 --- a/src/alert-manager/src/job-status-change-notification/package.json +++ b/src/alert-manager/src/job-status-change-notification/package.json @@ -59,7 +59,9 @@ "mailparser": ">=3.9.3", "validator": "^13.15.22", "semver": "^6.3.1", - "follow-redirects": "^1.16.0" + "follow-redirects": "^1.16.0", + "axios": "^1.15.1", + "fast-uri": "^3.1.1" }, "scripts": { "lint": "eslint .", diff --git a/src/alert-manager/src/job-status-change-notification/yarn.lock b/src/alert-manager/src/job-status-change-notification/yarn.lock index ad275d5c..cc9062da 100644 --- a/src/alert-manager/src/job-status-change-notification/yarn.lock +++ b/src/alert-manager/src/job-status-change-notification/yarn.lock @@ -257,6 +257,15 @@ __metadata: languageName: node linkType: hard +"agent-base@npm:6": + version: 6.0.2 + resolution: "agent-base@npm:6.0.2" + dependencies: + debug: "npm:4" + checksum: 10c0/dc4f757e40b5f3e3d674bc9beb4f1048f4ee83af189bae39be99f57bf1f48dde166a8b0a5342a84b5944ee8e6ed1e5a9d801858f4ad44764e84957122fe46261 + languageName: node + linkType: hard + "ajv@npm:^8.18.0": version: 8.18.0 resolution: "ajv@npm:8.18.0" @@ -404,14 +413,15 @@ __metadata: languageName: node linkType: hard -"axios@npm:^1.15.0": - version: 1.15.0 - resolution: "axios@npm:1.15.0" +"axios@npm:^1.15.1": + version: 1.16.1 + resolution: "axios@npm:1.16.1" dependencies: - follow-redirects: "npm:^1.15.11" + follow-redirects: "npm:^1.16.0" form-data: "npm:^4.0.5" + https-proxy-agent: "npm:^5.0.1" proxy-from-env: "npm:^2.1.0" - checksum: 10c0/47e0f860e98d4d7aa145e89ce0cae00e1fb0f1d2485f065c21fce955ddb1dba4103a46bd0e47acd18a27208a7f62c96249e620db575521b92a968619ab133409 + checksum: 10c0/2f77e37e6552bbff8a772d058fb09500198e9188c6b20dc799d82dbe12a8cb506f6eed4e4e62a9ba612a35cbab496faa26d68f9bff14a53af6d15c3e136391a7 languageName: node linkType: hard @@ -563,16 +573,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:^3.2.7": - version: 3.2.7 - resolution: "debug@npm:3.2.7" - dependencies: - ms: "npm:^2.1.1" - checksum: 10c0/37d96ae42cbc71c14844d2ae3ba55adf462ec89fd3a999459dec3833944cd999af6007ff29c780f1c61153bcaaf2c842d1e4ce1ec621e4fc4923244942e4a02a - languageName: node - linkType: hard - -"debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4": +"debug@npm:4, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4": version: 4.4.3 resolution: "debug@npm:4.4.3" dependencies: @@ -584,6 +585,15 @@ __metadata: languageName: node linkType: hard +"debug@npm:^3.2.7": + version: 3.2.7 + resolution: "debug@npm:3.2.7" + dependencies: + ms: "npm:^2.1.1" + checksum: 10c0/37d96ae42cbc71c14844d2ae3ba55adf462ec89fd3a999459dec3833944cd999af6007ff29c780f1c61153bcaaf2c842d1e4ce1ec621e4fc4923244942e4a02a + languageName: node + linkType: hard + "deep-is@npm:^0.1.3": version: 0.1.4 resolution: "deep-is@npm:0.1.4" @@ -1062,10 +1072,10 @@ __metadata: languageName: node linkType: hard -"fast-uri@npm:^3.0.1": - version: 3.1.0 - resolution: "fast-uri@npm:3.1.0" - checksum: 10c0/44364adca566f70f40d1e9b772c923138d47efeac2ae9732a872baafd77061f26b097ba2f68f0892885ad177becd065520412b8ffeec34b16c99433c5b9e2de7 +"fast-uri@npm:^3.1.1": + version: 3.1.2 + resolution: "fast-uri@npm:3.1.2" + checksum: 10c0/5b35641895959f3f7ab7a7b1b5542bded159346f25ec9f256817b206d50b64eda5828e90d605a2e2fc645c90519a7259c2bab2c942ee728c88b88e5be21b090d languageName: node linkType: hard @@ -1304,6 +1314,16 @@ __metadata: languageName: node linkType: hard +"https-proxy-agent@npm:^5.0.1": + version: 5.0.1 + resolution: "https-proxy-agent@npm:5.0.1" + dependencies: + agent-base: "npm:6" + debug: "npm:4" + checksum: 10c0/6dd639f03434003577c62b27cafdb864784ef19b2de430d8ae2a1d45e31c4fd60719e5637b44db1a88a046934307da7089e03d6089ec3ddacc1189d8de8897d1 + languageName: node + linkType: hard + "ignore@npm:^5.1.1, ignore@npm:^5.2.0": version: 5.3.2 resolution: "ignore@npm:5.3.2" diff --git a/src/cilium/build/cilium-agent.common.dockerfile b/src/cilium/build/cilium-agent.common.dockerfile index ae7b782b..e0d13d5b 100644 --- a/src/cilium/build/cilium-agent.common.dockerfile +++ b/src/cilium/build/cilium-agent.common.dockerfile @@ -16,19 +16,19 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # Build cilium agent from source with updated Go. -# This fixes Go stdlib and grpc vulnerabilities by compiling with Go 1.25.9 +# This fixes Go stdlib and grpc vulnerabilities by compiling with Go 1.25.10 # (latest 1.25.x patch). All Go binaries (cilium, hubble, CNI plugins) are # compiled from source so no pre-built binaries from the base image are used. # Runtime base is the official cilium-runtime image (Ubuntu 24.04 + LLVM + BPF tools) # with OS-level security patches applied. # -ARG GOLANG_VERSION=1.25.9 -ARG CILIUM_VERSION=v1.18.9 +ARG GOLANG_VERSION=1.25.10 +ARG CILIUM_VERSION=v1.18.10 ARG CNI_PLUGINS_VERSION=v1.9.0 ARG GOPS_VERSION=v0.3.27 -ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:13e905399a00ec93849808d5dc775ccc4a6a91a6@sha256:86dfbe17994adef8e7817b8d97351fd0120576a5fc845198f7d39a2788b891e9 -ARG CILIUM_ENVOY_IMAGE=quay.io/cilium/cilium-envoy:v1.36.6-1776000132-2437d2edeaf4d9b56ef279bd0d71127440c067aa@sha256:ba0ab8adac082d50d525fd2c5ba096c8facea3a471561b7c61c7a5b9c2e0de0d +ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:5615e8b62b0b47ad5a586bf459d0c072eaa0442a@sha256:5edc984f0a8f4ae208d60490a3234d1950b5497d2646980328e69f4a73c50e85 +ARG CILIUM_ENVOY_IMAGE=quay.io/cilium/cilium-envoy:v1.36.6-1778235340-b87d1e32f522b33bd51701c6476d199326f01496@sha256:71d4fa0ec45e8d546dbd5604e169dc77fe92be63b799313bff031d00d89762e3 # Stage 1: Build all Go binaries from source with Go 1.25.9 FROM golang:${GOLANG_VERSION} AS builder diff --git a/src/cilium/build/cilium-envoy.common.dockerfile b/src/cilium/build/cilium-envoy.common.dockerfile index 092cf472..7088adb8 100644 --- a/src/cilium/build/cilium-envoy.common.dockerfile +++ b/src/cilium/build/cilium-envoy.common.dockerfile @@ -16,12 +16,12 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # Rebuild cilium-envoy image with latest OS security patches. -# Base: official cilium-envoy matching cilium v1.18.9 +# Base: official cilium-envoy matching cilium v1.18.10 # This patches OS-level CVEs (libc6, libgnutls30t64, libsystemd0). # -ARG CILIUM_ENVOY_TAG=v1.36.6-1776000132-2437d2edeaf4d9b56ef279bd0d71127440c067aa -FROM quay.io/cilium/cilium-envoy:${CILIUM_ENVOY_TAG}@sha256:ba0ab8adac082d50d525fd2c5ba096c8facea3a471561b7c61c7a5b9c2e0de0d +ARG CILIUM_ENVOY_TAG=v1.36.6-1778235340-b87d1e32f522b33bd51701c6476d199326f01496 +FROM quay.io/cilium/cilium-envoy:${CILIUM_ENVOY_TAG}@sha256:71d4fa0ec45e8d546dbd5604e169dc77fe92be63b799313bff031d00d89762e3 # Apply latest Ubuntu security updates RUN apt-get update && \ diff --git a/src/cilium/build/cilium-operator.common.dockerfile b/src/cilium/build/cilium-operator.common.dockerfile index 3897f16b..02759703 100644 --- a/src/cilium/build/cilium-operator.common.dockerfile +++ b/src/cilium/build/cilium-operator.common.dockerfile @@ -16,12 +16,12 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # Build cilium-operator-generic from source with updated Go. -# This fixes Go stdlib and grpc vulnerabilities by compiling with Go 1.25.9 +# This fixes Go stdlib and grpc vulnerabilities by compiling with Go 1.25.10 # (latest 1.25.x patch). The operator is a pure Go binary (CGO_ENABLED=0, scratch base). # -ARG GOLANG_VERSION=1.25.9 -ARG CILIUM_VERSION=v1.18.9 +ARG GOLANG_VERSION=1.25.10 +ARG CILIUM_VERSION=v1.18.10 # Stage 1: Build operator binary FROM golang:${GOLANG_VERSION} AS builder diff --git a/src/cilium/build/push.sh b/src/cilium/build/push.sh new file mode 100755 index 00000000..f0579232 --- /dev/null +++ b/src/cilium/build/push.sh @@ -0,0 +1,130 @@ +#!/bin/bash +# Push cilium images with correct version tags to ACR. +# Reads registry domain from pai config and versions from Dockerfiles. +# Local images are expected to be built as: +# cilium-agent:latest, cilium-operator:latest, cilium-envoy:latest +# +# Usage: ./push.sh -c [-n ] +# e.g.: ./push.sh -c ~/configs/config-auto +# e.g.: ./push.sh -c ~/configs/config-auto -n @config +# e.g.: ./push.sh -c ~/configs/config-auto -n my-namespace +# +# Options: +# -c Path to pai config directory (required) +# -n Image namespace (default: cilium) +# Use "@config" to read namespace from services-configuration.yaml +# -h Show this help message + +set -euo pipefail + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" + +usage() { + echo "Usage: $0 -c [-n ]" + echo "" + echo "Push cilium images to ACR with version-based tags." + echo "Expects local images: cilium-agent:latest, cilium-operator:latest, cilium-envoy:latest" + echo "" + echo "Options:" + echo " -c Path to pai config directory (required)" + echo " -n Image namespace (default: cilium)" + echo " Use \"@config\" to read namespace from services-configuration.yaml" + echo " -h Show this help message" + echo "" + echo "Examples:" + echo " $0 -c ~/configs/config-auto" + echo " $0 -c ~/configs/config-auto -n @config" + echo " $0 -c ~/configs/config-auto -n my-namespace" +} + +# Parse arguments +CONFIG_DIR="" +NAMESPACE="cilium" + +while getopts "c:n:h" opt; do + case $opt in + c) CONFIG_DIR="$OPTARG" ;; + n) NAMESPACE="$OPTARG" ;; + h) usage; exit 0 ;; + *) usage; exit 1 ;; + esac +done + +if [ -z "$CONFIG_DIR" ]; then + usage + exit 1 +fi + +SERVICES_CONFIG="$CONFIG_DIR/services-configuration.yaml" +if [ ! -f "$SERVICES_CONFIG" ]; then + echo "Error: $SERVICES_CONFIG not found" + exit 1 +fi + +# Parse registry info from services-configuration.yaml using python/yaml +read_config_value() { + python3 -c " +import yaml +with open('$SERVICES_CONFIG') as f: + cfg = yaml.safe_load(f) +val = cfg +for key in '$1'.split('.'): + val = val[key] +print(val) +" +} + +REGISTRY=$(read_config_value "cluster.docker-registry.domain") +if [ -z "$REGISTRY" ]; then + echo "Error: could not parse docker-registry.domain from $SERVICES_CONFIG" + exit 1 +fi + +# Resolve namespace +if [ "$NAMESPACE" = "@config" ]; then + NAMESPACE=$(read_config_value "cluster.docker-registry.namespace") + if [ -z "$NAMESPACE" ]; then + echo "Error: could not parse docker-registry.namespace from $SERVICES_CONFIG" + exit 1 + fi + echo "Namespace read from config: $NAMESPACE" +fi + +# Parse versions from Dockerfiles +CILIUM_VERSION=$(grep -m1 'ARG CILIUM_VERSION=' "$SCRIPT_DIR/cilium-agent.common.dockerfile" | cut -d= -f2) +ENVOY_TAG=$(grep -m1 'ARG CILIUM_ENVOY_TAG=' "$SCRIPT_DIR/cilium-envoy.common.dockerfile" | cut -d= -f2) +ENVOY_VERSION=$(echo "$ENVOY_TAG" | sed 's/-[a-f0-9]\{40\}$//') + +echo "" +echo "Registry: $REGISTRY" +echo "Namespace: $NAMESPACE" +echo "Cilium: $CILIUM_VERSION" +echo "Envoy: $ENVOY_VERSION" +echo "" + +# Login to ACR +REGISTRY_NAME="${REGISTRY%.azurecr.io}" +echo "Logging in to ACR: $REGISTRY_NAME ..." +if ! az acr login --name "$REGISTRY_NAME"; then + echo "Error: failed to login to ACR '$REGISTRY_NAME'. Please check your Azure credentials." + exit 1 +fi +echo "" + +# Map: local_image -> remote_image +declare -A IMAGE_MAP=( + ["cilium-agent:latest"]="${NAMESPACE}/cilium:${CILIUM_VERSION}-update" + ["cilium-operator:latest"]="${NAMESPACE}/operator-generic:${CILIUM_VERSION}-update" + ["cilium-envoy:latest"]="${NAMESPACE}/cilium-envoy:${ENVOY_VERSION}-update" +) + +for local_img in "${!IMAGE_MAP[@]}"; do + remote_img="${REGISTRY}/${IMAGE_MAP[$local_img]}" + echo "Tagging ${local_img} -> ${remote_img}" + docker tag "$local_img" "$remote_img" + echo "Pushing ${remote_img} ..." + docker push "$remote_img" + echo "" +done + +echo "Done. Tagged and pushed ${#IMAGE_MAP[@]} images." diff --git a/src/database-controller/src/package.json b/src/database-controller/src/package.json index 2e46b842..6a09fe45 100644 --- a/src/database-controller/src/package.json +++ b/src/database-controller/src/package.json @@ -30,9 +30,9 @@ "openpaidbsdk": "file:../sdk", "p-queue": "^8.1.0", "statuses": "^2.0.1", - "uuid": "^11.1.0", + "uuid": "^11.1.1", "winston": "2", - "ws": "^8.18.2" + "ws": "^8.20.1" }, "overrides": { "express@*": "5.2.1", @@ -54,7 +54,10 @@ "semver": "^6.3.1", "path-to-regexp": "^8.4.0", "brace-expansion": "^1.1.13", - "lodash": "^4.18.0" + "lodash": "^4.18.0", + "uuid": "^11.1.1", + "ip-address": "^10.1.1", + "ws": "^8.20.1" }, "_moduleAliases": { "@dbc": "." diff --git a/src/database-controller/src/yarn.lock b/src/database-controller/src/yarn.lock index e159960a..cb2eb96b 100644 --- a/src/database-controller/src/yarn.lock +++ b/src/database-controller/src/yarn.lock @@ -1371,10 +1371,10 @@ interval-promise@^1.4.0: resolved "https://registry.yarnpkg.com/interval-promise/-/interval-promise-1.4.0.tgz#eef1a3633c6c6560488d8ca4b2f52cf901e16f8d" integrity sha512-PUwEmGqUglJhb6M01JNvMDvxr4DA8FCeYoYCLHPEcBBZiq/8yOpCchfs1VJui7fXj69l170gAxzF1FeSA0nSlg== -ip-address@^10.0.1: - version "10.1.0" - resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-10.1.0.tgz#d8dcffb34d0e02eb241427444a6e23f5b0595aa4" - integrity sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q== +ip-address@^10.0.1, ip-address@^10.1.1: + version "10.2.0" + resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-10.2.0.tgz#805fc178b20c518bd4c8548b24fe30892d7f3206" + integrity sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA== ipaddr.js@1.9.1: version "1.9.1" @@ -2643,15 +2643,10 @@ uri-js@^4.2.2: dependencies: punycode "^2.1.0" -uuid@^11.1.0: - version "11.1.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-11.1.0.tgz#9549028be1753bb934fc96e2bca09bb4105ae912" - integrity sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A== - -uuid@^8.3.2: - version "8.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" - integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== +uuid@^11.1.1, uuid@^8.3.2: + version "11.1.1" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-11.1.1.tgz#f6d81d2e1c65d00762e5e29b16c5d2d995e208ad" + integrity sha512-vIYxrBCC/N/K+Js3qSN88go7kIfNPssr/hHCesKCQNAjmgvYS2oqr69kIufEG+O4+PfezOH4EbIeHCfFov8ZgQ== validator@^13.15.22, validator@^13.9.0: version "13.15.35" @@ -2765,10 +2760,10 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== -ws@^8.18.2: - version "8.18.3" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.3.tgz#b56b88abffde62791c639170400c93dcb0c95472" - integrity sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg== +ws@^8.20.1: + version "8.21.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.21.0.tgz#012e413fc07429945121b0c153158c4343086951" + integrity sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g== xtend@^4.0.0: version "4.0.2" diff --git a/src/device-plugin/build/k8s-host-device-plugin.k8s.dockerfile b/src/device-plugin/build/k8s-host-device-plugin.k8s.dockerfile index 55b830e4..ba596792 100644 --- a/src/device-plugin/build/k8s-host-device-plugin.k8s.dockerfile +++ b/src/device-plugin/build/k8s-host-device-plugin.k8s.dockerfile @@ -1,7 +1,7 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. -FROM golang:1.25 as build +FROM golang:1.25.10 as build ARG TARGETOS ARG TARGETARCH @@ -13,15 +13,15 @@ RUN git clone --branch 1.31.4-0.1.0 --single-branch https://github.com/everpeace WORKDIR /go/src/k8s-host-device-plugin -RUN go mod edit -go=1.25 -toolchain=go1.25 +RUN go mod edit -go=1.25.10 -toolchain=go1.25.10 RUN go mod edit \ -require=github.com/fsnotify/fsnotify@v1.9.0 \ - -require=golang.org/x/net@v0.40.0 \ + -require=golang.org/x/net@v0.53.0 \ -require=google.golang.org/grpc@v1.79.3 \ -require=k8s.io/kubelet@v0.33.1 -RUN go mod tidy -go=1.25 +RUN go mod tidy -go=1.25.10 RUN go install -ldflags="-s -w" diff --git a/src/device-plugin/build/k8s-nvidia-device-plugin.k8s.dockerfile b/src/device-plugin/build/k8s-nvidia-device-plugin.k8s.dockerfile index 747190cf..59d382db 100644 --- a/src/device-plugin/build/k8s-nvidia-device-plugin.k8s.dockerfile +++ b/src/device-plugin/build/k8s-nvidia-device-plugin.k8s.dockerfile @@ -1,7 +1,7 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. -FROM golang:1.25.8 AS build +FROM golang:1.25.10 AS build ARG TARGETOS ARG TARGETARCH diff --git a/src/device-plugin/build/k8s-rdma-shared-dev-plugin.k8s.dockerfile b/src/device-plugin/build/k8s-rdma-shared-dev-plugin.k8s.dockerfile index 5e672094..71b18ca8 100644 --- a/src/device-plugin/build/k8s-rdma-shared-dev-plugin.k8s.dockerfile +++ b/src/device-plugin/build/k8s-rdma-shared-dev-plugin.k8s.dockerfile @@ -1,7 +1,7 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. -FROM golang:1.25-alpine3.23 as builder +FROM golang:1.25.10-alpine3.23 as builder ARG TARGETOS ARG TARGETARCH @@ -21,7 +21,9 @@ ENV HTTPS_PROXY $https_proxy RUN apk add --no-cache --virtual build-base linux-headers WORKDIR /usr/src/k8s-rdma-shared-dp -RUN make clean && \ +RUN go get golang.org/x/net@v0.53.0 && \ + go mod tidy && \ + make clean && \ make build FROM alpine:3.23 diff --git a/src/device-plugin/build/k8s-rocm-device-plugin.k8s.dockerfile b/src/device-plugin/build/k8s-rocm-device-plugin.k8s.dockerfile index 5c13f4b8..7114a1af 100644 --- a/src/device-plugin/build/k8s-rocm-device-plugin.k8s.dockerfile +++ b/src/device-plugin/build/k8s-rocm-device-plugin.k8s.dockerfile @@ -1,7 +1,7 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. -FROM docker.io/golang:1.25-alpine as builder +FROM docker.io/golang:1.25.10-alpine as builder ARG TARGETOS ARG TARGETARCH @@ -17,19 +17,19 @@ RUN git clone --branch v1.31.0.7 --single-branch https://github.com/ROCm/k8s-dev WORKDIR /go/src/github.com/ROCm/k8s-device-plugin -RUN go mod edit -go=1.25 -toolchain=go1.25 +RUN go mod edit -go=1.25.10 -toolchain=go1.25.10 RUN go mod edit \ -require=github.com/go-logr/logr@v1.4.3 \ -require=github.com/golang/glog@v1.2.5 \ - -require=golang.org/x/net@v0.40.0 \ + -require=golang.org/x/net@v0.53.0 \ -require=google.golang.org/grpc@v1.72.2 \ -require=google.golang.org/protobuf@v1.36.6 \ -require=k8s.io/api@v0.33.1 \ -require=k8s.io/apimachinery@v0.33.1 \ -require=k8s.io/kubelet@v0.33.1 \ -require=sigs.k8s.io/controller-runtime@v0.21.0 -RUN go mod tidy -go=1.25 +RUN go mod tidy -go=1.25.10 WORKDIR /go/src/github.com/ROCm/k8s-device-plugin/cmd/k8s-device-plugin diff --git a/src/frameworkcontroller/build/frameworkbarrier.common.dockerfile b/src/frameworkcontroller/build/frameworkbarrier.common.dockerfile index 5f905e42..5dbdae51 100644 --- a/src/frameworkcontroller/build/frameworkbarrier.common.dockerfile +++ b/src/frameworkcontroller/build/frameworkbarrier.common.dockerfile @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE -FROM golang:1.25-alpine3.23 as builder +FROM golang:1.25.10-alpine3.23 as builder ENV GOPATH=/go ENV PROJECT_DIR=/src diff --git a/src/frameworkcontroller/build/frameworkcontroller.common.dockerfile b/src/frameworkcontroller/build/frameworkcontroller.common.dockerfile index fd331efd..0ecafa43 100644 --- a/src/frameworkcontroller/build/frameworkcontroller.common.dockerfile +++ b/src/frameworkcontroller/build/frameworkcontroller.common.dockerfile @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE -FROM golang:1.25-alpine3.23 as builder +FROM golang:1.25.10-alpine3.23 as builder ENV GOPATH=/go ENV PROJECT_DIR=/src diff --git a/src/frameworkcontroller/src/go.mod b/src/frameworkcontroller/src/go.mod index 49353be7..dd30cfe0 100644 --- a/src/frameworkcontroller/src/go.mod +++ b/src/frameworkcontroller/src/go.mod @@ -32,11 +32,11 @@ require ( github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/spf13/pflag v1.0.6 // indirect github.com/x448/float16 v0.8.4 // indirect - golang.org/x/net v0.40.0 // indirect + golang.org/x/net v0.53.0 // indirect golang.org/x/oauth2 v0.30.0 // indirect - golang.org/x/sys v0.33.0 // indirect - golang.org/x/term v0.32.0 // indirect - golang.org/x/text v0.25.0 // indirect + golang.org/x/sys v0.43.0 // indirect + golang.org/x/term v0.42.0 // indirect + golang.org/x/text v0.36.0 // indirect golang.org/x/time v0.11.0 // indirect google.golang.org/protobuf v1.36.6 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect diff --git a/src/frameworkcontroller/src/go.sum b/src/frameworkcontroller/src/go.sum index bc706a8c..9125e028 100644 --- a/src/frameworkcontroller/src/go.sum +++ b/src/frameworkcontroller/src/go.sum @@ -80,8 +80,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY= -golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds= +golang.org/x/net v0.53.0 h1:d+qAbo5L0orcWAr0a9JweQpjXF19LMXJE8Ey7hwOdUA= +golang.org/x/net v0.53.0/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs= golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI= golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -90,22 +90,22 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= -golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= -golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg= -golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ= +golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI= +golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/term v0.42.0 h1:UiKe+zDFmJobeJ5ggPwOshJIVt6/Ft0rcfrXZDLWAWY= +golang.org/x/term v0.42.0/go.mod h1:Dq/D+snpsbazcBG5+F9Q1n2rXV8Ma+71xEjTRufARgY= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4= -golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA= +golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg= +golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164= golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0= golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= -golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= +golang.org/x/tools v0.43.0 h1:12BdW9CeB3Z+J/I/wj34VMl8X+fEXBxVR90JeMX5E7s= +golang.org/x/tools v0.43.0/go.mod h1:uHkMso649BX2cZK6+RpuIPXS3ho2hZo4FVwfoy1vIk0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/src/grafana/build/grafana.common.dockerfile b/src/grafana/build/grafana.common.dockerfile index f33a2f48..ebccb1a6 100644 --- a/src/grafana/build/grafana.common.dockerfile +++ b/src/grafana/build/grafana.common.dockerfile @@ -19,7 +19,7 @@ FROM node:20 AS build ARG TARGETOS ARG TARGETARCH -ENV GOVERSION=1.25.9 +ENV GOVERSION=1.25.10 ENV PLUGINVERSION=v3.7.0 ENV GOPATH=/usr/local/go diff --git a/src/hivedscheduler/build/hivedscheduler.k8s.dockerfile b/src/hivedscheduler/build/hivedscheduler.k8s.dockerfile index 7115a164..57216888 100644 --- a/src/hivedscheduler/build/hivedscheduler.k8s.dockerfile +++ b/src/hivedscheduler/build/hivedscheduler.k8s.dockerfile @@ -1,7 +1,7 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. -FROM golang:1.25-alpine3.23 AS builder +FROM golang:1.25.10-alpine3.23 AS builder ARG TEST=false ENV GOPATH=/go diff --git a/src/hivedscheduler/build/kube-scheduler.k8s.dockerfile b/src/hivedscheduler/build/kube-scheduler.k8s.dockerfile index 4155b7ee..783d58b1 100644 --- a/src/hivedscheduler/build/kube-scheduler.k8s.dockerfile +++ b/src/hivedscheduler/build/kube-scheduler.k8s.dockerfile @@ -1,7 +1,7 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. -FROM golang:1.25.9 AS builder +FROM golang:1.25.10 AS builder ARG TARGETOS ARG TARGETARCH @@ -25,9 +25,9 @@ RUN for modfile in $(find . -name 'go.mod' -not -path './vendor/*'); do \ done && \ go work vendor -RUN GOTOOLCHAIN=go1.25.9 KUBE_BUILD_PLATFORMS=linux/${TARGETARCH} \ +RUN GOTOOLCHAIN=go1.25.10 KUBE_BUILD_PLATFORMS=linux/${TARGETARCH} \ make WHAT=cmd/kube-scheduler -FROM registry.k8s.io/build-image/go-runner:v2.4.0-go1.25.9-bookworm.0 +FROM registry.k8s.io/build-image/go-runner:v2.4.0-go1.25.10-bookworm.0 COPY --from=builder /go/kubernetes/_output/local/go/bin/kube-scheduler /usr/local/bin/kube-scheduler diff --git a/src/hivedscheduler/src/go.mod b/src/hivedscheduler/src/go.mod index e567f0f5..14bd120d 100644 --- a/src/hivedscheduler/src/go.mod +++ b/src/hivedscheduler/src/go.mod @@ -44,13 +44,12 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.yaml.in/yaml/v2 v2.4.2 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect - golang.org/x/net v0.41.0 // indirect + golang.org/x/net v0.53.0 // indirect golang.org/x/oauth2 v0.30.0 // indirect - golang.org/x/sys v0.33.0 // indirect - golang.org/x/term v0.32.0 // indirect - golang.org/x/text v0.26.0 // indirect + golang.org/x/sys v0.43.0 // indirect + golang.org/x/term v0.42.0 // indirect + golang.org/x/text v0.36.0 // indirect golang.org/x/time v0.12.0 // indirect - golang.org/x/tools v0.34.0 // indirect google.golang.org/protobuf v1.36.6 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/src/hivedscheduler/src/go.sum b/src/hivedscheduler/src/go.sum index f15a2529..c4f0a8ea 100644 --- a/src/hivedscheduler/src/go.sum +++ b/src/hivedscheduler/src/go.sum @@ -107,8 +107,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw= -golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA= +golang.org/x/net v0.53.0 h1:d+qAbo5L0orcWAr0a9JweQpjXF19LMXJE8Ey7hwOdUA= +golang.org/x/net v0.53.0/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs= golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI= golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -117,22 +117,22 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= -golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= -golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg= -golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ= +golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI= +golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/term v0.42.0 h1:UiKe+zDFmJobeJ5ggPwOshJIVt6/Ft0rcfrXZDLWAWY= +golang.org/x/term v0.42.0/go.mod h1:Dq/D+snpsbazcBG5+F9Q1n2rXV8Ma+71xEjTRufARgY= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M= -golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA= +golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg= +golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164= golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE= golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.34.0 h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo= -golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg= +golang.org/x/tools v0.43.0 h1:12BdW9CeB3Z+J/I/wj34VMl8X+fEXBxVR90JeMX5E7s= +golang.org/x/tools v0.43.0/go.mod h1:uHkMso649BX2cZK6+RpuIPXS3ho2hZo4FVwfoy1vIk0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/src/job-exporter/build/job-exporter.common.dockerfile b/src/job-exporter/build/job-exporter.common.dockerfile index 0ec70949..ee795b17 100644 --- a/src/job-exporter/build/job-exporter.common.dockerfile +++ b/src/job-exporter/build/job-exporter.common.dockerfile @@ -46,16 +46,15 @@ RUN python3 -m pip install --no-cache-dir -U pip wheel && \ ############################ # nerdctl-builder: build nerdctl from source ############################ -FROM golang:1.25.9 AS nerdctl-builder +FROM golang:1.26.3 AS nerdctl-builder ARG TARGETARCH -ARG NERDCTL_VERSION=2.2.2 +ARG NERDCTL_VERSION=2.3.1 WORKDIR /build RUN set -eux; \ git clone --depth 1 --branch v${NERDCTL_VERSION} https://github.com/containerd/nerdctl.git .; \ - go get github.com/go-jose/go-jose/v4@v4.1.4 && go mod tidy && if [ -d vendor ]; then go work vendor 2>/dev/null || go mod vendor; fi; \ make binaries; \ mkdir -p /opt/nerdctl; \ cp _output/nerdctl /opt/nerdctl/nerdctl; \ diff --git a/src/job-exporter/src/Moneo/src/worker/exporters/nvidia_exporter.py b/src/job-exporter/src/Moneo/src/worker/exporters/nvidia_exporter.py index b623e8d6..8df3e7a4 100644 --- a/src/job-exporter/src/Moneo/src/worker/exporters/nvidia_exporter.py +++ b/src/job-exporter/src/Moneo/src/worker/exporters/nvidia_exporter.py @@ -12,6 +12,7 @@ import shlex sys.path.append('/usr/local/dcgm/bindings/python3') +sys.path.append('/usr/share/datacenter-gpu-manager-4/bindings/python3') import dcgm_fields from DcgmReader import DcgmReader from common import dcgm_client_cli_parser diff --git a/src/model-proxy/build/model-proxy.common.dockerfile b/src/model-proxy/build/model-proxy.common.dockerfile index dd4e7110..585e8a3d 100644 --- a/src/model-proxy/build/model-proxy.common.dockerfile +++ b/src/model-proxy/build/model-proxy.common.dockerfile @@ -1,5 +1,5 @@ # Build stage -FROM golang:1.25.9 AS builder +FROM golang:1.25.10 AS builder WORKDIR /app COPY ./src /app/model-proxy diff --git a/src/openpai-runtime/build/openpai-runtime.common.dockerfile b/src/openpai-runtime/build/openpai-runtime.common.dockerfile index 5b5d7d26..7f20bba4 100644 --- a/src/openpai-runtime/build/openpai-runtime.common.dockerfile +++ b/src/openpai-runtime/build/openpai-runtime.common.dockerfile @@ -42,7 +42,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends wget gcc libc6- RUN cd daemontools-encore-1.10 && sed -i 's/gcc -s/gcc -s -static/g' conf-ld && make -j && \ cp multilog /usr/local/bin/multilog -FROM golang:1.25 AS builder +FROM golang:1.25.10 AS builder ENV PROJECT_DIR=/src/ ENV INSTALL_DIR=/opt/kube-runtime @@ -55,7 +55,7 @@ RUN ${PROJECT_DIR}/build/runtime/go-build.sh && \ COPY --from=multilog-builder /usr/local/bin/multilog ${INSTALL_DIR}/multilog -FROM golang:1.25-alpine3.23 as barrier-builder +FROM golang:1.25.10-alpine3.23 as barrier-builder ENV GOPATH=/go ENV PROJECT_DIR=/src diff --git a/src/postgresql/build/postgresql.k8s.dockerfile b/src/postgresql/build/postgresql.k8s.dockerfile index e779a0cb..507aebfc 100644 --- a/src/postgresql/build/postgresql.k8s.dockerfile +++ b/src/postgresql/build/postgresql.k8s.dockerfile @@ -14,17 +14,17 @@ # 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 golang:1.25 AS gosu +FROM golang:1.25.10 AS gosu WORKDIR /src RUN git clone --branch 1.19 --depth 1 https://github.com/tianon/gosu.git . -RUN go mod edit -go=1.25 \ - && go mod edit -toolchain=go1.25 \ - && go mod tidy -compat=1.25 +RUN go mod edit -go=1.25.10 \ + && go mod edit -toolchain=go1.25.10 \ + && go mod tidy -compat=1.25.10 -RUN go get -u ./... && go mod tidy -compat=1.25 +RUN go get -u ./... && go mod tidy -compat=1.25.10 RUN go mod download diff --git a/src/pylon/build/reverseproxy.common.dockerfile b/src/pylon/build/reverseproxy.common.dockerfile index 9d40dc53..b1486d50 100644 --- a/src/pylon/build/reverseproxy.common.dockerfile +++ b/src/pylon/build/reverseproxy.common.dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.25 AS builder +FROM golang:1.25.10 AS builder RUN git clone --branch v0.68.1 --depth 1 https://github.com/fatedier/frp.git /frp WORKDIR /frp @@ -7,6 +7,7 @@ RUN go get github.com/go-jose/go-jose/v4@v4.1.4 && \ go get github.com/quic-go/quic-go@v0.57.0 && \ go get github.com/pion/dtls/v3@v3.0.11 && \ go get github.com/Azure/go-ntlmssp@v0.1.1 && \ + go get golang.org/x/net@v0.53.0 && \ go mod tidy && if [ -d vendor ]; then go work vendor 2>/dev/null || go mod vendor; fi RUN make frpc diff --git a/src/rest-server/package.json b/src/rest-server/package.json index 96c2986b..4e732eb4 100644 --- a/src/rest-server/package.json +++ b/src/rest-server/package.json @@ -87,14 +87,18 @@ "qs": "^6.14.2", "minimatch": ">=10.2.3", "ajv": "^8.18.0", - "fast-xml-parser": "^5.5.9", + "fast-xml-parser": "^5.7.0", "form-data": "^4.0.4", "path-to-regexp": "^8.4.1", "flatted": "^3.4.2", "dottie": ">=2.0.7", "serialize-javascript": ">=7.0.3", "sequelize": ">=6.37.8", - "follow-redirects": "^1.16.0" + "follow-redirects": "^1.16.0", + "axios": "^1.15.1", + "fast-uri": "^3.1.1", + "ip-address": "^10.1.1", + "fast-xml-builder": "^1.1.7" }, "_moduleAliases": { "@pai": "src" diff --git a/src/rest-server/yarn.lock b/src/rest-server/yarn.lock index fb1f9cef..64f35009 100644 --- a/src/rest-server/yarn.lock +++ b/src/rest-server/yarn.lock @@ -626,6 +626,13 @@ __metadata: languageName: node linkType: hard +"@nodable/entities@npm:^2.1.0": + version: 2.1.0 + resolution: "@nodable/entities@npm:2.1.0" + checksum: 10c0/5a4cba2b61a5b6c726328b18b1de6d033cae4a658a118644bf31e0bcbda126ea7b69385043dc556cf1ed859b9ca220e82b81b5e5c48ef1b519fb8ec104575dee + languageName: node + linkType: hard + "@open-draft/deferred-promise@npm:^2.2.0": version: 2.2.0 resolution: "@open-draft/deferred-promise@npm:2.2.0" @@ -863,6 +870,15 @@ __metadata: languageName: node linkType: hard +"agent-base@npm:6": + version: 6.0.2 + resolution: "agent-base@npm:6.0.2" + dependencies: + debug: "npm:4" + checksum: 10c0/dc4f757e40b5f3e3d674bc9beb4f1048f4ee83af189bae39be99f57bf1f48dde166a8b0a5342a84b5944ee8e6ed1e5a9d801858f4ad44764e84957122fe46261 + languageName: node + linkType: hard + "agent-base@npm:^7.1.0, agent-base@npm:^7.1.2": version: 7.1.4 resolution: "agent-base@npm:7.1.4" @@ -1119,14 +1135,15 @@ __metadata: languageName: node linkType: hard -"axios@npm:^1.15.0": - version: 1.15.0 - resolution: "axios@npm:1.15.0" +"axios@npm:^1.15.1": + version: 1.16.1 + resolution: "axios@npm:1.16.1" dependencies: - follow-redirects: "npm:^1.15.11" + follow-redirects: "npm:^1.16.0" form-data: "npm:^4.0.5" + https-proxy-agent: "npm:^5.0.1" proxy-from-env: "npm:^2.1.0" - checksum: 10c0/47e0f860e98d4d7aa145e89ce0cae00e1fb0f1d2485f065c21fce955ddb1dba4103a46bd0e47acd18a27208a7f62c96249e620db575521b92a968619ab133409 + checksum: 10c0/2f77e37e6552bbff8a772d058fb09500198e9188c6b20dc799d82dbe12a8cb506f6eed4e4e62a9ba612a35cbab496faa26d68f9bff14a53af6d15c3e136391a7 languageName: node linkType: hard @@ -2471,32 +2488,35 @@ __metadata: languageName: node linkType: hard -"fast-uri@npm:^3.0.1": - version: 3.1.0 - resolution: "fast-uri@npm:3.1.0" - checksum: 10c0/44364adca566f70f40d1e9b772c923138d47efeac2ae9732a872baafd77061f26b097ba2f68f0892885ad177becd065520412b8ffeec34b16c99433c5b9e2de7 +"fast-uri@npm:^3.1.1": + version: 3.1.2 + resolution: "fast-uri@npm:3.1.2" + checksum: 10c0/5b35641895959f3f7ab7a7b1b5542bded159346f25ec9f256817b206d50b64eda5828e90d605a2e2fc645c90519a7259c2bab2c942ee728c88b88e5be21b090d languageName: node linkType: hard -"fast-xml-builder@npm:^1.1.4": - version: 1.1.4 - resolution: "fast-xml-builder@npm:1.1.4" +"fast-xml-builder@npm:^1.1.7": + version: 1.2.0 + resolution: "fast-xml-builder@npm:1.2.0" dependencies: - path-expression-matcher: "npm:^1.1.3" - checksum: 10c0/d5dfc0660f7f886b9f42747e6aa1d5e16c090c804b322652f65a5d7ffb93aa00153c3e1276cd053629f9f4c4f625131dc6886677394f7048e827e63b97b18927 + path-expression-matcher: "npm:^1.5.0" + xml-naming: "npm:^0.1.0" + checksum: 10c0/84bb105cd04e91d6dcb746c4dbaeb12903b510e7ab9a06ffde55b5a582e005559a87d84467f18a655c6c4baf098f696fd74cee3cbe1aea9d01385907768ba32d languageName: node linkType: hard -"fast-xml-parser@npm:^5.5.9": - version: 5.5.9 - resolution: "fast-xml-parser@npm:5.5.9" +"fast-xml-parser@npm:^5.7.0": + version: 5.8.0 + resolution: "fast-xml-parser@npm:5.8.0" dependencies: - fast-xml-builder: "npm:^1.1.4" - path-expression-matcher: "npm:^1.2.0" - strnum: "npm:^2.2.2" + "@nodable/entities": "npm:^2.1.0" + fast-xml-builder: "npm:^1.2.0" + path-expression-matcher: "npm:^1.5.0" + strnum: "npm:^2.3.0" + xml-naming: "npm:^0.1.0" bin: fxparser: src/cli/cli.js - checksum: 10c0/b7f40f586c01a916a75be15b11ec0e83a38483885395bdeca51da8992a75e3d4d9b6c2690f362b975bfcb5118909ee4b0393e18ec9c9151345d5e13152370969 + checksum: 10c0/cd0828b7daf3f683c64d0d6a0c719f1476d4f02f1089cf345a9bc0b886e7d5fa18c11da025d480ea67a41765be63135cbd952051942c9d0b422a5d4dde11814e languageName: node linkType: hard @@ -2990,6 +3010,16 @@ __metadata: languageName: node linkType: hard +"https-proxy-agent@npm:^5.0.1": + version: 5.0.1 + resolution: "https-proxy-agent@npm:5.0.1" + dependencies: + agent-base: "npm:6" + debug: "npm:4" + checksum: 10c0/6dd639f03434003577c62b27cafdb864784ef19b2de430d8ae2a1d45e31c4fd60719e5637b44db1a88a046934307da7089e03d6089ec3ddacc1189d8de8897d1 + languageName: node + linkType: hard + "https-proxy-agent@npm:^7.0.0": version: 7.0.6 resolution: "https-proxy-agent@npm:7.0.6" @@ -3075,10 +3105,10 @@ __metadata: languageName: node linkType: hard -"ip-address@npm:^10.0.1": - version: 10.1.0 - resolution: "ip-address@npm:10.1.0" - checksum: 10c0/0103516cfa93f6433b3bd7333fa876eb21263912329bfa47010af5e16934eeeff86f3d2ae700a3744a137839ddfad62b900c7a445607884a49b5d1e32a3d7566 +"ip-address@npm:^10.1.1": + version: 10.2.0 + resolution: "ip-address@npm:10.2.0" + checksum: 10c0/5a00aada6e922c9c69dfc800ed5d0fa3348675ebdeed0e1575f503f27ca385b5f534363c9af7ad1daf64c1f1409388cdd3cc2e9b9b0fe1c924a431378d55075a languageName: node linkType: hard @@ -4480,10 +4510,10 @@ __metadata: languageName: node linkType: hard -"path-expression-matcher@npm:^1.1.3, path-expression-matcher@npm:^1.2.0": - version: 1.2.0 - resolution: "path-expression-matcher@npm:1.2.0" - checksum: 10c0/86c661dfb265ed5dd1ddd9188f0dfbecf4ec4dc3ea6cabab081d3a2ba285054d9767a641a233bd6fd694fd89f7d0ef94913032feddf5365252700b02db4bf4e1 +"path-expression-matcher@npm:^1.5.0": + version: 1.5.0 + resolution: "path-expression-matcher@npm:1.5.0" + checksum: 10c0/646cb5bc66cd7d809a52288336f3ac1e6223f156fd8e912936e490e590f7f93e8056d4fd25fcbcc7da61bb698fa520112cb050372a3f65e7b79bd4afa0f77610 languageName: node linkType: hard @@ -5479,10 +5509,10 @@ __metadata: languageName: node linkType: hard -"strnum@npm:^2.2.2": - version: 2.2.2 - resolution: "strnum@npm:2.2.2" - checksum: 10c0/89c456de32b9495ae34cd6e3b59cb9ef3406b66d1429bbc931afd70be87485dcd355200c42fd638a132adb3121762542346813098ab0c43e44aac303bf17965d +"strnum@npm:^2.3.0": + version: 2.3.0 + resolution: "strnum@npm:2.3.0" + checksum: 10c0/8d29ea0789df22dfa6101153573c76ce12fb065ed0807eb99cc64624cd7f3d67a5aa0db507e75ab985ca23908cc4f02c65f3359ad762cb3659e3d6456e76e143 languageName: node linkType: hard @@ -6075,6 +6105,13 @@ __metadata: languageName: node linkType: hard +"xml-naming@npm:^0.1.0": + version: 0.1.0 + resolution: "xml-naming@npm:0.1.0" + checksum: 10c0/8c7614865361bcb7e53e3e091dac21c567e2b92d447919b2f072775aa9dcfc94a5255bd52fbaa0fd53c93513e53a23a6a835218ad2af512451dbc678392f85fe + languageName: node + linkType: hard + "xml2js@npm:~0.6.2": version: 0.6.2 resolution: "xml2js@npm:0.6.2" diff --git a/src/watchdog/build/watchdog.common.dockerfile b/src/watchdog/build/watchdog.common.dockerfile index ee5d687d..949f0d34 100644 --- a/src/watchdog/build/watchdog.common.dockerfile +++ b/src/watchdog/build/watchdog.common.dockerfile @@ -1,7 +1,7 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. -FROM golang:1.25-alpine3.23 as builder +FROM golang:1.25.10-alpine3.23 as builder ENV PROJECT_DIR=/src ENV INSTALL_DIR=/opt/watchdog diff --git a/src/watchdog/src/go.mod b/src/watchdog/src/go.mod index 8b9351c9..0d2ac7ee 100644 --- a/src/watchdog/src/go.mod +++ b/src/watchdog/src/go.mod @@ -38,11 +38,11 @@ require ( github.com/prometheus/procfs v0.16.1 // indirect github.com/spf13/pflag v1.0.6 // indirect github.com/x448/float16 v0.8.4 // indirect - golang.org/x/net v0.39.0 // indirect + golang.org/x/net v0.53.0 // indirect golang.org/x/oauth2 v0.29.0 // indirect - golang.org/x/sys v0.32.0 // indirect - golang.org/x/term v0.31.0 // indirect - golang.org/x/text v0.24.0 // indirect + golang.org/x/sys v0.43.0 // indirect + golang.org/x/term v0.42.0 // indirect + golang.org/x/text v0.36.0 // indirect golang.org/x/time v0.11.0 // indirect google.golang.org/protobuf v1.36.6 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect diff --git a/src/watchdog/src/go.sum b/src/watchdog/src/go.sum index db344958..f1865665 100644 --- a/src/watchdog/src/go.sum +++ b/src/watchdog/src/go.sum @@ -94,8 +94,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY= -golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E= +golang.org/x/net v0.53.0 h1:d+qAbo5L0orcWAr0a9JweQpjXF19LMXJE8Ey7hwOdUA= +golang.org/x/net v0.53.0/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs= golang.org/x/oauth2 v0.29.0 h1:WdYw2tdTK1S8olAzWHdgeqfy+Mtm9XNhv/xJsY65d98= golang.org/x/oauth2 v0.29.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -104,22 +104,22 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20= -golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= -golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o= -golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw= +golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI= +golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/term v0.42.0 h1:UiKe+zDFmJobeJ5ggPwOshJIVt6/Ft0rcfrXZDLWAWY= +golang.org/x/term v0.42.0/go.mod h1:Dq/D+snpsbazcBG5+F9Q1n2rXV8Ma+71xEjTRufARgY= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0= -golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU= +golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg= +golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164= golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0= golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= -golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= +golang.org/x/tools v0.43.0 h1:12BdW9CeB3Z+J/I/wj34VMl8X+fEXBxVR90JeMX5E7s= +golang.org/x/tools v0.43.0/go.mod h1:uHkMso649BX2cZK6+RpuIPXS3ho2hZo4FVwfoy1vIk0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/src/webportal/package.json b/src/webportal/package.json index 9656cfbd..743bc78b 100644 --- a/src/webportal/package.json +++ b/src/webportal/package.json @@ -159,7 +159,9 @@ "dompurify": ">=3.3.2", "brace-expansion": "^5.0.5", "tar": "^7.5.11", - "follow-redirects": "^1.16.0" + "follow-redirects": "^1.16.0", + "fast-uri": "^3.1.1", + "fast-xml-builder": "^1.1.7" }, "engines": { "node": ">=20.0.0"