From e25165fc3626bf4824bf38f7f7a11b40c237eea9 Mon Sep 17 00:00:00 2001 From: Abhishek S A Date: Fri, 15 May 2026 13:15:46 +0530 Subject: [PATCH 1/3] Feature branch sync - pub/q2_dev to staging (#4443) * offline installation of custom volume exporter (#4442) * change calico images registry from docker.io to quay.io (#4439) Signed-off-by: Katakam-Rakesh --------- Signed-off-by: Katakam-Rakesh Co-authored-by: priti-parate <140157516+priti-parate@users.noreply.github.com> Co-authored-by: Katakam Rakesh Naga Sai <125246792+Katakam-Rakesh@users.noreply.github.com> --- .../x86_64/rhel/10.0/service_k8s_v1.35.1.json | 14 +++++++------- .../telemetry/victoria/csi-volume-exporter.yaml.j2 | 9 ++++----- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/input/config/x86_64/rhel/10.0/service_k8s_v1.35.1.json b/input/config/x86_64/rhel/10.0/service_k8s_v1.35.1.json index 4ed6a19ad9..749634d89f 100644 --- a/input/config/x86_64/rhel/10.0/service_k8s_v1.35.1.json +++ b/input/config/x86_64/rhel/10.0/service_k8s_v1.35.1.json @@ -23,7 +23,7 @@ { "package": "docker.io/curlimages/curl", "type": "image", "tag": "8.17.0" }, { "package": "docker.io/rmohr/activemq", "type": "image", "tag": "5.15.9" }, { "package": "docker.io/library/mysql", "type": "image", "tag": "9.3.0" }, - { "package": "docker.io/library/python", "type": "image", "tag": "3.11-slim" }, + { "package": "docker.io/library/python", "type": "image", "tag": "3.12-slim" }, { "package": "docker.io/dellhpcomniaaisolution/idrac_telemetry_receiver", "type": "image", "tag": "1.2" }, { "package": "docker.io/dellhpcomniaaisolution/kafkapump", "type": "image", "tag": "1.2" }, { "package": "docker.io/dellhpcomniaaisolution/victoriapump", "type": "image", "tag": "1.2" }, @@ -70,9 +70,9 @@ { "package": "registry.k8s.io/coredns/coredns", "tag": "v1.13.1", "type": "image" }, { "package": "registry.k8s.io/pause", "tag": "3.10.1", "type": "image" }, { "package": "registry.k8s.io/etcd", "tag": "3.6.6-0", "type": "image" }, - { "package": "docker.io/calico/cni", "tag": "v3.31.4", "type": "image" }, - { "package": "docker.io/calico/kube-controllers", "tag": "v3.31.4", "type": "image" }, - { "package": "docker.io/calico/node", "tag": "v3.31.4", "type": "image" }, + { "package": "quay.io/calico/cni", "tag": "v3.31.4", "type": "image" }, + { "package": "quay.io/calico/kube-controllers", "tag": "v3.31.4", "type": "image" }, + { "package": "quay.io/calico/node", "tag": "v3.31.4", "type": "image" }, { "package": "quay.io/metallb/speaker", "tag": "v0.15.3", "type": "image" }, { "package": "kubectl-1.35.1", "type": "rpm", "repo_name": "kubernetes-v1-35"}, { "package": "prettytable==3.14.0", "type": "pip_module" }, @@ -94,9 +94,9 @@ { "package": "docker.io/alpine/kubectl", "tag": "1.35.1", "type": "image" }, { "package": "registry.k8s.io/pause", "tag": "3.10.1", "type": "image" }, { "package": "registry.k8s.io/etcd", "tag": "3.6.6-0", "type": "image" }, - { "package": "docker.io/calico/cni", "tag": "v3.31.4", "type": "image" }, - { "package": "docker.io/calico/kube-controllers", "tag": "v3.31.4", "type": "image" }, - { "package": "docker.io/calico/node", "tag": "v3.31.4", "type": "image" }, + { "package": "quay.io/calico/cni", "tag": "v3.31.4", "type": "image" }, + { "package": "quay.io/calico/kube-controllers", "tag": "v3.31.4", "type": "image" }, + { "package": "quay.io/calico/node", "tag": "v3.31.4", "type": "image" }, { "package": "quay.io/metallb/speaker", "tag": "v0.15.3", "type": "image" }, { "package": "calico-v3.31.4","type": "manifest", "url": "https://raw.githubusercontent.com/projectcalico/calico/v3.31.4/manifests/calico.yaml" }, { "package": "metallb-native-v0.15.3", "type": "manifest", "url": "https://raw.githubusercontent.com/metallb/metallb/v0.15.3/config/manifests/metallb-native.yaml" }, diff --git a/provision/roles/telemetry/templates/telemetry/victoria/csi-volume-exporter.yaml.j2 b/provision/roles/telemetry/templates/telemetry/victoria/csi-volume-exporter.yaml.j2 index 2bb7220e09..00f9219d76 100644 --- a/provision/roles/telemetry/templates/telemetry/victoria/csi-volume-exporter.yaml.j2 +++ b/provision/roles/telemetry/templates/telemetry/victoria/csi-volume-exporter.yaml.j2 @@ -84,11 +84,10 @@ spec: command: ["/bin/sh", "-c"] args: - | - pip3 install prometheus_client==0.20.0 kubernetes==33.1.0 \ - --find-links="{{ offline_pip_module_path }}/prometheus_client==0.20.0/" \ - --trusted-host "{{ pulp_server_ip }}" \ - --no-index || \ - pip3 install prometheus_client kubernetes + pip3 install --no-index --find-links "{{ offline_pip_module_path }}/kubernetes==33.1.0" kubernetes==33.1.0 \ + "{{ offline_pip_module_path }}/prometheus_client==0.20.0/prometheus_client-0.20.0-py3-none-any.whl" \ + --trusted-host "{{ pulp_server_ip }}" || \ + pip3 install kubernetes prometheus_client mkdir -p /app cat > /app/exporter.py <<'PYEOF' from prometheus_client import start_http_server, Gauge, Counter, Info From 5ca86bf372b5356d02a7415b0e3b938d6d67386a Mon Sep 17 00:00:00 2001 From: sakshi-singla-1735 Date: Fri, 19 Jun 2026 10:57:51 +0530 Subject: [PATCH 2/3] Update software_config.json Signed-off-by: sakshi-singla-1735 --- input/software_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/input/software_config.json b/input/software_config.json index 877ba0c3dc..6486ab79be 100644 --- a/input/software_config.json +++ b/input/software_config.json @@ -8,7 +8,7 @@ {"name": "openldap", "arch": ["x86_64","aarch64"]}, {"name": "service_k8s","version": "1.35.1", "arch": ["x86_64"]}, {"name": "slurm_custom", "arch": ["x86_64","aarch64"]}, - {"name": "csi_driver_powerscale", "version":"v2.16.0", "arch": ["x86_64"]}, + {"name": "csi_driver_powerscale", "version":"v2.17.0", "arch": ["x86_64"]}, {"name": "ldms", "arch": ["x86_64","aarch64"]}, {"name": "additional_packages", "arch": ["x86_64","aarch64"]} ], From 48450dff28c3830699f2812d8f9dd9fbe2ed0d63 Mon Sep 17 00:00:00 2001 From: sakshi-singla-1735 Date: Fri, 19 Jun 2026 09:05:46 +0000 Subject: [PATCH 3/3] csi Signed-off-by: sakshi-singla-1735 --- .../templates/powerscale/deploy_powerscale_csi.sh.j2 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/provision/roles/configure_ochami/templates/powerscale/deploy_powerscale_csi.sh.j2 b/provision/roles/configure_ochami/templates/powerscale/deploy_powerscale_csi.sh.j2 index c8f451dc89..84b0df4c53 100644 --- a/provision/roles/configure_ochami/templates/powerscale/deploy_powerscale_csi.sh.j2 +++ b/provision/roles/configure_ochami/templates/powerscale/deploy_powerscale_csi.sh.j2 @@ -122,6 +122,13 @@ else echo "Snapshot Controller deployment failed (expected). Continuing..." } + echo "Updating Snapshot Controller image to v8.5.0..." + kubectl set image deployment/snapshot-controller snapshot-controller=registry.k8s.io/sig-storage/snapshot-controller:v8.5.0 -n kube-system >/dev/null 2>&1 || true + echo "Waiting for Snapshot Controller rollout to finish (timeout: 5 minutes)..." + kubectl rollout status deployment/snapshot-controller -n kube-system --timeout=300s >/dev/null 2>&1 || { + echo "Snapshot Controller rollout did not complete in time." + } + echo "Waiting for Snapshot Controller pods to reach Running state..." MAX_ATTEMPTS=60 WAIT_TIME=5