diff --git a/build_stream/generate_catalog.py b/build_stream/generate_catalog.py index 4d4e790af0..9c11c02ab8 100644 --- a/build_stream/generate_catalog.py +++ b/build_stream/generate_catalog.py @@ -458,18 +458,24 @@ def generate_catalog(input_dir, software_config_path, pxe_mapping_file): return catalog def build_functional_layers(functional_packages, pxe_groups, role_package_map): - """Build FunctionalLayer from PXE groups **and** inferred role+arch combos. - - PXE groups control os_* layers directly. For every other role that - has mapped packages we generate ``_`` layers for each - architecture that has at least one matching package. This ensures - the adapter policy can always find the functional layers it expects - (e.g. ``slurm_node_x86_64``) even when the PXE mapping only lists - one architecture for that role. + """Build FunctionalLayer strictly from PXE groups. + + Only role+arch combinations explicitly listed in the PXE mapping file + get a functional layer. For roles that have a ``_first`` variant in + the role_package_map, a separate ``_first_`` layer is + also emitted – but only for architectures present in the PXE file. """ functional_layers = [] generated: set = set() # track names already emitted + # Build a map of base_role -> set of architectures from PXE groups + pxe_role_arches: dict[str, set] = {} + for pxe_group in pxe_groups: + role_name = pxe_group.replace('_x86_64', '').replace('_aarch64', '') + pxe_arch = _extract_arch_from_pxe_group(pxe_group) + if pxe_arch: + pxe_role_arches.setdefault(role_name, set()).add(pxe_arch) + # ── 1. PXE-driven layers (os_* and any explicit PXE entries) ── for pxe_group in pxe_groups: role_name = pxe_group.replace('_x86_64', '').replace('_aarch64', '') @@ -494,14 +500,13 @@ def build_functional_layers(functional_packages, pxe_groups, role_package_map): }) generated.add(pxe_group) - # ── 2. Infer missing role+arch layers from role_package_map ── - # For each role that has packages, ensure a layer exists for every - # architecture that has at least one package in that role. - _ARCHES = ('x86_64', 'aarch64') + # ── 2. Generate _first variant layers for PXE-listed role+arch combos ── for role_name, pkg_ids in role_package_map.items(): - if role_name == 'os': - continue # os layers are PXE-only - for arch in _ARCHES: + if not role_name.endswith('_first'): + continue + base_role = role_name[:-6] # strip "_first" + allowed_arches = pxe_role_arches.get(base_role, set()) + for arch in allowed_arches: layer_name = f"{role_name}_{arch}" if layer_name in generated: continue @@ -511,22 +516,11 @@ def build_functional_layers(functional_packages, pxe_groups, role_package_map): if pid in functional_packages and arch in functional_packages[pid].get('Architecture', []) ] - # Also merge _first packages - first_role = role_name + "_first" - if first_role in role_package_map: - for pid in role_package_map[first_role]: - if ( - pid in functional_packages - and arch in functional_packages[pid].get('Architecture', []) - and pid not in filtered - ): - filtered.append(pid) - filtered.sort() if filtered: functional_layers.append({ "Name": layer_name, - "FunctionalPackages": filtered, + "FunctionalPackages": sorted(filtered), }) generated.add(layer_name) diff --git a/examples/catalog/catalog_rhel.json b/examples/catalog/catalog_rhel.json index 86bdd4cb01..fd4d7588a2 100644 --- a/examples/catalog/catalog_rhel.json +++ b/examples/catalog/catalog_rhel.json @@ -202,7 +202,7 @@ "package_id_77", "package_id_78", "package_id_79", - "package_id_88" + "package_id_91" ] }, { @@ -259,109 +259,6 @@ "package_id_9" ] }, - { - "Name": "slurm_control_node_aarch64", - "FunctionalPackages": [ - "package_id_10", - "package_id_11", - "package_id_12", - "package_id_13", - "package_id_14", - "package_id_15", - "package_id_16", - "package_id_17", - "package_id_18", - "package_id_19", - "package_id_20", - "package_id_22", - "package_id_23", - "package_id_24", - "package_id_25", - "package_id_26", - "package_id_5", - "package_id_6", - "package_id_7", - "package_id_8", - "package_id_9" - ] - }, - { - "Name": "slurm_node_x86_64", - "FunctionalPackages": [ - "package_id_10", - "package_id_11", - "package_id_12", - "package_id_13", - "package_id_14", - "package_id_15", - "package_id_16", - "package_id_17", - "package_id_18", - "package_id_19", - "package_id_20", - "package_id_21", - "package_id_22", - "package_id_27", - "package_id_28", - "package_id_29", - "package_id_30", - "package_id_31", - "package_id_5", - "package_id_6", - "package_id_7", - "package_id_8", - "package_id_9" - ] - }, - { - "Name": "login_node_aarch64", - "FunctionalPackages": [ - "package_id_10", - "package_id_11", - "package_id_12", - "package_id_13", - "package_id_14", - "package_id_15", - "package_id_16", - "package_id_17", - "package_id_18", - "package_id_19", - "package_id_20", - "package_id_22", - "package_id_27", - "package_id_32", - "package_id_5", - "package_id_6", - "package_id_7", - "package_id_8", - "package_id_9" - ] - }, - { - "Name": "login_compiler_node_x86_64", - "FunctionalPackages": [ - "package_id_10", - "package_id_11", - "package_id_12", - "package_id_13", - "package_id_14", - "package_id_15", - "package_id_16", - "package_id_17", - "package_id_18", - "package_id_19", - "package_id_20", - "package_id_21", - "package_id_22", - "package_id_27", - "package_id_32", - "package_id_5", - "package_id_6", - "package_id_7", - "package_id_8", - "package_id_9" - ] - }, { "Name": "service_kube_control_plane_first_x86_64", "FunctionalPackages": [ @@ -441,48 +338,6 @@ "package_id_98", "package_id_99" ] - }, - { - "Name": "service_kube_control_plane_first_aarch64", - "FunctionalPackages": [ - "package_id_10", - "package_id_11", - "package_id_12", - "package_id_13", - "package_id_14", - "package_id_15", - "package_id_33", - "package_id_6", - "package_id_7" - ] - }, - { - "Name": "service_kube_control_plane_aarch64", - "FunctionalPackages": [ - "package_id_10", - "package_id_11", - "package_id_12", - "package_id_13", - "package_id_14", - "package_id_15", - "package_id_33", - "package_id_6", - "package_id_7" - ] - }, - { - "Name": "service_kube_node_aarch64", - "FunctionalPackages": [ - "package_id_10", - "package_id_11", - "package_id_12", - "package_id_13", - "package_id_14", - "package_id_15", - "package_id_33", - "package_id_6", - "package_id_7" - ] } ], "BaseOS": [ @@ -1394,7 +1249,7 @@ ] }, "package_id_34": { - "Name": "cert-manager-v1.10.0", + "Name": "docker.io/library/busybox", "SupportedOS": [ { "Name": "RHEL", @@ -1404,16 +1259,12 @@ "Architecture": [ "x86_64" ], - "Type": "tarball", - "Sources": [ - { - "Architecture": "x86_64", - "Uri": "https://charts.jetstack.io/charts/cert-manager-v1.10.0.tgz" - } - ] + "Type": "image", + "Tag": "1.36", + "Version": "1.36" }, "package_id_35": { - "Name": "cffi==1.17.1", + "Name": "git", "SupportedOS": [ { "Name": "RHEL", @@ -1423,10 +1274,16 @@ "Architecture": [ "x86_64" ], - "Type": "pip_module" + "Type": "rpm", + "Sources": [ + { + "Architecture": "x86_64", + "RepoName": "appstream" + } + ] }, "package_id_36": { - "Name": "container-selinux", + "Name": "fuse-overlayfs", "SupportedOS": [ { "Name": "RHEL", @@ -1445,7 +1302,7 @@ ] }, "package_id_37": { - "Name": "cri-o-1.35.1", + "Name": "podman", "SupportedOS": [ { "Name": "RHEL", @@ -1459,12 +1316,12 @@ "Sources": [ { "Architecture": "x86_64", - "RepoName": "cri-o-v1-35" + "RepoName": "appstream" } ] }, "package_id_38": { - "Name": "cryptography==45.0.7", + "Name": "kubeadm-1.35.1", "SupportedOS": [ { "Name": "RHEL", @@ -1474,10 +1331,16 @@ "Architecture": [ "x86_64" ], - "Type": "pip_module" + "Type": "rpm", + "Sources": [ + { + "Architecture": "x86_64", + "RepoName": "kubernetes-v1-35" + } + ] }, "package_id_39": { - "Name": "docker.io/alpine/kubectl", + "Name": "kubelet-1.35.1", "SupportedOS": [ { "Name": "RHEL", @@ -1487,12 +1350,16 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "1.35.1", - "Version": "1.35.1" + "Type": "rpm", + "Sources": [ + { + "Architecture": "x86_64", + "RepoName": "kubernetes-v1-35" + } + ] }, "package_id_40": { - "Name": "docker.io/curlimages/curl", + "Name": "container-selinux", "SupportedOS": [ { "Name": "RHEL", @@ -1502,12 +1369,16 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "8.17.0", - "Version": "8.17.0" + "Type": "rpm", + "Sources": [ + { + "Architecture": "x86_64", + "RepoName": "appstream" + } + ] }, "package_id_41": { - "Name": "docker.io/dellhpcomniaaisolution/idrac_telemetry_receiver", + "Name": "cri-o-1.35.1", "SupportedOS": [ { "Name": "RHEL", @@ -1517,12 +1388,16 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "1.2", - "Version": "1.2" + "Type": "rpm", + "Sources": [ + { + "Architecture": "x86_64", + "RepoName": "cri-o-v1-35" + } + ] }, "package_id_42": { - "Name": "docker.io/dellhpcomniaaisolution/kafkapump", + "Name": "docker.io/victoriametrics/victoria-metrics", "SupportedOS": [ { "Name": "RHEL", @@ -1533,11 +1408,11 @@ "x86_64" ], "Type": "image", - "Tag": "1.2", - "Version": "1.2" + "Tag": "v1.128.0", + "Version": "v1.128.0" }, "package_id_43": { - "Name": "docker.io/dellhpcomniaaisolution/ubuntu-ldms", + "Name": "docker.io/victoriametrics/vmagent", "SupportedOS": [ { "Name": "RHEL", @@ -1548,11 +1423,11 @@ "x86_64" ], "Type": "image", - "Tag": "1.1", - "Version": "1.1" + "Tag": "v1.128.0", + "Version": "v1.128.0" }, "package_id_44": { - "Name": "docker.io/dellhpcomniaaisolution/victoriapump", + "Name": "docker.io/victoriametrics/vmstorage", "SupportedOS": [ { "Name": "RHEL", @@ -1563,11 +1438,11 @@ "x86_64" ], "Type": "image", - "Tag": "1.2", - "Version": "1.2" + "Tag": "v1.128.0-cluster", + "Version": "v1.128.0-cluster" }, "package_id_45": { - "Name": "docker.io/library/busybox", + "Name": "docker.io/victoriametrics/vminsert", "SupportedOS": [ { "Name": "RHEL", @@ -1578,11 +1453,11 @@ "x86_64" ], "Type": "image", - "Tag": "1.36", - "Version": "1.36" + "Tag": "v1.128.0-cluster", + "Version": "v1.128.0-cluster" }, "package_id_46": { - "Name": "docker.io/library/mysql", + "Name": "docker.io/victoriametrics/vmselect", "SupportedOS": [ { "Name": "RHEL", @@ -1593,11 +1468,11 @@ "x86_64" ], "Type": "image", - "Tag": "9.3.0", - "Version": "9.3.0" + "Tag": "v1.128.0-cluster", + "Version": "v1.128.0-cluster" }, "package_id_47": { - "Name": "docker.io/library/python", + "Name": "docker.io/victoriametrics/victoria-logs", "SupportedOS": [ { "Name": "RHEL", @@ -1608,11 +1483,11 @@ "x86_64" ], "Type": "image", - "Tag": "3.12-slim", - "Version": "3.12-slim" + "Tag": "v1.50.0", + "Version": "v1.50.0" }, "package_id_48": { - "Name": "docker.io/nginxinc/nginx-unprivileged", + "Name": "docker.io/victoriametrics/vlagent", "SupportedOS": [ { "Name": "RHEL", @@ -1623,11 +1498,11 @@ "x86_64" ], "Type": "image", - "Tag": "1.29", - "Version": "1.29" + "Tag": "v1.50.0", + "Version": "v1.50.0" }, "package_id_49": { - "Name": "docker.io/rmohr/activemq", + "Name": "docker.io/alpine/kubectl", "SupportedOS": [ { "Name": "RHEL", @@ -1638,11 +1513,11 @@ "x86_64" ], "Type": "image", - "Tag": "5.15.9", - "Version": "5.15.9" + "Tag": "1.35.1", + "Version": "1.35.1" }, "package_id_50": { - "Name": "docker.io/timberio/vector", + "Name": "docker.io/curlimages/curl", "SupportedOS": [ { "Name": "RHEL", @@ -1653,11 +1528,11 @@ "x86_64" ], "Type": "image", - "Tag": "0.54.0-debian", - "Version": "0.54.0-debian" + "Tag": "8.17.0", + "Version": "8.17.0" }, "package_id_51": { - "Name": "docker.io/victoriametrics/operator", + "Name": "docker.io/rmohr/activemq", "SupportedOS": [ { "Name": "RHEL", @@ -1668,11 +1543,11 @@ "x86_64" ], "Type": "image", - "Tag": "config-reloader-v0.68.3", - "Version": "config-reloader-v0.68.3" + "Tag": "5.15.9", + "Version": "5.15.9" }, "package_id_52": { - "Name": "docker.io/victoriametrics/victoria-logs", + "Name": "docker.io/library/mysql", "SupportedOS": [ { "Name": "RHEL", @@ -1683,11 +1558,11 @@ "x86_64" ], "Type": "image", - "Tag": "v1.50.0", - "Version": "v1.50.0" + "Tag": "9.3.0", + "Version": "9.3.0" }, "package_id_53": { - "Name": "docker.io/victoriametrics/victoria-metrics", + "Name": "docker.io/library/python", "SupportedOS": [ { "Name": "RHEL", @@ -1698,11 +1573,11 @@ "x86_64" ], "Type": "image", - "Tag": "v1.128.0", - "Version": "v1.128.0" + "Tag": "3.12-slim", + "Version": "3.12-slim" }, "package_id_54": { - "Name": "docker.io/victoriametrics/vlagent", + "Name": "docker.io/dellhpcomniaaisolution/idrac_telemetry_receiver", "SupportedOS": [ { "Name": "RHEL", @@ -1713,11 +1588,11 @@ "x86_64" ], "Type": "image", - "Tag": "v1.50.0", - "Version": "v1.50.0" + "Tag": "1.3", + "Version": "1.3" }, "package_id_55": { - "Name": "docker.io/victoriametrics/vmagent", + "Name": "docker.io/dellhpcomniaaisolution/kafkapump", "SupportedOS": [ { "Name": "RHEL", @@ -1728,11 +1603,11 @@ "x86_64" ], "Type": "image", - "Tag": "v1.128.0", - "Version": "v1.128.0" + "Tag": "1.3", + "Version": "1.3" }, "package_id_56": { - "Name": "docker.io/victoriametrics/vminsert", + "Name": "docker.io/dellhpcomniaaisolution/victoriapump", "SupportedOS": [ { "Name": "RHEL", @@ -1743,11 +1618,11 @@ "x86_64" ], "Type": "image", - "Tag": "v1.128.0-cluster", - "Version": "v1.128.0-cluster" + "Tag": "1.3", + "Version": "1.3" }, "package_id_57": { - "Name": "docker.io/victoriametrics/vmselect", + "Name": "cryptography==45.0.7", "SupportedOS": [ { "Name": "RHEL", @@ -1757,12 +1632,10 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "v1.128.0-cluster", - "Version": "v1.128.0-cluster" + "Type": "pip_module" }, "package_id_58": { - "Name": "docker.io/victoriametrics/vmstorage", + "Name": "omsdk==1.2.518", "SupportedOS": [ { "Name": "RHEL", @@ -1772,12 +1645,10 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "v1.128.0-cluster", - "Version": "v1.128.0-cluster" + "Type": "pip_module" }, "package_id_59": { - "Name": "fuse-overlayfs", + "Name": "cffi==1.17.1", "SupportedOS": [ { "Name": "RHEL", @@ -1787,16 +1658,10 @@ "Architecture": [ "x86_64" ], - "Type": "rpm", - "Sources": [ - { - "Architecture": "x86_64", - "RepoName": "appstream" - } - ] + "Type": "pip_module" }, "package_id_60": { - "Name": "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector", + "Name": "prometheus_client==0.20.0", "SupportedOS": [ { "Name": "RHEL", @@ -1806,12 +1671,10 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "0.143.1", - "Version": "0.143.1" + "Type": "pip_module" }, "package_id_61": { - "Name": "git", + "Name": "kubernetes==33.1.0", "SupportedOS": [ { "Name": "RHEL", @@ -1821,16 +1684,10 @@ "Architecture": [ "x86_64" ], - "Type": "rpm", - "Sources": [ - { - "Architecture": "x86_64", - "RepoName": "appstream" - } - ] + "Type": "pip_module" }, "package_id_62": { - "Name": "helm-charts", + "Name": "quay.io/strimzi/operator", "SupportedOS": [ { "Name": "RHEL", @@ -1840,17 +1697,12 @@ "Architecture": [ "x86_64" ], - "Type": "git", - "Version": "container-storage-modules-1.9.2", - "Sources": [ - { - "Architecture": "x86_64", - "Uri": "https://github.com/dell/helm-charts.git" - } - ] + "Type": "image", + "Tag": "0.48.0", + "Version": "0.48.0" }, "package_id_63": { - "Name": "karavi-observability", + "Name": "quay.io/strimzi/kafka", "SupportedOS": [ { "Name": "RHEL", @@ -1860,17 +1712,12 @@ "Architecture": [ "x86_64" ], - "Type": "git", - "Version": "v1.12.0", - "Sources": [ - { - "Architecture": "x86_64", - "Uri": "https://github.com/dell/karavi-observability.git" - } - ] + "Type": "image", + "Tag": "0.48.0-kafka-4.1.0", + "Version": "0.48.0-kafka-4.1.0" }, "package_id_64": { - "Name": "kubeadm-1.35.1", + "Name": "docker.io/dellhpcomniaaisolution/ubuntu-ldms", "SupportedOS": [ { "Name": "RHEL", @@ -1880,16 +1727,12 @@ "Architecture": [ "x86_64" ], - "Type": "rpm", - "Sources": [ - { - "Architecture": "x86_64", - "RepoName": "kubernetes-v1-35" - } - ] + "Type": "image", + "Tag": "1.1", + "Version": "1.1" }, "package_id_65": { - "Name": "kubelet-1.35.1", + "Name": "quay.io/dell/container-storage-modules/csm-metrics-powerscale", "SupportedOS": [ { "Name": "RHEL", @@ -1899,16 +1742,12 @@ "Architecture": [ "x86_64" ], - "Type": "rpm", - "Sources": [ - { - "Architecture": "x86_64", - "RepoName": "kubernetes-v1-35" - } - ] + "Type": "image", + "Tag": "v1.11.0", + "Version": "v1.11.0" }, "package_id_66": { - "Name": "kubernetes==33.1.0", + "Name": "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector", "SupportedOS": [ { "Name": "RHEL", @@ -1918,10 +1757,12 @@ "Architecture": [ "x86_64" ], - "Type": "pip_module" + "Type": "image", + "Tag": "0.143.1", + "Version": "0.143.1" }, "package_id_67": { - "Name": "omsdk==1.2.518", + "Name": "docker.io/nginxinc/nginx-unprivileged", "SupportedOS": [ { "Name": "RHEL", @@ -1931,10 +1772,12 @@ "Architecture": [ "x86_64" ], - "Type": "pip_module" + "Type": "image", + "Tag": "1.29", + "Version": "1.29" }, "package_id_68": { - "Name": "podman", + "Name": "karavi-observability", "SupportedOS": [ { "Name": "RHEL", @@ -1944,16 +1787,17 @@ "Architecture": [ "x86_64" ], - "Type": "rpm", + "Type": "git", + "Version": "v1.12.0", "Sources": [ { "Architecture": "x86_64", - "RepoName": "appstream" + "Uri": "https://github.com/dell/karavi-observability.git" } ] }, "package_id_69": { - "Name": "prometheus_client==0.20.0", + "Name": "helm-charts", "SupportedOS": [ { "Name": "RHEL", @@ -1963,10 +1807,17 @@ "Architecture": [ "x86_64" ], - "Type": "pip_module" + "Type": "git", + "Version": "container-storage-modules-1.9.2", + "Sources": [ + { + "Architecture": "x86_64", + "Uri": "https://github.com/dell/helm-charts.git" + } + ] }, "package_id_70": { - "Name": "quay.io/dell/container-storage-modules/csm-metrics-powerscale", + "Name": "quay.io/jetstack/cert-manager-controller", "SupportedOS": [ { "Name": "RHEL", @@ -1977,11 +1828,11 @@ "x86_64" ], "Type": "image", - "Tag": "v1.11.0", - "Version": "v1.11.0" + "Tag": "v1.10.0", + "Version": "v1.10.0" }, "package_id_71": { - "Name": "quay.io/jetstack/cert-manager-acmesolver", + "Name": "quay.io/jetstack/cert-manager-cainjector", "SupportedOS": [ { "Name": "RHEL", @@ -1996,7 +1847,7 @@ "Version": "v1.10.0" }, "package_id_72": { - "Name": "quay.io/jetstack/cert-manager-cainjector", + "Name": "quay.io/jetstack/cert-manager-webhook", "SupportedOS": [ { "Name": "RHEL", @@ -2011,7 +1862,7 @@ "Version": "v1.10.0" }, "package_id_73": { - "Name": "quay.io/jetstack/cert-manager-controller", + "Name": "quay.io/jetstack/cert-manager-acmesolver", "SupportedOS": [ { "Name": "RHEL", @@ -2026,7 +1877,7 @@ "Version": "v1.10.0" }, "package_id_74": { - "Name": "quay.io/jetstack/cert-manager-webhook", + "Name": "cert-manager-v1.10.0", "SupportedOS": [ { "Name": "RHEL", @@ -2036,12 +1887,16 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "v1.10.0", - "Version": "v1.10.0" + "Type": "tarball", + "Sources": [ + { + "Architecture": "x86_64", + "Uri": "https://charts.jetstack.io/charts/cert-manager-v1.10.0.tgz" + } + ] }, "package_id_75": { - "Name": "quay.io/strimzi/kafka", + "Name": "strimzi-kafka-operator-helm-3-chart-0.48.0", "SupportedOS": [ { "Name": "RHEL", @@ -2051,9 +1906,13 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "0.48.0-kafka-4.1.0", - "Version": "0.48.0-kafka-4.1.0" + "Type": "tarball", + "Sources": [ + { + "Architecture": "x86_64", + "Uri": "https://github.com/strimzi/strimzi-kafka-operator/releases/download/0.48.0/strimzi-kafka-operator-helm-3-chart-0.48.0.tgz" + } + ] }, "package_id_76": { "Name": "quay.io/strimzi/kafka-bridge", @@ -2071,7 +1930,7 @@ "Version": "0.33.1" }, "package_id_77": { - "Name": "quay.io/strimzi/operator", + "Name": "docker.io/victoriametrics/operator", "SupportedOS": [ { "Name": "RHEL", @@ -2082,11 +1941,11 @@ "x86_64" ], "Type": "image", - "Tag": "0.48.0", - "Version": "0.48.0" + "Tag": "config-reloader-v0.68.3", + "Version": "config-reloader-v0.68.3" }, "package_id_78": { - "Name": "strimzi-kafka-operator-helm-3-chart-0.48.0", + "Name": "victoria-metrics-operator-0.59.3", "SupportedOS": [ { "Name": "RHEL", @@ -2100,12 +1959,12 @@ "Sources": [ { "Architecture": "x86_64", - "Uri": "https://github.com/strimzi/strimzi-kafka-operator/releases/download/0.48.0/strimzi-kafka-operator-helm-3-chart-0.48.0.tgz" + "Uri": "https://github.com/VictoriaMetrics/helm-charts/releases/download/victoria-metrics-operator-0.59.3/victoria-metrics-operator-0.59.3.tgz" } ] }, "package_id_79": { - "Name": "victoria-metrics-operator-0.59.3", + "Name": "docker.io/timberio/vector", "SupportedOS": [ { "Name": "RHEL", @@ -2115,16 +1974,12 @@ "Architecture": [ "x86_64" ], - "Type": "tarball", - "Sources": [ - { - "Architecture": "x86_64", - "Uri": "https://github.com/VictoriaMetrics/helm-charts/releases/download/victoria-metrics-operator-0.59.3/victoria-metrics-operator-0.59.3.tgz" - } - ] + "Type": "image", + "Tag": "0.54.0-debian", + "Version": "0.54.0-debian" }, "package_id_80": { - "Name": "PyMySQL==1.1.2", + "Name": "ghcr.io/kube-vip/kube-vip", "SupportedOS": [ { "Name": "RHEL", @@ -2134,10 +1989,12 @@ "Architecture": [ "x86_64" ], - "Type": "pip_module" + "Type": "image", + "Tag": "v0.8.9", + "Version": "v0.8.9" }, "package_id_81": { - "Name": "docker.io/calico/cni", + "Name": "registry.k8s.io/kube-apiserver", "SupportedOS": [ { "Name": "RHEL", @@ -2148,11 +2005,11 @@ "x86_64" ], "Type": "image", - "Tag": "v3.31.4", - "Version": "v3.31.4" + "Tag": "v1.35.1", + "Version": "v1.35.1" }, "package_id_82": { - "Name": "docker.io/calico/kube-controllers", + "Name": "registry.k8s.io/kube-controller-manager", "SupportedOS": [ { "Name": "RHEL", @@ -2163,11 +2020,11 @@ "x86_64" ], "Type": "image", - "Tag": "v3.31.4", - "Version": "v3.31.4" + "Tag": "v1.35.1", + "Version": "v1.35.1" }, "package_id_83": { - "Name": "docker.io/calico/node", + "Name": "registry.k8s.io/kube-scheduler", "SupportedOS": [ { "Name": "RHEL", @@ -2178,11 +2035,11 @@ "x86_64" ], "Type": "image", - "Tag": "v3.31.4", - "Version": "v3.31.4" + "Tag": "v1.35.1", + "Version": "v1.35.1" }, "package_id_84": { - "Name": "ghcr.io/kube-vip/kube-vip", + "Name": "registry.k8s.io/kube-proxy", "SupportedOS": [ { "Name": "RHEL", @@ -2193,11 +2050,11 @@ "x86_64" ], "Type": "image", - "Tag": "v0.8.9", - "Version": "v0.8.9" + "Tag": "v1.35.1", + "Version": "v1.35.1" }, "package_id_85": { - "Name": "kubectl-1.35.1", + "Name": "registry.k8s.io/coredns/coredns", "SupportedOS": [ { "Name": "RHEL", @@ -2207,16 +2064,12 @@ "Architecture": [ "x86_64" ], - "Type": "rpm", - "Sources": [ - { - "Architecture": "x86_64", - "RepoName": "kubernetes-v1-35" - } - ] + "Type": "image", + "Tag": "v1.13.1", + "Version": "v1.13.1" }, "package_id_86": { - "Name": "prettytable==3.14.0", + "Name": "registry.k8s.io/pause", "SupportedOS": [ { "Name": "RHEL", @@ -2226,10 +2079,12 @@ "Architecture": [ "x86_64" ], - "Type": "pip_module" + "Type": "image", + "Tag": "3.10.1", + "Version": "3.10.1" }, "package_id_87": { - "Name": "python3-3.12.9", + "Name": "registry.k8s.io/etcd", "SupportedOS": [ { "Name": "RHEL", @@ -2239,16 +2094,12 @@ "Architecture": [ "x86_64" ], - "Type": "rpm", - "Sources": [ - { - "Architecture": "x86_64", - "RepoName": "baseos" - } - ] + "Type": "image", + "Tag": "3.6.6-0", + "Version": "3.6.6-0" }, "package_id_88": { - "Name": "quay.io/metallb/speaker", + "Name": "docker.io/calico/cni", "SupportedOS": [ { "Name": "RHEL", @@ -2259,11 +2110,11 @@ "x86_64" ], "Type": "image", - "Tag": "v0.15.3", - "Version": "v0.15.3" + "Tag": "v3.31.4", + "Version": "v3.31.4" }, "package_id_89": { - "Name": "registry.k8s.io/coredns/coredns", + "Name": "docker.io/calico/kube-controllers", "SupportedOS": [ { "Name": "RHEL", @@ -2274,11 +2125,11 @@ "x86_64" ], "Type": "image", - "Tag": "v1.13.1", - "Version": "v1.13.1" + "Tag": "v3.31.4", + "Version": "v3.31.4" }, "package_id_90": { - "Name": "registry.k8s.io/etcd", + "Name": "docker.io/calico/node", "SupportedOS": [ { "Name": "RHEL", @@ -2289,11 +2140,11 @@ "x86_64" ], "Type": "image", - "Tag": "3.6.6-0", - "Version": "3.6.6-0" + "Tag": "v3.31.4", + "Version": "v3.31.4" }, "package_id_91": { - "Name": "registry.k8s.io/kube-apiserver", + "Name": "quay.io/metallb/speaker", "SupportedOS": [ { "Name": "RHEL", @@ -2304,11 +2155,11 @@ "x86_64" ], "Type": "image", - "Tag": "v1.35.1", - "Version": "v1.35.1" + "Tag": "v0.15.3", + "Version": "v0.15.3" }, "package_id_92": { - "Name": "registry.k8s.io/kube-controller-manager", + "Name": "kubectl-1.35.1", "SupportedOS": [ { "Name": "RHEL", @@ -2318,12 +2169,16 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "v1.35.1", - "Version": "v1.35.1" + "Type": "rpm", + "Sources": [ + { + "Architecture": "x86_64", + "RepoName": "kubernetes-v1-35" + } + ] }, "package_id_93": { - "Name": "registry.k8s.io/kube-proxy", + "Name": "prettytable==3.14.0", "SupportedOS": [ { "Name": "RHEL", @@ -2333,12 +2188,10 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "v1.35.1", - "Version": "v1.35.1" + "Type": "pip_module" }, "package_id_94": { - "Name": "registry.k8s.io/kube-scheduler", + "Name": "python3-3.12.9", "SupportedOS": [ { "Name": "RHEL", @@ -2348,12 +2201,16 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "v1.35.1", - "Version": "v1.35.1" + "Type": "rpm", + "Sources": [ + { + "Architecture": "x86_64", + "RepoName": "baseos" + } + ] }, "package_id_95": { - "Name": "registry.k8s.io/pause", + "Name": "PyMySQL==1.1.2", "SupportedOS": [ { "Name": "RHEL", @@ -2363,9 +2220,7 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "3.10.1", - "Version": "3.10.1" + "Type": "pip_module" }, "package_id_96": { "Name": "calico-v3.31.4", @@ -2387,7 +2242,7 @@ ] }, "package_id_97": { - "Name": "helm-v3.20.1-amd64", + "Name": "metallb-native-v0.15.3", "SupportedOS": [ { "Name": "RHEL", @@ -2397,16 +2252,16 @@ "Architecture": [ "x86_64" ], - "Type": "tarball", + "Type": "manifest", "Sources": [ { "Architecture": "x86_64", - "Uri": "https://get.helm.sh/helm-v3.20.1-linux-amd64.tar.gz" + "Uri": "https://raw.githubusercontent.com/metallb/metallb/v0.15.3/config/manifests/metallb-native.yaml" } ] }, "package_id_98": { - "Name": "metallb-native-v0.15.3", + "Name": "helm-v3.20.1-amd64", "SupportedOS": [ { "Name": "RHEL", @@ -2416,11 +2271,11 @@ "Architecture": [ "x86_64" ], - "Type": "manifest", + "Type": "tarball", "Sources": [ { "Architecture": "x86_64", - "Uri": "https://raw.githubusercontent.com/metallb/metallb/v0.15.3/config/manifests/metallb-native.yaml" + "Uri": "https://get.helm.sh/helm-v3.20.1-linux-amd64.tar.gz" } ] }, @@ -2444,7 +2299,7 @@ ] }, "package_id_100": { - "Name": "quay.io/metallb/controller", + "Name": "registry.k8s.io/sig-storage/nfs-subdir-external-provisioner", "SupportedOS": [ { "Name": "RHEL", @@ -2455,11 +2310,11 @@ "x86_64" ], "Type": "image", - "Tag": "v0.15.3", - "Version": "v0.15.3" + "Tag": "v4.0.2", + "Version": "v4.0.2" }, "package_id_101": { - "Name": "registry.k8s.io/sig-storage/nfs-subdir-external-provisioner", + "Name": "quay.io/metallb/controller", "SupportedOS": [ { "Name": "RHEL", @@ -2470,8 +2325,8 @@ "x86_64" ], "Type": "image", - "Tag": "v4.0.2", - "Version": "v4.0.2" + "Tag": "v0.15.3", + "Version": "v0.15.3" }, "package_id_102": { "Name": "nvhpc_2025_2511_Linux_aarch64_cuda_13.0", @@ -4882,7 +4737,7 @@ "Miscellaneous": [], "InfrastructurePackages": { "infrastructure_package_id_1": { - "Name": "csi-powerscale", + "Name": "csi-powerscale-v2.16.0", "Type": "git", "Version": "v2.16.0", "SupportedFunctions": [ @@ -4901,7 +4756,7 @@ ] }, "infrastructure_package_id_2": { - "Name": "external-snapshotter", + "Name": "external-snapshotter-v8.4.0", "Type": "git", "Version": "v8.4.0", "SupportedFunctions": [ @@ -4920,7 +4775,7 @@ ] }, "infrastructure_package_id_3": { - "Name": "helm-charts", + "Name": "helm-charts-2.16.0", "Type": "git", "Version": "csi-isilon-2.16.0", "SupportedFunctions": [ diff --git a/examples/catalog/catalog_rhel_aarch64_with_slurm_only.json b/examples/catalog/catalog_rhel_aarch64_with_slurm_only.json index 5c8a326792..13c59976ff 100644 --- a/examples/catalog/catalog_rhel_aarch64_with_slurm_only.json +++ b/examples/catalog/catalog_rhel_aarch64_with_slurm_only.json @@ -106,109 +106,6 @@ "package_id_8", "package_id_9" ] - }, - { - "Name": "slurm_control_node_aarch64", - "FunctionalPackages": [ - "package_id_1", - "package_id_10", - "package_id_11", - "package_id_12", - "package_id_13", - "package_id_14", - "package_id_15", - "package_id_16", - "package_id_18", - "package_id_19", - "package_id_2", - "package_id_20", - "package_id_21", - "package_id_22", - "package_id_3", - "package_id_4", - "package_id_5", - "package_id_6", - "package_id_7", - "package_id_8", - "package_id_9" - ] - }, - { - "Name": "slurm_node_x86_64", - "FunctionalPackages": [ - "package_id_1", - "package_id_10", - "package_id_11", - "package_id_12", - "package_id_13", - "package_id_14", - "package_id_15", - "package_id_16", - "package_id_17", - "package_id_18", - "package_id_2", - "package_id_23", - "package_id_24", - "package_id_25", - "package_id_26", - "package_id_27", - "package_id_3", - "package_id_4", - "package_id_5", - "package_id_6", - "package_id_7", - "package_id_8", - "package_id_9" - ] - }, - { - "Name": "login_node_aarch64", - "FunctionalPackages": [ - "package_id_1", - "package_id_10", - "package_id_11", - "package_id_12", - "package_id_13", - "package_id_14", - "package_id_15", - "package_id_16", - "package_id_18", - "package_id_2", - "package_id_23", - "package_id_28", - "package_id_3", - "package_id_4", - "package_id_5", - "package_id_6", - "package_id_7", - "package_id_8", - "package_id_9" - ] - }, - { - "Name": "login_compiler_node_x86_64", - "FunctionalPackages": [ - "package_id_1", - "package_id_10", - "package_id_11", - "package_id_12", - "package_id_13", - "package_id_14", - "package_id_15", - "package_id_16", - "package_id_17", - "package_id_18", - "package_id_2", - "package_id_23", - "package_id_28", - "package_id_3", - "package_id_4", - "package_id_5", - "package_id_6", - "package_id_7", - "package_id_8", - "package_id_9" - ] } ], "BaseOS": [ diff --git a/examples/catalog/catalog_rhel_with_nfs_provisioner.json b/examples/catalog/catalog_rhel_with_nfs_provisioner.json index 3bc9156db3..8b82839503 100644 --- a/examples/catalog/catalog_rhel_with_nfs_provisioner.json +++ b/examples/catalog/catalog_rhel_with_nfs_provisioner.json @@ -190,7 +190,7 @@ "package_id_74", "package_id_75", "package_id_8", - "package_id_84", + "package_id_87", "package_id_9", "package_id_96", "package_id_97" @@ -250,109 +250,6 @@ "package_id_98" ] }, - { - "Name": "slurm_control_node_aarch64", - "FunctionalPackages": [ - "package_id_1", - "package_id_10", - "package_id_11", - "package_id_12", - "package_id_13", - "package_id_14", - "package_id_15", - "package_id_16", - "package_id_18", - "package_id_19", - "package_id_2", - "package_id_20", - "package_id_21", - "package_id_22", - "package_id_3", - "package_id_4", - "package_id_5", - "package_id_6", - "package_id_7", - "package_id_8", - "package_id_9" - ] - }, - { - "Name": "slurm_node_x86_64", - "FunctionalPackages": [ - "package_id_1", - "package_id_10", - "package_id_11", - "package_id_12", - "package_id_13", - "package_id_14", - "package_id_15", - "package_id_16", - "package_id_17", - "package_id_18", - "package_id_2", - "package_id_23", - "package_id_24", - "package_id_25", - "package_id_26", - "package_id_27", - "package_id_3", - "package_id_4", - "package_id_5", - "package_id_6", - "package_id_7", - "package_id_8", - "package_id_9" - ] - }, - { - "Name": "login_node_aarch64", - "FunctionalPackages": [ - "package_id_1", - "package_id_10", - "package_id_11", - "package_id_12", - "package_id_13", - "package_id_14", - "package_id_15", - "package_id_16", - "package_id_18", - "package_id_2", - "package_id_23", - "package_id_28", - "package_id_3", - "package_id_4", - "package_id_5", - "package_id_6", - "package_id_7", - "package_id_8", - "package_id_9" - ] - }, - { - "Name": "login_compiler_node_x86_64", - "FunctionalPackages": [ - "package_id_1", - "package_id_10", - "package_id_11", - "package_id_12", - "package_id_13", - "package_id_14", - "package_id_15", - "package_id_16", - "package_id_17", - "package_id_18", - "package_id_2", - "package_id_23", - "package_id_28", - "package_id_3", - "package_id_4", - "package_id_5", - "package_id_6", - "package_id_7", - "package_id_8", - "package_id_9" - ] - }, { "Name": "service_kube_control_plane_first_x86_64", "FunctionalPackages": [ @@ -432,48 +329,6 @@ "package_id_94", "package_id_95" ] - }, - { - "Name": "service_kube_control_plane_first_aarch64", - "FunctionalPackages": [ - "package_id_10", - "package_id_11", - "package_id_2", - "package_id_29", - "package_id_3", - "package_id_6", - "package_id_7", - "package_id_8", - "package_id_9" - ] - }, - { - "Name": "service_kube_control_plane_aarch64", - "FunctionalPackages": [ - "package_id_10", - "package_id_11", - "package_id_2", - "package_id_29", - "package_id_3", - "package_id_6", - "package_id_7", - "package_id_8", - "package_id_9" - ] - }, - { - "Name": "service_kube_node_aarch64", - "FunctionalPackages": [ - "package_id_10", - "package_id_11", - "package_id_2", - "package_id_29", - "package_id_3", - "package_id_6", - "package_id_7", - "package_id_8", - "package_id_9" - ] } ], "BaseOS": [ @@ -1267,7 +1122,7 @@ ] }, "package_id_30": { - "Name": "cert-manager-v1.10.0", + "Name": "docker.io/library/busybox", "SupportedOS": [ { "Name": "RHEL", @@ -1277,16 +1132,12 @@ "Architecture": [ "x86_64" ], - "Type": "tarball", - "Sources": [ - { - "Architecture": "x86_64", - "Uri": "https://charts.jetstack.io/charts/cert-manager-v1.10.0.tgz" - } - ] + "Type": "image", + "Tag": "1.36", + "Version": "1.36" }, "package_id_31": { - "Name": "cffi==1.17.1", + "Name": "git", "SupportedOS": [ { "Name": "RHEL", @@ -1296,10 +1147,16 @@ "Architecture": [ "x86_64" ], - "Type": "pip_module" + "Type": "rpm", + "Sources": [ + { + "Architecture": "x86_64", + "RepoName": "appstream" + } + ] }, "package_id_32": { - "Name": "container-selinux", + "Name": "fuse-overlayfs", "SupportedOS": [ { "Name": "RHEL", @@ -1318,7 +1175,7 @@ ] }, "package_id_33": { - "Name": "cri-o-1.35.1", + "Name": "podman", "SupportedOS": [ { "Name": "RHEL", @@ -1332,12 +1189,12 @@ "Sources": [ { "Architecture": "x86_64", - "RepoName": "cri-o-v1-35" + "RepoName": "appstream" } ] }, "package_id_34": { - "Name": "cryptography==45.0.7", + "Name": "kubeadm-1.35.1", "SupportedOS": [ { "Name": "RHEL", @@ -1347,10 +1204,16 @@ "Architecture": [ "x86_64" ], - "Type": "pip_module" + "Type": "rpm", + "Sources": [ + { + "Architecture": "x86_64", + "RepoName": "kubernetes-v1-35" + } + ] }, "package_id_35": { - "Name": "docker.io/alpine/kubectl", + "Name": "kubelet-1.35.1", "SupportedOS": [ { "Name": "RHEL", @@ -1360,12 +1223,16 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "1.35.1", - "Version": "1.35.1" + "Type": "rpm", + "Sources": [ + { + "Architecture": "x86_64", + "RepoName": "kubernetes-v1-35" + } + ] }, "package_id_36": { - "Name": "docker.io/curlimages/curl", + "Name": "container-selinux", "SupportedOS": [ { "Name": "RHEL", @@ -1375,12 +1242,16 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "8.17.0", - "Version": "8.17.0" + "Type": "rpm", + "Sources": [ + { + "Architecture": "x86_64", + "RepoName": "appstream" + } + ] }, "package_id_37": { - "Name": "docker.io/dellhpcomniaaisolution/idrac_telemetry_receiver", + "Name": "cri-o-1.35.1", "SupportedOS": [ { "Name": "RHEL", @@ -1390,12 +1261,16 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "1.2", - "Version": "1.2" + "Type": "rpm", + "Sources": [ + { + "Architecture": "x86_64", + "RepoName": "cri-o-v1-35" + } + ] }, "package_id_38": { - "Name": "docker.io/dellhpcomniaaisolution/kafkapump", + "Name": "docker.io/victoriametrics/victoria-metrics", "SupportedOS": [ { "Name": "RHEL", @@ -1406,11 +1281,11 @@ "x86_64" ], "Type": "image", - "Tag": "1.2", - "Version": "1.2" + "Tag": "v1.128.0", + "Version": "v1.128.0" }, "package_id_39": { - "Name": "docker.io/dellhpcomniaaisolution/ubuntu-ldms", + "Name": "docker.io/victoriametrics/vmagent", "SupportedOS": [ { "Name": "RHEL", @@ -1421,11 +1296,11 @@ "x86_64" ], "Type": "image", - "Tag": "1.1", - "Version": "1.1" + "Tag": "v1.128.0", + "Version": "v1.128.0" }, "package_id_40": { - "Name": "docker.io/dellhpcomniaaisolution/victoriapump", + "Name": "docker.io/victoriametrics/vmstorage", "SupportedOS": [ { "Name": "RHEL", @@ -1436,11 +1311,11 @@ "x86_64" ], "Type": "image", - "Tag": "1.2", - "Version": "1.2" + "Tag": "v1.128.0-cluster", + "Version": "v1.128.0-cluster" }, "package_id_41": { - "Name": "docker.io/library/busybox", + "Name": "docker.io/victoriametrics/vminsert", "SupportedOS": [ { "Name": "RHEL", @@ -1451,11 +1326,11 @@ "x86_64" ], "Type": "image", - "Tag": "1.36", - "Version": "1.36" + "Tag": "v1.128.0-cluster", + "Version": "v1.128.0-cluster" }, "package_id_42": { - "Name": "docker.io/library/mysql", + "Name": "docker.io/victoriametrics/vmselect", "SupportedOS": [ { "Name": "RHEL", @@ -1466,11 +1341,11 @@ "x86_64" ], "Type": "image", - "Tag": "9.3.0", - "Version": "9.3.0" + "Tag": "v1.128.0-cluster", + "Version": "v1.128.0-cluster" }, "package_id_43": { - "Name": "docker.io/library/python", + "Name": "docker.io/victoriametrics/victoria-logs", "SupportedOS": [ { "Name": "RHEL", @@ -1481,11 +1356,11 @@ "x86_64" ], "Type": "image", - "Tag": "3.12-slim", - "Version": "3.12-slim" + "Tag": "v1.50.0", + "Version": "v1.50.0" }, "package_id_44": { - "Name": "docker.io/nginxinc/nginx-unprivileged", + "Name": "docker.io/victoriametrics/vlagent", "SupportedOS": [ { "Name": "RHEL", @@ -1496,11 +1371,11 @@ "x86_64" ], "Type": "image", - "Tag": "1.29", - "Version": "1.29" + "Tag": "v1.50.0", + "Version": "v1.50.0" }, "package_id_45": { - "Name": "docker.io/rmohr/activemq", + "Name": "docker.io/alpine/kubectl", "SupportedOS": [ { "Name": "RHEL", @@ -1511,11 +1386,11 @@ "x86_64" ], "Type": "image", - "Tag": "5.15.9", - "Version": "5.15.9" + "Tag": "1.35.1", + "Version": "1.35.1" }, "package_id_46": { - "Name": "docker.io/timberio/vector", + "Name": "docker.io/curlimages/curl", "SupportedOS": [ { "Name": "RHEL", @@ -1526,11 +1401,11 @@ "x86_64" ], "Type": "image", - "Tag": "0.54.0-debian", - "Version": "0.54.0-debian" + "Tag": "8.17.0", + "Version": "8.17.0" }, "package_id_47": { - "Name": "docker.io/victoriametrics/operator", + "Name": "docker.io/rmohr/activemq", "SupportedOS": [ { "Name": "RHEL", @@ -1541,11 +1416,11 @@ "x86_64" ], "Type": "image", - "Tag": "config-reloader-v0.68.3", - "Version": "config-reloader-v0.68.3" + "Tag": "5.15.9", + "Version": "5.15.9" }, "package_id_48": { - "Name": "docker.io/victoriametrics/victoria-logs", + "Name": "docker.io/library/mysql", "SupportedOS": [ { "Name": "RHEL", @@ -1556,11 +1431,11 @@ "x86_64" ], "Type": "image", - "Tag": "v1.50.0", - "Version": "v1.50.0" + "Tag": "9.3.0", + "Version": "9.3.0" }, "package_id_49": { - "Name": "docker.io/victoriametrics/victoria-metrics", + "Name": "docker.io/library/python", "SupportedOS": [ { "Name": "RHEL", @@ -1571,11 +1446,11 @@ "x86_64" ], "Type": "image", - "Tag": "v1.128.0", - "Version": "v1.128.0" + "Tag": "3.12-slim", + "Version": "3.12-slim" }, "package_id_50": { - "Name": "docker.io/victoriametrics/vlagent", + "Name": "docker.io/dellhpcomniaaisolution/idrac_telemetry_receiver", "SupportedOS": [ { "Name": "RHEL", @@ -1586,11 +1461,11 @@ "x86_64" ], "Type": "image", - "Tag": "v1.50.0", - "Version": "v1.50.0" + "Tag": "1.3", + "Version": "1.3" }, "package_id_51": { - "Name": "docker.io/victoriametrics/vmagent", + "Name": "docker.io/dellhpcomniaaisolution/kafkapump", "SupportedOS": [ { "Name": "RHEL", @@ -1601,11 +1476,11 @@ "x86_64" ], "Type": "image", - "Tag": "v1.128.0", - "Version": "v1.128.0" + "Tag": "1.3", + "Version": "1.3" }, "package_id_52": { - "Name": "docker.io/victoriametrics/vminsert", + "Name": "docker.io/dellhpcomniaaisolution/victoriapump", "SupportedOS": [ { "Name": "RHEL", @@ -1616,11 +1491,11 @@ "x86_64" ], "Type": "image", - "Tag": "v1.128.0-cluster", - "Version": "v1.128.0-cluster" + "Tag": "1.3", + "Version": "1.3" }, "package_id_53": { - "Name": "docker.io/victoriametrics/vmselect", + "Name": "cryptography==45.0.7", "SupportedOS": [ { "Name": "RHEL", @@ -1630,12 +1505,10 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "v1.128.0-cluster", - "Version": "v1.128.0-cluster" + "Type": "pip_module" }, "package_id_54": { - "Name": "docker.io/victoriametrics/vmstorage", + "Name": "omsdk==1.2.518", "SupportedOS": [ { "Name": "RHEL", @@ -1645,12 +1518,10 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "v1.128.0-cluster", - "Version": "v1.128.0-cluster" + "Type": "pip_module" }, "package_id_55": { - "Name": "fuse-overlayfs", + "Name": "cffi==1.17.1", "SupportedOS": [ { "Name": "RHEL", @@ -1660,16 +1531,10 @@ "Architecture": [ "x86_64" ], - "Type": "rpm", - "Sources": [ - { - "Architecture": "x86_64", - "RepoName": "appstream" - } - ] + "Type": "pip_module" }, "package_id_56": { - "Name": "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector", + "Name": "prometheus_client==0.20.0", "SupportedOS": [ { "Name": "RHEL", @@ -1679,12 +1544,10 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "0.143.1", - "Version": "0.143.1" + "Type": "pip_module" }, "package_id_57": { - "Name": "git", + "Name": "kubernetes==33.1.0", "SupportedOS": [ { "Name": "RHEL", @@ -1694,16 +1557,10 @@ "Architecture": [ "x86_64" ], - "Type": "rpm", - "Sources": [ - { - "Architecture": "x86_64", - "RepoName": "appstream" - } - ] + "Type": "pip_module" }, "package_id_58": { - "Name": "helm-charts", + "Name": "quay.io/strimzi/operator", "SupportedOS": [ { "Name": "RHEL", @@ -1713,17 +1570,12 @@ "Architecture": [ "x86_64" ], - "Type": "git", - "Version": "container-storage-modules-1.9.2", - "Sources": [ - { - "Architecture": "x86_64", - "Uri": "https://github.com/dell/helm-charts.git" - } - ] + "Type": "image", + "Tag": "0.48.0", + "Version": "0.48.0" }, "package_id_59": { - "Name": "karavi-observability", + "Name": "quay.io/strimzi/kafka", "SupportedOS": [ { "Name": "RHEL", @@ -1733,17 +1585,12 @@ "Architecture": [ "x86_64" ], - "Type": "git", - "Version": "v1.12.0", - "Sources": [ - { - "Architecture": "x86_64", - "Uri": "https://github.com/dell/karavi-observability.git" - } - ] + "Type": "image", + "Tag": "0.48.0-kafka-4.1.0", + "Version": "0.48.0-kafka-4.1.0" }, "package_id_60": { - "Name": "kubeadm-1.35.1", + "Name": "docker.io/dellhpcomniaaisolution/ubuntu-ldms", "SupportedOS": [ { "Name": "RHEL", @@ -1753,16 +1600,12 @@ "Architecture": [ "x86_64" ], - "Type": "rpm", - "Sources": [ - { - "Architecture": "x86_64", - "RepoName": "kubernetes-v1-35" - } - ] + "Type": "image", + "Tag": "1.1", + "Version": "1.1" }, "package_id_61": { - "Name": "kubelet-1.35.1", + "Name": "quay.io/dell/container-storage-modules/csm-metrics-powerscale", "SupportedOS": [ { "Name": "RHEL", @@ -1772,16 +1615,12 @@ "Architecture": [ "x86_64" ], - "Type": "rpm", - "Sources": [ - { - "Architecture": "x86_64", - "RepoName": "kubernetes-v1-35" - } - ] + "Type": "image", + "Tag": "v1.11.0", + "Version": "v1.11.0" }, "package_id_62": { - "Name": "kubernetes==33.1.0", + "Name": "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector", "SupportedOS": [ { "Name": "RHEL", @@ -1791,10 +1630,12 @@ "Architecture": [ "x86_64" ], - "Type": "pip_module" + "Type": "image", + "Tag": "0.143.1", + "Version": "0.143.1" }, "package_id_63": { - "Name": "omsdk==1.2.518", + "Name": "docker.io/nginxinc/nginx-unprivileged", "SupportedOS": [ { "Name": "RHEL", @@ -1804,10 +1645,12 @@ "Architecture": [ "x86_64" ], - "Type": "pip_module" + "Type": "image", + "Tag": "1.29", + "Version": "1.29" }, "package_id_64": { - "Name": "podman", + "Name": "karavi-observability", "SupportedOS": [ { "Name": "RHEL", @@ -1817,16 +1660,17 @@ "Architecture": [ "x86_64" ], - "Type": "rpm", + "Type": "git", + "Version": "v1.12.0", "Sources": [ { "Architecture": "x86_64", - "RepoName": "appstream" + "Uri": "https://github.com/dell/karavi-observability.git" } ] }, "package_id_65": { - "Name": "prometheus_client==0.20.0", + "Name": "helm-charts", "SupportedOS": [ { "Name": "RHEL", @@ -1836,10 +1680,17 @@ "Architecture": [ "x86_64" ], - "Type": "pip_module" + "Type": "git", + "Version": "container-storage-modules-1.9.2", + "Sources": [ + { + "Architecture": "x86_64", + "Uri": "https://github.com/dell/helm-charts.git" + } + ] }, "package_id_66": { - "Name": "quay.io/dell/container-storage-modules/csm-metrics-powerscale", + "Name": "quay.io/jetstack/cert-manager-controller", "SupportedOS": [ { "Name": "RHEL", @@ -1850,11 +1701,11 @@ "x86_64" ], "Type": "image", - "Tag": "v1.11.0", - "Version": "v1.11.0" + "Tag": "v1.10.0", + "Version": "v1.10.0" }, "package_id_67": { - "Name": "quay.io/jetstack/cert-manager-acmesolver", + "Name": "quay.io/jetstack/cert-manager-cainjector", "SupportedOS": [ { "Name": "RHEL", @@ -1869,7 +1720,7 @@ "Version": "v1.10.0" }, "package_id_68": { - "Name": "quay.io/jetstack/cert-manager-cainjector", + "Name": "quay.io/jetstack/cert-manager-webhook", "SupportedOS": [ { "Name": "RHEL", @@ -1884,7 +1735,7 @@ "Version": "v1.10.0" }, "package_id_69": { - "Name": "quay.io/jetstack/cert-manager-controller", + "Name": "quay.io/jetstack/cert-manager-acmesolver", "SupportedOS": [ { "Name": "RHEL", @@ -1899,7 +1750,7 @@ "Version": "v1.10.0" }, "package_id_70": { - "Name": "quay.io/jetstack/cert-manager-webhook", + "Name": "cert-manager-v1.10.0", "SupportedOS": [ { "Name": "RHEL", @@ -1909,12 +1760,16 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "v1.10.0", - "Version": "v1.10.0" + "Type": "tarball", + "Sources": [ + { + "Architecture": "x86_64", + "Uri": "https://charts.jetstack.io/charts/cert-manager-v1.10.0.tgz" + } + ] }, "package_id_71": { - "Name": "quay.io/strimzi/kafka", + "Name": "strimzi-kafka-operator-helm-3-chart-0.48.0", "SupportedOS": [ { "Name": "RHEL", @@ -1924,9 +1779,13 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "0.48.0-kafka-4.1.0", - "Version": "0.48.0-kafka-4.1.0" + "Type": "tarball", + "Sources": [ + { + "Architecture": "x86_64", + "Uri": "https://github.com/strimzi/strimzi-kafka-operator/releases/download/0.48.0/strimzi-kafka-operator-helm-3-chart-0.48.0.tgz" + } + ] }, "package_id_72": { "Name": "quay.io/strimzi/kafka-bridge", @@ -1944,7 +1803,7 @@ "Version": "0.33.1" }, "package_id_73": { - "Name": "quay.io/strimzi/operator", + "Name": "docker.io/victoriametrics/operator", "SupportedOS": [ { "Name": "RHEL", @@ -1955,11 +1814,11 @@ "x86_64" ], "Type": "image", - "Tag": "0.48.0", - "Version": "0.48.0" + "Tag": "config-reloader-v0.68.3", + "Version": "config-reloader-v0.68.3" }, "package_id_74": { - "Name": "strimzi-kafka-operator-helm-3-chart-0.48.0", + "Name": "victoria-metrics-operator-0.59.3", "SupportedOS": [ { "Name": "RHEL", @@ -1973,12 +1832,12 @@ "Sources": [ { "Architecture": "x86_64", - "Uri": "https://github.com/strimzi/strimzi-kafka-operator/releases/download/0.48.0/strimzi-kafka-operator-helm-3-chart-0.48.0.tgz" + "Uri": "https://github.com/VictoriaMetrics/helm-charts/releases/download/victoria-metrics-operator-0.59.3/victoria-metrics-operator-0.59.3.tgz" } ] }, "package_id_75": { - "Name": "victoria-metrics-operator-0.59.3", + "Name": "docker.io/timberio/vector", "SupportedOS": [ { "Name": "RHEL", @@ -1988,16 +1847,12 @@ "Architecture": [ "x86_64" ], - "Type": "tarball", - "Sources": [ - { - "Architecture": "x86_64", - "Uri": "https://github.com/VictoriaMetrics/helm-charts/releases/download/victoria-metrics-operator-0.59.3/victoria-metrics-operator-0.59.3.tgz" - } - ] + "Type": "image", + "Tag": "0.54.0-debian", + "Version": "0.54.0-debian" }, "package_id_76": { - "Name": "PyMySQL==1.1.2", + "Name": "ghcr.io/kube-vip/kube-vip", "SupportedOS": [ { "Name": "RHEL", @@ -2007,10 +1862,12 @@ "Architecture": [ "x86_64" ], - "Type": "pip_module" + "Type": "image", + "Tag": "v0.8.9", + "Version": "v0.8.9" }, "package_id_77": { - "Name": "docker.io/calico/cni", + "Name": "registry.k8s.io/kube-apiserver", "SupportedOS": [ { "Name": "RHEL", @@ -2021,11 +1878,11 @@ "x86_64" ], "Type": "image", - "Tag": "v3.31.4", - "Version": "v3.31.4" + "Tag": "v1.35.1", + "Version": "v1.35.1" }, "package_id_78": { - "Name": "docker.io/calico/kube-controllers", + "Name": "registry.k8s.io/kube-controller-manager", "SupportedOS": [ { "Name": "RHEL", @@ -2036,11 +1893,11 @@ "x86_64" ], "Type": "image", - "Tag": "v3.31.4", - "Version": "v3.31.4" + "Tag": "v1.35.1", + "Version": "v1.35.1" }, "package_id_79": { - "Name": "docker.io/calico/node", + "Name": "registry.k8s.io/kube-scheduler", "SupportedOS": [ { "Name": "RHEL", @@ -2051,11 +1908,11 @@ "x86_64" ], "Type": "image", - "Tag": "v3.31.4", - "Version": "v3.31.4" + "Tag": "v1.35.1", + "Version": "v1.35.1" }, "package_id_80": { - "Name": "ghcr.io/kube-vip/kube-vip", + "Name": "registry.k8s.io/kube-proxy", "SupportedOS": [ { "Name": "RHEL", @@ -2066,11 +1923,11 @@ "x86_64" ], "Type": "image", - "Tag": "v0.8.9", - "Version": "v0.8.9" + "Tag": "v1.35.1", + "Version": "v1.35.1" }, "package_id_81": { - "Name": "kubectl-1.35.1", + "Name": "registry.k8s.io/coredns/coredns", "SupportedOS": [ { "Name": "RHEL", @@ -2080,16 +1937,12 @@ "Architecture": [ "x86_64" ], - "Type": "rpm", - "Sources": [ - { - "Architecture": "x86_64", - "RepoName": "kubernetes-v1-35" - } - ] + "Type": "image", + "Tag": "v1.13.1", + "Version": "v1.13.1" }, "package_id_82": { - "Name": "prettytable==3.14.0", + "Name": "registry.k8s.io/pause", "SupportedOS": [ { "Name": "RHEL", @@ -2099,10 +1952,12 @@ "Architecture": [ "x86_64" ], - "Type": "pip_module" + "Type": "image", + "Tag": "3.10.1", + "Version": "3.10.1" }, "package_id_83": { - "Name": "python3-3.12.9", + "Name": "registry.k8s.io/etcd", "SupportedOS": [ { "Name": "RHEL", @@ -2112,16 +1967,12 @@ "Architecture": [ "x86_64" ], - "Type": "rpm", - "Sources": [ - { - "Architecture": "x86_64", - "RepoName": "baseos" - } - ] + "Type": "image", + "Tag": "3.6.6-0", + "Version": "3.6.6-0" }, "package_id_84": { - "Name": "quay.io/metallb/speaker", + "Name": "docker.io/calico/cni", "SupportedOS": [ { "Name": "RHEL", @@ -2132,11 +1983,11 @@ "x86_64" ], "Type": "image", - "Tag": "v0.15.3", - "Version": "v0.15.3" + "Tag": "v3.31.4", + "Version": "v3.31.4" }, "package_id_85": { - "Name": "registry.k8s.io/coredns/coredns", + "Name": "docker.io/calico/kube-controllers", "SupportedOS": [ { "Name": "RHEL", @@ -2147,11 +1998,11 @@ "x86_64" ], "Type": "image", - "Tag": "v1.13.1", - "Version": "v1.13.1" + "Tag": "v3.31.4", + "Version": "v3.31.4" }, "package_id_86": { - "Name": "registry.k8s.io/etcd", + "Name": "docker.io/calico/node", "SupportedOS": [ { "Name": "RHEL", @@ -2162,11 +2013,11 @@ "x86_64" ], "Type": "image", - "Tag": "3.6.6-0", - "Version": "3.6.6-0" + "Tag": "v3.31.4", + "Version": "v3.31.4" }, "package_id_87": { - "Name": "registry.k8s.io/kube-apiserver", + "Name": "quay.io/metallb/speaker", "SupportedOS": [ { "Name": "RHEL", @@ -2177,11 +2028,11 @@ "x86_64" ], "Type": "image", - "Tag": "v1.35.1", - "Version": "v1.35.1" + "Tag": "v0.15.3", + "Version": "v0.15.3" }, "package_id_88": { - "Name": "registry.k8s.io/kube-controller-manager", + "Name": "kubectl-1.35.1", "SupportedOS": [ { "Name": "RHEL", @@ -2191,12 +2042,16 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "v1.35.1", - "Version": "v1.35.1" + "Type": "rpm", + "Sources": [ + { + "Architecture": "x86_64", + "RepoName": "kubernetes-v1-35" + } + ] }, "package_id_89": { - "Name": "registry.k8s.io/kube-proxy", + "Name": "prettytable==3.14.0", "SupportedOS": [ { "Name": "RHEL", @@ -2206,12 +2061,10 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "v1.35.1", - "Version": "v1.35.1" + "Type": "pip_module" }, "package_id_90": { - "Name": "registry.k8s.io/kube-scheduler", + "Name": "python3-3.12.9", "SupportedOS": [ { "Name": "RHEL", @@ -2221,12 +2074,16 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "v1.35.1", - "Version": "v1.35.1" + "Type": "rpm", + "Sources": [ + { + "Architecture": "x86_64", + "RepoName": "baseos" + } + ] }, "package_id_91": { - "Name": "registry.k8s.io/pause", + "Name": "PyMySQL==1.1.2", "SupportedOS": [ { "Name": "RHEL", @@ -2236,9 +2093,7 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "3.10.1", - "Version": "3.10.1" + "Type": "pip_module" }, "package_id_92": { "Name": "calico-v3.31.4", @@ -2260,7 +2115,7 @@ ] }, "package_id_93": { - "Name": "helm-v3.20.1-amd64", + "Name": "metallb-native-v0.15.3", "SupportedOS": [ { "Name": "RHEL", @@ -2270,16 +2125,16 @@ "Architecture": [ "x86_64" ], - "Type": "tarball", + "Type": "manifest", "Sources": [ { "Architecture": "x86_64", - "Uri": "https://get.helm.sh/helm-v3.20.1-linux-amd64.tar.gz" + "Uri": "https://raw.githubusercontent.com/metallb/metallb/v0.15.3/config/manifests/metallb-native.yaml" } ] }, "package_id_94": { - "Name": "metallb-native-v0.15.3", + "Name": "helm-v3.20.1-amd64", "SupportedOS": [ { "Name": "RHEL", @@ -2289,11 +2144,11 @@ "Architecture": [ "x86_64" ], - "Type": "manifest", + "Type": "tarball", "Sources": [ { "Architecture": "x86_64", - "Uri": "https://raw.githubusercontent.com/metallb/metallb/v0.15.3/config/manifests/metallb-native.yaml" + "Uri": "https://get.helm.sh/helm-v3.20.1-linux-amd64.tar.gz" } ] }, @@ -2317,7 +2172,7 @@ ] }, "package_id_96": { - "Name": "quay.io/metallb/controller", + "Name": "registry.k8s.io/sig-storage/nfs-subdir-external-provisioner", "SupportedOS": [ { "Name": "RHEL", @@ -2328,11 +2183,11 @@ "x86_64" ], "Type": "image", - "Tag": "v0.15.3", - "Version": "v0.15.3" + "Tag": "v4.0.2", + "Version": "v4.0.2" }, "package_id_97": { - "Name": "registry.k8s.io/sig-storage/nfs-subdir-external-provisioner", + "Name": "quay.io/metallb/controller", "SupportedOS": [ { "Name": "RHEL", @@ -2343,8 +2198,8 @@ "x86_64" ], "Type": "image", - "Tag": "v4.0.2", - "Version": "v4.0.2" + "Tag": "v0.15.3", + "Version": "v0.15.3" }, "package_id_98": { "Name": "nvhpc_2025_2511_Linux_aarch64_cuda_13.0", diff --git a/examples/catalog/catalog_rhel_x86_64.json b/examples/catalog/catalog_rhel_x86_64.json index d051d81504..009779f3b9 100644 --- a/examples/catalog/catalog_rhel_x86_64.json +++ b/examples/catalog/catalog_rhel_x86_64.json @@ -203,7 +203,7 @@ "package_id_77", "package_id_78", "package_id_79", - "package_id_88" + "package_id_91" ] }, { @@ -1099,7 +1099,7 @@ ] }, "package_id_34": { - "Name": "cert-manager-v1.10.0", + "Name": "docker.io/library/busybox", "SupportedOS": [ { "Name": "RHEL", @@ -1109,16 +1109,12 @@ "Architecture": [ "x86_64" ], - "Type": "tarball", - "Sources": [ - { - "Architecture": "x86_64", - "Uri": "https://charts.jetstack.io/charts/cert-manager-v1.10.0.tgz" - } - ] + "Type": "image", + "Tag": "1.36", + "Version": "1.36" }, "package_id_35": { - "Name": "cffi==1.17.1", + "Name": "git", "SupportedOS": [ { "Name": "RHEL", @@ -1128,10 +1124,16 @@ "Architecture": [ "x86_64" ], - "Type": "pip_module" + "Type": "rpm", + "Sources": [ + { + "Architecture": "x86_64", + "RepoName": "appstream" + } + ] }, "package_id_36": { - "Name": "container-selinux", + "Name": "fuse-overlayfs", "SupportedOS": [ { "Name": "RHEL", @@ -1150,7 +1152,7 @@ ] }, "package_id_37": { - "Name": "cri-o-1.35.1", + "Name": "podman", "SupportedOS": [ { "Name": "RHEL", @@ -1164,12 +1166,12 @@ "Sources": [ { "Architecture": "x86_64", - "RepoName": "cri-o-v1-35" + "RepoName": "appstream" } ] }, "package_id_38": { - "Name": "cryptography==45.0.7", + "Name": "kubeadm-1.35.1", "SupportedOS": [ { "Name": "RHEL", @@ -1179,10 +1181,16 @@ "Architecture": [ "x86_64" ], - "Type": "pip_module" + "Type": "rpm", + "Sources": [ + { + "Architecture": "x86_64", + "RepoName": "kubernetes-v1-35" + } + ] }, "package_id_39": { - "Name": "docker.io/alpine/kubectl", + "Name": "kubelet-1.35.1", "SupportedOS": [ { "Name": "RHEL", @@ -1192,12 +1200,16 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "1.35.1", - "Version": "1.35.1" + "Type": "rpm", + "Sources": [ + { + "Architecture": "x86_64", + "RepoName": "kubernetes-v1-35" + } + ] }, "package_id_40": { - "Name": "docker.io/curlimages/curl", + "Name": "container-selinux", "SupportedOS": [ { "Name": "RHEL", @@ -1207,12 +1219,16 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "8.17.0", - "Version": "8.17.0" + "Type": "rpm", + "Sources": [ + { + "Architecture": "x86_64", + "RepoName": "appstream" + } + ] }, "package_id_41": { - "Name": "docker.io/dellhpcomniaaisolution/idrac_telemetry_receiver", + "Name": "cri-o-1.35.1", "SupportedOS": [ { "Name": "RHEL", @@ -1222,12 +1238,16 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "1.2", - "Version": "1.2" + "Type": "rpm", + "Sources": [ + { + "Architecture": "x86_64", + "RepoName": "cri-o-v1-35" + } + ] }, "package_id_42": { - "Name": "docker.io/dellhpcomniaaisolution/kafkapump", + "Name": "docker.io/victoriametrics/victoria-metrics", "SupportedOS": [ { "Name": "RHEL", @@ -1238,11 +1258,11 @@ "x86_64" ], "Type": "image", - "Tag": "1.2", - "Version": "1.2" + "Tag": "v1.128.0", + "Version": "v1.128.0" }, "package_id_43": { - "Name": "docker.io/dellhpcomniaaisolution/ubuntu-ldms", + "Name": "docker.io/victoriametrics/vmagent", "SupportedOS": [ { "Name": "RHEL", @@ -1253,11 +1273,11 @@ "x86_64" ], "Type": "image", - "Tag": "1.1", - "Version": "1.1" + "Tag": "v1.128.0", + "Version": "v1.128.0" }, "package_id_44": { - "Name": "docker.io/dellhpcomniaaisolution/victoriapump", + "Name": "docker.io/victoriametrics/vmstorage", "SupportedOS": [ { "Name": "RHEL", @@ -1268,11 +1288,11 @@ "x86_64" ], "Type": "image", - "Tag": "1.2", - "Version": "1.2" + "Tag": "v1.128.0-cluster", + "Version": "v1.128.0-cluster" }, "package_id_45": { - "Name": "docker.io/library/busybox", + "Name": "docker.io/victoriametrics/vminsert", "SupportedOS": [ { "Name": "RHEL", @@ -1283,11 +1303,11 @@ "x86_64" ], "Type": "image", - "Tag": "1.36", - "Version": "1.36" + "Tag": "v1.128.0-cluster", + "Version": "v1.128.0-cluster" }, "package_id_46": { - "Name": "docker.io/library/mysql", + "Name": "docker.io/victoriametrics/vmselect", "SupportedOS": [ { "Name": "RHEL", @@ -1298,11 +1318,11 @@ "x86_64" ], "Type": "image", - "Tag": "9.3.0", - "Version": "9.3.0" + "Tag": "v1.128.0-cluster", + "Version": "v1.128.0-cluster" }, "package_id_47": { - "Name": "docker.io/library/python", + "Name": "docker.io/victoriametrics/victoria-logs", "SupportedOS": [ { "Name": "RHEL", @@ -1313,11 +1333,11 @@ "x86_64" ], "Type": "image", - "Tag": "3.12-slim", - "Version": "3.12-slim" + "Tag": "v1.50.0", + "Version": "v1.50.0" }, "package_id_48": { - "Name": "docker.io/nginxinc/nginx-unprivileged", + "Name": "docker.io/victoriametrics/vlagent", "SupportedOS": [ { "Name": "RHEL", @@ -1328,11 +1348,11 @@ "x86_64" ], "Type": "image", - "Tag": "1.29", - "Version": "1.29" + "Tag": "v1.50.0", + "Version": "v1.50.0" }, "package_id_49": { - "Name": "docker.io/rmohr/activemq", + "Name": "docker.io/alpine/kubectl", "SupportedOS": [ { "Name": "RHEL", @@ -1343,11 +1363,11 @@ "x86_64" ], "Type": "image", - "Tag": "5.15.9", - "Version": "5.15.9" + "Tag": "1.35.1", + "Version": "1.35.1" }, "package_id_50": { - "Name": "docker.io/timberio/vector", + "Name": "docker.io/curlimages/curl", "SupportedOS": [ { "Name": "RHEL", @@ -1358,11 +1378,11 @@ "x86_64" ], "Type": "image", - "Tag": "0.54.0-debian", - "Version": "0.54.0-debian" + "Tag": "8.17.0", + "Version": "8.17.0" }, "package_id_51": { - "Name": "docker.io/victoriametrics/operator", + "Name": "docker.io/rmohr/activemq", "SupportedOS": [ { "Name": "RHEL", @@ -1373,11 +1393,11 @@ "x86_64" ], "Type": "image", - "Tag": "config-reloader-v0.68.3", - "Version": "config-reloader-v0.68.3" + "Tag": "5.15.9", + "Version": "5.15.9" }, "package_id_52": { - "Name": "docker.io/victoriametrics/victoria-logs", + "Name": "docker.io/library/mysql", "SupportedOS": [ { "Name": "RHEL", @@ -1388,11 +1408,11 @@ "x86_64" ], "Type": "image", - "Tag": "v1.50.0", - "Version": "v1.50.0" + "Tag": "9.3.0", + "Version": "9.3.0" }, "package_id_53": { - "Name": "docker.io/victoriametrics/victoria-metrics", + "Name": "docker.io/library/python", "SupportedOS": [ { "Name": "RHEL", @@ -1403,11 +1423,11 @@ "x86_64" ], "Type": "image", - "Tag": "v1.128.0", - "Version": "v1.128.0" + "Tag": "3.12-slim", + "Version": "3.12-slim" }, "package_id_54": { - "Name": "docker.io/victoriametrics/vlagent", + "Name": "docker.io/dellhpcomniaaisolution/idrac_telemetry_receiver", "SupportedOS": [ { "Name": "RHEL", @@ -1418,11 +1438,11 @@ "x86_64" ], "Type": "image", - "Tag": "v1.50.0", - "Version": "v1.50.0" + "Tag": "1.3", + "Version": "1.3" }, "package_id_55": { - "Name": "docker.io/victoriametrics/vmagent", + "Name": "docker.io/dellhpcomniaaisolution/kafkapump", "SupportedOS": [ { "Name": "RHEL", @@ -1433,11 +1453,11 @@ "x86_64" ], "Type": "image", - "Tag": "v1.128.0", - "Version": "v1.128.0" + "Tag": "1.3", + "Version": "1.3" }, "package_id_56": { - "Name": "docker.io/victoriametrics/vminsert", + "Name": "docker.io/dellhpcomniaaisolution/victoriapump", "SupportedOS": [ { "Name": "RHEL", @@ -1448,11 +1468,11 @@ "x86_64" ], "Type": "image", - "Tag": "v1.128.0-cluster", - "Version": "v1.128.0-cluster" + "Tag": "1.3", + "Version": "1.3" }, "package_id_57": { - "Name": "docker.io/victoriametrics/vmselect", + "Name": "cryptography==45.0.7", "SupportedOS": [ { "Name": "RHEL", @@ -1462,12 +1482,10 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "v1.128.0-cluster", - "Version": "v1.128.0-cluster" + "Type": "pip_module" }, "package_id_58": { - "Name": "docker.io/victoriametrics/vmstorage", + "Name": "omsdk==1.2.518", "SupportedOS": [ { "Name": "RHEL", @@ -1477,12 +1495,10 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "v1.128.0-cluster", - "Version": "v1.128.0-cluster" + "Type": "pip_module" }, "package_id_59": { - "Name": "fuse-overlayfs", + "Name": "cffi==1.17.1", "SupportedOS": [ { "Name": "RHEL", @@ -1492,16 +1508,10 @@ "Architecture": [ "x86_64" ], - "Type": "rpm", - "Sources": [ - { - "Architecture": "x86_64", - "RepoName": "appstream" - } - ] + "Type": "pip_module" }, "package_id_60": { - "Name": "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector", + "Name": "prometheus_client==0.20.0", "SupportedOS": [ { "Name": "RHEL", @@ -1511,12 +1521,10 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "0.143.1", - "Version": "0.143.1" + "Type": "pip_module" }, "package_id_61": { - "Name": "git", + "Name": "kubernetes==33.1.0", "SupportedOS": [ { "Name": "RHEL", @@ -1526,16 +1534,10 @@ "Architecture": [ "x86_64" ], - "Type": "rpm", - "Sources": [ - { - "Architecture": "x86_64", - "RepoName": "appstream" - } - ] + "Type": "pip_module" }, "package_id_62": { - "Name": "helm-charts", + "Name": "quay.io/strimzi/operator", "SupportedOS": [ { "Name": "RHEL", @@ -1545,17 +1547,12 @@ "Architecture": [ "x86_64" ], - "Type": "git", - "Version": "container-storage-modules-1.9.2", - "Sources": [ - { - "Architecture": "x86_64", - "Uri": "https://github.com/dell/helm-charts.git" - } - ] + "Type": "image", + "Tag": "0.48.0", + "Version": "0.48.0" }, "package_id_63": { - "Name": "karavi-observability", + "Name": "quay.io/strimzi/kafka", "SupportedOS": [ { "Name": "RHEL", @@ -1565,17 +1562,12 @@ "Architecture": [ "x86_64" ], - "Type": "git", - "Version": "v1.12.0", - "Sources": [ - { - "Architecture": "x86_64", - "Uri": "https://github.com/dell/karavi-observability.git" - } - ] + "Type": "image", + "Tag": "0.48.0-kafka-4.1.0", + "Version": "0.48.0-kafka-4.1.0" }, "package_id_64": { - "Name": "kubeadm-1.35.1", + "Name": "docker.io/dellhpcomniaaisolution/ubuntu-ldms", "SupportedOS": [ { "Name": "RHEL", @@ -1585,16 +1577,12 @@ "Architecture": [ "x86_64" ], - "Type": "rpm", - "Sources": [ - { - "Architecture": "x86_64", - "RepoName": "kubernetes-v1-35" - } - ] + "Type": "image", + "Tag": "1.1", + "Version": "1.1" }, "package_id_65": { - "Name": "kubelet-1.35.1", + "Name": "quay.io/dell/container-storage-modules/csm-metrics-powerscale", "SupportedOS": [ { "Name": "RHEL", @@ -1604,16 +1592,12 @@ "Architecture": [ "x86_64" ], - "Type": "rpm", - "Sources": [ - { - "Architecture": "x86_64", - "RepoName": "kubernetes-v1-35" - } - ] + "Type": "image", + "Tag": "v1.11.0", + "Version": "v1.11.0" }, "package_id_66": { - "Name": "kubernetes==33.1.0", + "Name": "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector", "SupportedOS": [ { "Name": "RHEL", @@ -1623,10 +1607,12 @@ "Architecture": [ "x86_64" ], - "Type": "pip_module" + "Type": "image", + "Tag": "0.143.1", + "Version": "0.143.1" }, "package_id_67": { - "Name": "omsdk==1.2.518", + "Name": "docker.io/nginxinc/nginx-unprivileged", "SupportedOS": [ { "Name": "RHEL", @@ -1636,10 +1622,12 @@ "Architecture": [ "x86_64" ], - "Type": "pip_module" + "Type": "image", + "Tag": "1.29", + "Version": "1.29" }, "package_id_68": { - "Name": "podman", + "Name": "karavi-observability", "SupportedOS": [ { "Name": "RHEL", @@ -1649,16 +1637,17 @@ "Architecture": [ "x86_64" ], - "Type": "rpm", + "Type": "git", + "Version": "v1.12.0", "Sources": [ { "Architecture": "x86_64", - "RepoName": "appstream" + "Uri": "https://github.com/dell/karavi-observability.git" } ] }, "package_id_69": { - "Name": "prometheus_client==0.20.0", + "Name": "helm-charts", "SupportedOS": [ { "Name": "RHEL", @@ -1668,10 +1657,17 @@ "Architecture": [ "x86_64" ], - "Type": "pip_module" + "Type": "git", + "Version": "container-storage-modules-1.9.2", + "Sources": [ + { + "Architecture": "x86_64", + "Uri": "https://github.com/dell/helm-charts.git" + } + ] }, "package_id_70": { - "Name": "quay.io/dell/container-storage-modules/csm-metrics-powerscale", + "Name": "quay.io/jetstack/cert-manager-controller", "SupportedOS": [ { "Name": "RHEL", @@ -1682,11 +1678,11 @@ "x86_64" ], "Type": "image", - "Tag": "v1.11.0", - "Version": "v1.11.0" + "Tag": "v1.10.0", + "Version": "v1.10.0" }, "package_id_71": { - "Name": "quay.io/jetstack/cert-manager-acmesolver", + "Name": "quay.io/jetstack/cert-manager-cainjector", "SupportedOS": [ { "Name": "RHEL", @@ -1701,7 +1697,7 @@ "Version": "v1.10.0" }, "package_id_72": { - "Name": "quay.io/jetstack/cert-manager-cainjector", + "Name": "quay.io/jetstack/cert-manager-webhook", "SupportedOS": [ { "Name": "RHEL", @@ -1716,7 +1712,7 @@ "Version": "v1.10.0" }, "package_id_73": { - "Name": "quay.io/jetstack/cert-manager-controller", + "Name": "quay.io/jetstack/cert-manager-acmesolver", "SupportedOS": [ { "Name": "RHEL", @@ -1731,7 +1727,7 @@ "Version": "v1.10.0" }, "package_id_74": { - "Name": "quay.io/jetstack/cert-manager-webhook", + "Name": "cert-manager-v1.10.0", "SupportedOS": [ { "Name": "RHEL", @@ -1741,12 +1737,16 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "v1.10.0", - "Version": "v1.10.0" + "Type": "tarball", + "Sources": [ + { + "Architecture": "x86_64", + "Uri": "https://charts.jetstack.io/charts/cert-manager-v1.10.0.tgz" + } + ] }, "package_id_75": { - "Name": "quay.io/strimzi/kafka", + "Name": "strimzi-kafka-operator-helm-3-chart-0.48.0", "SupportedOS": [ { "Name": "RHEL", @@ -1756,9 +1756,13 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "0.48.0-kafka-4.1.0", - "Version": "0.48.0-kafka-4.1.0" + "Type": "tarball", + "Sources": [ + { + "Architecture": "x86_64", + "Uri": "https://github.com/strimzi/strimzi-kafka-operator/releases/download/0.48.0/strimzi-kafka-operator-helm-3-chart-0.48.0.tgz" + } + ] }, "package_id_76": { "Name": "quay.io/strimzi/kafka-bridge", @@ -1776,7 +1780,7 @@ "Version": "0.33.1" }, "package_id_77": { - "Name": "quay.io/strimzi/operator", + "Name": "docker.io/victoriametrics/operator", "SupportedOS": [ { "Name": "RHEL", @@ -1787,11 +1791,11 @@ "x86_64" ], "Type": "image", - "Tag": "0.48.0", - "Version": "0.48.0" + "Tag": "config-reloader-v0.68.3", + "Version": "config-reloader-v0.68.3" }, "package_id_78": { - "Name": "strimzi-kafka-operator-helm-3-chart-0.48.0", + "Name": "victoria-metrics-operator-0.59.3", "SupportedOS": [ { "Name": "RHEL", @@ -1805,12 +1809,12 @@ "Sources": [ { "Architecture": "x86_64", - "Uri": "https://github.com/strimzi/strimzi-kafka-operator/releases/download/0.48.0/strimzi-kafka-operator-helm-3-chart-0.48.0.tgz" + "Uri": "https://github.com/VictoriaMetrics/helm-charts/releases/download/victoria-metrics-operator-0.59.3/victoria-metrics-operator-0.59.3.tgz" } ] }, "package_id_79": { - "Name": "victoria-metrics-operator-0.59.3", + "Name": "docker.io/timberio/vector", "SupportedOS": [ { "Name": "RHEL", @@ -1820,16 +1824,12 @@ "Architecture": [ "x86_64" ], - "Type": "tarball", - "Sources": [ - { - "Architecture": "x86_64", - "Uri": "https://github.com/VictoriaMetrics/helm-charts/releases/download/victoria-metrics-operator-0.59.3/victoria-metrics-operator-0.59.3.tgz" - } - ] + "Type": "image", + "Tag": "0.54.0-debian", + "Version": "0.54.0-debian" }, "package_id_80": { - "Name": "PyMySQL==1.1.2", + "Name": "ghcr.io/kube-vip/kube-vip", "SupportedOS": [ { "Name": "RHEL", @@ -1839,10 +1839,12 @@ "Architecture": [ "x86_64" ], - "Type": "pip_module" + "Type": "image", + "Tag": "v0.8.9", + "Version": "v0.8.9" }, "package_id_81": { - "Name": "docker.io/calico/cni", + "Name": "registry.k8s.io/kube-apiserver", "SupportedOS": [ { "Name": "RHEL", @@ -1853,11 +1855,11 @@ "x86_64" ], "Type": "image", - "Tag": "v3.31.4", - "Version": "v3.31.4" + "Tag": "v1.35.1", + "Version": "v1.35.1" }, "package_id_82": { - "Name": "docker.io/calico/kube-controllers", + "Name": "registry.k8s.io/kube-controller-manager", "SupportedOS": [ { "Name": "RHEL", @@ -1868,11 +1870,11 @@ "x86_64" ], "Type": "image", - "Tag": "v3.31.4", - "Version": "v3.31.4" + "Tag": "v1.35.1", + "Version": "v1.35.1" }, "package_id_83": { - "Name": "docker.io/calico/node", + "Name": "registry.k8s.io/kube-scheduler", "SupportedOS": [ { "Name": "RHEL", @@ -1883,11 +1885,11 @@ "x86_64" ], "Type": "image", - "Tag": "v3.31.4", - "Version": "v3.31.4" + "Tag": "v1.35.1", + "Version": "v1.35.1" }, "package_id_84": { - "Name": "ghcr.io/kube-vip/kube-vip", + "Name": "registry.k8s.io/kube-proxy", "SupportedOS": [ { "Name": "RHEL", @@ -1898,11 +1900,11 @@ "x86_64" ], "Type": "image", - "Tag": "v0.8.9", - "Version": "v0.8.9" + "Tag": "v1.35.1", + "Version": "v1.35.1" }, "package_id_85": { - "Name": "kubectl-1.35.1", + "Name": "registry.k8s.io/coredns/coredns", "SupportedOS": [ { "Name": "RHEL", @@ -1912,16 +1914,12 @@ "Architecture": [ "x86_64" ], - "Type": "rpm", - "Sources": [ - { - "Architecture": "x86_64", - "RepoName": "kubernetes-v1-35" - } - ] + "Type": "image", + "Tag": "v1.13.1", + "Version": "v1.13.1" }, "package_id_86": { - "Name": "prettytable==3.14.0", + "Name": "registry.k8s.io/pause", "SupportedOS": [ { "Name": "RHEL", @@ -1931,10 +1929,12 @@ "Architecture": [ "x86_64" ], - "Type": "pip_module" + "Type": "image", + "Tag": "3.10.1", + "Version": "3.10.1" }, "package_id_87": { - "Name": "python3-3.12.9", + "Name": "registry.k8s.io/etcd", "SupportedOS": [ { "Name": "RHEL", @@ -1944,16 +1944,12 @@ "Architecture": [ "x86_64" ], - "Type": "rpm", - "Sources": [ - { - "Architecture": "x86_64", - "RepoName": "baseos" - } - ] + "Type": "image", + "Tag": "3.6.6-0", + "Version": "3.6.6-0" }, "package_id_88": { - "Name": "quay.io/metallb/speaker", + "Name": "docker.io/calico/cni", "SupportedOS": [ { "Name": "RHEL", @@ -1964,11 +1960,11 @@ "x86_64" ], "Type": "image", - "Tag": "v0.15.3", - "Version": "v0.15.3" + "Tag": "v3.31.4", + "Version": "v3.31.4" }, "package_id_89": { - "Name": "registry.k8s.io/coredns/coredns", + "Name": "docker.io/calico/kube-controllers", "SupportedOS": [ { "Name": "RHEL", @@ -1979,11 +1975,11 @@ "x86_64" ], "Type": "image", - "Tag": "v1.13.1", - "Version": "v1.13.1" + "Tag": "v3.31.4", + "Version": "v3.31.4" }, "package_id_90": { - "Name": "registry.k8s.io/etcd", + "Name": "docker.io/calico/node", "SupportedOS": [ { "Name": "RHEL", @@ -1994,11 +1990,11 @@ "x86_64" ], "Type": "image", - "Tag": "3.6.6-0", - "Version": "3.6.6-0" + "Tag": "v3.31.4", + "Version": "v3.31.4" }, "package_id_91": { - "Name": "registry.k8s.io/kube-apiserver", + "Name": "quay.io/metallb/speaker", "SupportedOS": [ { "Name": "RHEL", @@ -2009,11 +2005,11 @@ "x86_64" ], "Type": "image", - "Tag": "v1.35.1", - "Version": "v1.35.1" + "Tag": "v0.15.3", + "Version": "v0.15.3" }, "package_id_92": { - "Name": "registry.k8s.io/kube-controller-manager", + "Name": "kubectl-1.35.1", "SupportedOS": [ { "Name": "RHEL", @@ -2023,12 +2019,16 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "v1.35.1", - "Version": "v1.35.1" + "Type": "rpm", + "Sources": [ + { + "Architecture": "x86_64", + "RepoName": "kubernetes-v1-35" + } + ] }, "package_id_93": { - "Name": "registry.k8s.io/kube-proxy", + "Name": "prettytable==3.14.0", "SupportedOS": [ { "Name": "RHEL", @@ -2038,12 +2038,10 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "v1.35.1", - "Version": "v1.35.1" + "Type": "pip_module" }, "package_id_94": { - "Name": "registry.k8s.io/kube-scheduler", + "Name": "python3-3.12.9", "SupportedOS": [ { "Name": "RHEL", @@ -2053,12 +2051,16 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "v1.35.1", - "Version": "v1.35.1" + "Type": "rpm", + "Sources": [ + { + "Architecture": "x86_64", + "RepoName": "baseos" + } + ] }, "package_id_95": { - "Name": "registry.k8s.io/pause", + "Name": "PyMySQL==1.1.2", "SupportedOS": [ { "Name": "RHEL", @@ -2068,9 +2070,7 @@ "Architecture": [ "x86_64" ], - "Type": "image", - "Tag": "3.10.1", - "Version": "3.10.1" + "Type": "pip_module" }, "package_id_96": { "Name": "calico-v3.31.4", @@ -2092,7 +2092,7 @@ ] }, "package_id_97": { - "Name": "helm-v3.20.1-amd64", + "Name": "metallb-native-v0.15.3", "SupportedOS": [ { "Name": "RHEL", @@ -2102,16 +2102,16 @@ "Architecture": [ "x86_64" ], - "Type": "tarball", + "Type": "manifest", "Sources": [ { "Architecture": "x86_64", - "Uri": "https://get.helm.sh/helm-v3.20.1-linux-amd64.tar.gz" + "Uri": "https://raw.githubusercontent.com/metallb/metallb/v0.15.3/config/manifests/metallb-native.yaml" } ] }, "package_id_98": { - "Name": "metallb-native-v0.15.3", + "Name": "helm-v3.20.1-amd64", "SupportedOS": [ { "Name": "RHEL", @@ -2121,11 +2121,11 @@ "Architecture": [ "x86_64" ], - "Type": "manifest", + "Type": "tarball", "Sources": [ { "Architecture": "x86_64", - "Uri": "https://raw.githubusercontent.com/metallb/metallb/v0.15.3/config/manifests/metallb-native.yaml" + "Uri": "https://get.helm.sh/helm-v3.20.1-linux-amd64.tar.gz" } ] }, @@ -2149,7 +2149,7 @@ ] }, "package_id_100": { - "Name": "quay.io/metallb/controller", + "Name": "registry.k8s.io/sig-storage/nfs-subdir-external-provisioner", "SupportedOS": [ { "Name": "RHEL", @@ -2160,11 +2160,11 @@ "x86_64" ], "Type": "image", - "Tag": "v0.15.3", - "Version": "v0.15.3" + "Tag": "v4.0.2", + "Version": "v4.0.2" }, "package_id_101": { - "Name": "registry.k8s.io/sig-storage/nfs-subdir-external-provisioner", + "Name": "quay.io/metallb/controller", "SupportedOS": [ { "Name": "RHEL", @@ -2175,8 +2175,8 @@ "x86_64" ], "Type": "image", - "Tag": "v4.0.2", - "Version": "v4.0.2" + "Tag": "v0.15.3", + "Version": "v0.15.3" } }, "OSPackages": { @@ -4063,7 +4063,7 @@ "Miscellaneous": [], "InfrastructurePackages": { "infrastructure_package_id_1": { - "Name": "csi-powerscale", + "Name": "csi-powerscale-v2.16.0", "Type": "git", "Version": "v2.16.0", "SupportedFunctions": [ @@ -4082,7 +4082,7 @@ ] }, "infrastructure_package_id_2": { - "Name": "external-snapshotter", + "Name": "external-snapshotter-v8.4.0", "Type": "git", "Version": "v8.4.0", "SupportedFunctions": [ @@ -4101,7 +4101,7 @@ ] }, "infrastructure_package_id_3": { - "Name": "helm-charts", + "Name": "helm-charts-2.16.0", "Type": "git", "Version": "csi-isilon-2.16.0", "SupportedFunctions": [ diff --git a/gitlab/roles/hosted_gitlab/tasks/push_single_example_catalog.yml b/gitlab/roles/hosted_gitlab/tasks/push_single_example_catalog.yml index fc4dea9149..0635db833a 100644 --- a/gitlab/roles/hosted_gitlab/tasks/push_single_example_catalog.yml +++ b/gitlab/roles/hosted_gitlab/tasks/push_single_example_catalog.yml @@ -21,9 +21,7 @@ - name: Check if example catalog exists in repository ansible.builtin.uri: - url: >- - {{ gitlab_external_url_computed }}/api/v4/projects/{{ gitlab_project_id }}/ - repository/files/{{ _gitlab_example_encoded_path }}?ref={{ gitlab_default_branch }} + url: "{{ gitlab_external_url_computed }}/api/v4/projects/{{ gitlab_project_id }}/repository/files/{{ _gitlab_example_encoded_path }}?ref={{ gitlab_default_branch }}" # noqa: yaml[line-length] method: GET headers: PRIVATE-TOKEN: "{{ gitlab_root_token }}" diff --git a/input/storage_config.yml b/input/storage_config.yml index cc56146b3d..ec39c4cd92 100644 --- a/input/storage_config.yml +++ b/input/storage_config.yml @@ -44,7 +44,10 @@ # # Node-specific bind mounts (node_key and node_mount_point are paired): # - node_key: Per-node subdirectory isolation variable. Optional -# Allowed values: "local_hostname", "local_ipv4", "instance_id" +# Allowed values: +# - "local_hostname" - hostname of the node +# - "local_ipv4" - IPv4 address of the node +# - "instance_id" - instance ID of the node from cloud-init # Default: "local_hostname" # When set, node_mount_point is MANDATORY # Generates bind mounts: // -> @@ -53,7 +56,7 @@ # Each entry: // -> # # Targeting — exactly ONE of the following is required (mutually exclusive): -# - functional_group_prefix: List of oChaMI functional group name prefixes. Mandatory (one of) +# - functional_group_prefix: List of functional group name prefixes. Mandatory (one of) # MUTUALLY EXCLUSIVE with groups # All nodes whose group name starts with any listed prefix receive this mount # e.g., ["slurm"] matches slurm_control_node, slurm_node, etc. @@ -70,10 +73,12 @@ # # Example: static mount with all explicit params (no profile) +# which will be mounted on functional groups +# slurm_control_node_x86_64, slurm_node_x86_64, slurm_login_x86_64 # mounts: # Example: static mount using profile # - name: "vast_home" -# source: "192.168.1.100:/home" +# source: "192.168.1.100:/share/slurm_home" # mount_point: "/home" # mount_params: "vast_nfs" # functional_group_prefix: ["slurm"] @@ -86,6 +91,8 @@ # - name: "scratch_isolation" # source: "192.168.1.102:/share/vast" # mount_point: "/mnt/vast" +# fs_type: "nfs" +# mnt_opts: "nosuid,rw,sync,hard" # node_key: "local_hostname" # node_mount_point: # - /scratch @@ -98,8 +105,7 @@ # # slurm.conf: SlurmdSpoolDir=/scratch,/tmp # /mnt/scratch /mnted/sctratch nfs4 defaults,nofail,_netdev,x-systemd.after=cloud-init-network.service 0 0 - -# /mnted/scratch/node001/var/loig/state /var/loig/state none bind 0 0 +# /mnted/scratch/node001/var/log/state /var/log/state none bind 0 0 mounts: - name: "nfs_slurm" source: "172.16.107.168:/mnt/share/omnia" @@ -118,7 +124,7 @@ mounts: functional_group_prefix: ["service_kube"] - name: "vast_storage" - source: "172.16.0.254:/mnt/share/vast" + source: "172.16.107.77:/share/vast" mount_point: "/mnt/vast" mount_params: "vast_rdma" functional_group_prefix: ["slurm_node", "login"] @@ -139,21 +145,21 @@ mounts: # mount_params: - # Default NFS mount - standard NFS4.1 with high-performance options + # Default NFS mount nfs_default: fs_type: "nfs" - mnt_opts: "nosuid,rw,sync,hard,intr" + mnt_opts: "nosuid,rw,sync,hard" dump_freq: "0" fsck_pass: "0" - # VAST NFS storage - standard configuration + # VAST NFS RDMA storage over IB - standard configuration vast_rdma: fs_type: "nfs" - mnt_opts: "proto=rdma,port=20049,nconnect=8,timeo=600,retrans=2,rsize=1048576,wsize=1048576,hard,intr,localaddr=192.168.0.23" + mnt_opts: "proto=rdma,nconnect=8,timeo=600,retrans=2,rsize=1048576,wsize=1048576,hard" - vast_nfs: + vast_tcp: fs_type: "nfs" - mnt_opts: "nosuid,rw,sync,hard,intr" + mnt_opts: "nosuid,rw,sync,hard" # -----------------------------Powervault------------------------------------------- # powervault_config diff --git a/omnia.sh b/omnia.sh index e04268e32c..353aa9b5ca 100755 --- a/omnia.sh +++ b/omnia.sh @@ -1147,9 +1147,15 @@ setup_container() { echo "==> Setting up $container_name container" # SELinux option handling + # For external NFS: disable SELinux labeling entirely because NFS-mounted + # files carry the 'nfs_t' type which containers (container_t) cannot access. + # The ':z' relabel also fails on NFS since NFS does not support xattrs. + # For local/internal: use ':z' to relabel volumes for container access. selinux_option=":z" + selinux_disable="" if [ "$share_option" = "NFS" ] && [ "$nfs_type" = "external" ]; then selinux_option="" + selinux_disable="SecurityLabelDisable=true" fi # --- Generate Quadlet container file --- @@ -1169,6 +1175,7 @@ Network=host # Capabilities AddCapability=CAP_AUDIT_WRITE +${selinux_disable} # Volumes Volume=${omnia_path}/omnia:/opt/omnia${selinux_option} diff --git a/provision/roles/configure_ochami/templates/cloud_init/ci-group-login_compiler_node_aarch64.yaml.j2 b/provision/roles/configure_ochami/templates/cloud_init/ci-group-login_compiler_node_aarch64.yaml.j2 index 687f72a609..6b87aeaa36 100644 --- a/provision/roles/configure_ochami/templates/cloud_init/ci-group-login_compiler_node_aarch64.yaml.j2 +++ b/provision/roles/configure_ochami/templates/cloud_init/ci-group-login_compiler_node_aarch64.yaml.j2 @@ -237,18 +237,13 @@ - bash /usr/local/bin/setup_iscsi_storage_{{ pv_entry.name }}.sh {% endfor %} # VAST storage: create subdirectory structure for login+compiler node - - mkdir -pv {{ vast_mount_point }}/apps {{ vast_mount_point }}/home {{ vast_mount_point }}/projects - - mkdir -pv /apps /home /projects - - echo "{{ vast_mount_point }}/apps /apps none bind 0 0" >> /etc/fstab - - echo "{{ vast_mount_point }}/home /home none bind 0 0" >> /etc/fstab - - echo "{{ vast_mount_point }}/projects /projects none bind 0 0" >> /etc/fstab - - mount -av - # VAST storage: scratch directory for login+compiler node - - mkdir -pv {{ vast_mount_point }}/scratch + - mkdir -pv {{ vast_mount_point }}/apps {{ vast_mount_point }}/scratch {{ vast_mount_point }}/projects - mkdir -pv {{ vast_mount_point }}/scratch/$(hostname -s)/tmp - - mkdir -pv /scratch + - mkdir -pv /apps /scratch /projects + - echo "{{ vast_mount_point }}/apps /apps none bind 0 0" >> /etc/fstab - echo "{{ vast_mount_point }}/scratch /scratch none bind 0 0" >> /etc/fstab - echo "{{ vast_mount_point }}/scratch/$(hostname -s)/tmp /tmp none bind 0 0" >> /etc/fstab + - echo "{{ vast_mount_point }}/projects /projects none bind 0 0" >> /etc/fstab - mount -av - chmod 1777 /tmp /scratch - /usr/local/bin/install_cuda_toolkit.sh @@ -366,9 +361,10 @@ - /usr/local/bin/update_ldap_conf.sh - mkdir /ldapcerts - echo "{{ cloud_init_nfs_path_openldap }}/certs /ldapcerts nfs defaults,_netdev 0 0" >> /etc/fstab - - echo "{{ cloud_init_nfs_path_openldap }}/ldapuser /home nfs defaults,_netdev 0 0" >> /etc/fstab + - mkdir -pv {{ vast_mount_point }}/{{ openldap_dir_name }}/ldapuser /home + - echo "{{ vast_mount_point }}/{{ openldap_dir_name }}/ldapuser /home none bind 0 0" >> /etc/fstab - chmod {{ file_mode }} /etc/fstab - - mount -a + - mount -av - yes | cp /ldapcerts/* /etc/openldap/certs - umount /ldapcerts diff --git a/provision/roles/configure_ochami/templates/cloud_init/ci-group-login_compiler_node_x86_64.yaml.j2 b/provision/roles/configure_ochami/templates/cloud_init/ci-group-login_compiler_node_x86_64.yaml.j2 index 7e0fcd776c..c63c8485ab 100644 --- a/provision/roles/configure_ochami/templates/cloud_init/ci-group-login_compiler_node_x86_64.yaml.j2 +++ b/provision/roles/configure_ochami/templates/cloud_init/ci-group-login_compiler_node_x86_64.yaml.j2 @@ -236,18 +236,13 @@ - bash /usr/local/bin/setup_iscsi_storage_{{ pv_entry.name }}.sh {% endfor %} # VAST storage: create subdirectory structure for login+compiler node - - mkdir -pv {{ vast_mount_point }}/apps {{ vast_mount_point }}/home {{ vast_mount_point }}/projects - - mkdir -pv /apps /home /projects - - echo "{{ vast_mount_point }}/apps /apps none bind 0 0" >> /etc/fstab - - echo "{{ vast_mount_point }}/home /home none bind 0 0" >> /etc/fstab - - echo "{{ vast_mount_point }}/projects /projects none bind 0 0" >> /etc/fstab - - mount -av - # VAST storage: scratch directory for login+compiler node - - mkdir -pv {{ vast_mount_point }}/scratch + - mkdir -pv {{ vast_mount_point }}/apps {{ vast_mount_point }}/scratch {{ vast_mount_point }}/projects - mkdir -pv {{ vast_mount_point }}/scratch/$(hostname -s)/tmp - - mkdir -pv /scratch + - mkdir -pv /apps /scratch /projects + - echo "{{ vast_mount_point }}/apps /apps none bind 0 0" >> /etc/fstab - echo "{{ vast_mount_point }}/scratch /scratch none bind 0 0" >> /etc/fstab - echo "{{ vast_mount_point }}/scratch/$(hostname -s)/tmp /tmp none bind 0 0" >> /etc/fstab + - echo "{{ vast_mount_point }}/projects /projects none bind 0 0" >> /etc/fstab - mount -av - chmod 1777 /tmp /scratch - /usr/local/bin/install_cuda_toolkit.sh @@ -368,9 +363,10 @@ - /usr/local/bin/update_ldap_conf.sh - mkdir /ldapcerts - echo "{{ cloud_init_nfs_path_openldap }}/certs /ldapcerts nfs defaults,_netdev 0 0" >> /etc/fstab - - if ! mountpoint -q /home; then echo "{{ cloud_init_nfs_path_openldap }}/ldapuser /home nfs defaults,_netdev 0 0" >> /etc/fstab; fi + - mkdir -pv {{ vast_mount_point }}/{{ openldap_dir_name }}/ldapuser /home + - echo "{{ vast_mount_point }}/{{ openldap_dir_name }}/ldapuser /home none bind 0 0" >> /etc/fstab - chmod {{ file_mode }} /etc/fstab - - mount -a + - mount -av - yes | cp /ldapcerts/* /etc/openldap/certs - umount /ldapcerts diff --git a/provision/roles/configure_ochami/templates/cloud_init/ci-group-login_node_aarch64.yaml.j2 b/provision/roles/configure_ochami/templates/cloud_init/ci-group-login_node_aarch64.yaml.j2 index 55506d7d1d..956fdd9c45 100644 --- a/provision/roles/configure_ochami/templates/cloud_init/ci-group-login_node_aarch64.yaml.j2 +++ b/provision/roles/configure_ochami/templates/cloud_init/ci-group-login_node_aarch64.yaml.j2 @@ -195,16 +195,13 @@ - /usr/local/bin/setup_iscsi_storage_{{ pv_entry.name }}.sh {% endfor %} # VAST storage: create subdirectory structure for login node - - mkdir -pv {{ vast_mount_point }}/apps {{ vast_mount_point }}/home {{ vast_mount_point }}/projects - - mkdir -pv /apps /home /projects + - mkdir -pv {{ vast_mount_point }}/apps {{ vast_mount_point }}/scratch {{ vast_mount_point }}/projects + - mkdir -pv {{ vast_mount_point }}/scratch/$(hostname -s)/tmp + - mkdir -pv /apps /scratch /projects - echo "{{ vast_mount_point }}/apps /apps none bind 0 0" >> /etc/fstab - - echo "{{ vast_mount_point }}/home /home none bind 0 0" >> /etc/fstab - - echo "{{ vast_mount_point }}/projects /projects none bind 0 0" >> /etc/fstab - - mount -av - # VAST storage: scratch directory for login node - - mkdir -pv {{ vast_mount_point }}/scratch - - mkdir -pv /scratch - echo "{{ vast_mount_point }}/scratch /scratch none bind 0 0" >> /etc/fstab + - echo "{{ vast_mount_point }}/scratch/$(hostname -s)/tmp /tmp none bind 0 0" >> /etc/fstab + - echo "{{ vast_mount_point }}/projects /projects none bind 0 0" >> /etc/fstab - mount -av - chmod 1777 /scratch # Ensure Slurm NFS root is mounted at client_mount_path (e.g. /share_omnia) diff --git a/provision/roles/configure_ochami/templates/cloud_init/ci-group-login_node_x86_64.yaml.j2 b/provision/roles/configure_ochami/templates/cloud_init/ci-group-login_node_x86_64.yaml.j2 index f5d5d8a64e..57d35d6fd9 100644 --- a/provision/roles/configure_ochami/templates/cloud_init/ci-group-login_node_x86_64.yaml.j2 +++ b/provision/roles/configure_ochami/templates/cloud_init/ci-group-login_node_x86_64.yaml.j2 @@ -194,16 +194,13 @@ - bash /usr/local/bin/setup_iscsi_storage_{{ pv_entry.name }}.sh {% endfor %} # VAST storage: create subdirectory structure for login node - - mkdir -pv {{ vast_mount_point }}/apps {{ vast_mount_point }}/home {{ vast_mount_point }}/projects - - mkdir -pv /apps /home /projects + - mkdir -pv {{ vast_mount_point }}/apps {{ vast_mount_point }}/scratch {{ vast_mount_point }}/projects + - mkdir -pv {{ vast_mount_point }}/scratch/$(hostname -s)/tmp + - mkdir -pv /apps /scratch /projects - echo "{{ vast_mount_point }}/apps /apps none bind 0 0" >> /etc/fstab - - echo "{{ vast_mount_point }}/home /home none bind 0 0" >> /etc/fstab - - echo "{{ vast_mount_point }}/projects /projects none bind 0 0" >> /etc/fstab - - mount -av - # VAST storage: scratch directory for login node - - mkdir -pv {{ vast_mount_point }}/scratch - - mkdir -pv /scratch - echo "{{ vast_mount_point }}/scratch /scratch none bind 0 0" >> /etc/fstab + - echo "{{ vast_mount_point }}/scratch/$(hostname -s)/tmp /tmp none bind 0 0" >> /etc/fstab + - echo "{{ vast_mount_point }}/projects /projects none bind 0 0" >> /etc/fstab - mount -av - chmod 1777 /scratch # Additional Slurm login node mounts (excluding cert which was mounted earlier) @@ -289,9 +286,10 @@ - /usr/local/bin/update_ldap_conf.sh - mkdir /ldapcerts - echo "{{ cloud_init_nfs_path_openldap }}/certs /ldapcerts nfs defaults,_netdev 0 0" >> /etc/fstab - - if ! mountpoint -q /home; then echo "{{ cloud_init_nfs_path_openldap }}/ldapuser /home nfs defaults,_netdev 0 0" >> /etc/fstab; fi + - mkdir -pv {{ vast_mount_point }}/{{ openldap_dir_name }}/ldapuser /home + - echo "{{ vast_mount_point }}/{{ openldap_dir_name }}/ldapuser /home none bind 0 0" >> /etc/fstab - chmod {{ file_mode }} /etc/fstab - - mount -a + - mount -av - yes | cp /ldapcerts/* /etc/openldap/certs - umount /ldapcerts diff --git a/provision/roles/configure_ochami/templates/cloud_init/ci-group-slurm_control_node_x86_64.yaml.j2 b/provision/roles/configure_ochami/templates/cloud_init/ci-group-slurm_control_node_x86_64.yaml.j2 index bcb7d6a67b..3face481e1 100644 --- a/provision/roles/configure_ochami/templates/cloud_init/ci-group-slurm_control_node_x86_64.yaml.j2 +++ b/provision/roles/configure_ochami/templates/cloud_init/ci-group-slurm_control_node_x86_64.yaml.j2 @@ -123,11 +123,6 @@ {{ ip_name_map[key] }} {{ key }} {% endfor %} {% endif %} - - path: /etc/profile.d/create_scratch.sh - owner: root:root - permissions: '{{ file_mode_755 }}' - content: | - {{ lookup('template', 'templates/slurm/create_scratch.sh.j2') | indent(12) }} - path: /root/init_slurm_db.sql permissions: '{{ file_mode_600 }}' @@ -378,7 +373,8 @@ - /usr/local/bin/update_ldap_conf.sh - mkdir /ldapcerts - echo "{{ cloud_init_nfs_path_openldap }}/certs /ldapcerts nfs defaults,_netdev 0 0" >> /etc/fstab - - if ! mountpoint -q /home; then echo "{{ cloud_init_nfs_path_openldap }}/ldapuser /home nfs defaults,_netdev 0 0" >> /etc/fstab; fi + # TODO: This mount may be redundant, remove this + - echo "{{ cloud_init_nfs_path_openldap }}/ldapuser /home nfs defaults,_netdev 0 0" >> /etc/fstab - chmod {{ file_mode }} /etc/fstab - mount -a - yes | cp /ldapcerts/* /etc/openldap/certs diff --git a/provision/roles/configure_ochami/templates/cloud_init/ci-group-slurm_node_aarch64.yaml.j2 b/provision/roles/configure_ochami/templates/cloud_init/ci-group-slurm_node_aarch64.yaml.j2 index 9ba8734762..eaebe1c757 100644 --- a/provision/roles/configure_ochami/templates/cloud_init/ci-group-slurm_node_aarch64.yaml.j2 +++ b/provision/roles/configure_ochami/templates/cloud_init/ci-group-slurm_node_aarch64.yaml.j2 @@ -445,11 +445,10 @@ - bash /usr/local/bin/setup_iscsi_storage_{{ pv_entry.name }}.sh {% endfor %} # VAST storage: create subdirectory structure for compute node - - mkdir -pv {{ vast_mount_point }}/apps {{ vast_mount_point }}/home {{ vast_mount_point }}/scratch {{ vast_mount_point }}/projects + - mkdir -pv {{ vast_mount_point }}/apps {{ vast_mount_point }}/scratch {{ vast_mount_point }}/projects - mkdir -pv {{ vast_mount_point }}/scratch/$(hostname -s)/tmp - - mkdir -pv /apps /home /scratch /projects + - mkdir -pv /apps /scratch /projects - echo "{{ vast_mount_point }}/apps /apps none bind 0 0" >> /etc/fstab - - echo "{{ vast_mount_point }}/home /home none bind 0 0" >> /etc/fstab - echo "{{ vast_mount_point }}/scratch /scratch none bind 0 0" >> /etc/fstab - echo "{{ vast_mount_point }}/scratch/$(hostname -s)/tmp /tmp none bind 0 0" >> /etc/fstab - echo "{{ vast_mount_point }}/projects /projects none bind 0 0" >> /etc/fstab @@ -479,9 +478,10 @@ - /usr/local/bin/update_ldap_conf.sh - mkdir /ldapcerts - echo "{{ cloud_init_nfs_path_openldap }}/certs /ldapcerts nfs defaults,_netdev 0 0" >> /etc/fstab - - if ! mountpoint -q /home; then echo "{{ cloud_init_nfs_path_openldap }}/ldapuser /home nfs defaults,_netdev 0 0" >> /etc/fstab; fi + - mkdir -pv {{ vast_mount_point }}/{{ openldap_dir_name }}/ldapuser /home + - echo "{{ vast_mount_point }}/{{ openldap_dir_name }}/ldapuser /home none bind 0 0" >> /etc/fstab - chmod {{ file_mode }} /etc/fstab - - mount -a + - mount -av - yes | cp /ldapcerts/* /etc/openldap/certs - umount /ldapcerts diff --git a/provision/roles/configure_ochami/templates/cloud_init/ci-group-slurm_node_x86_64.yaml.j2 b/provision/roles/configure_ochami/templates/cloud_init/ci-group-slurm_node_x86_64.yaml.j2 index 66870b4af1..f19c50ebc6 100644 --- a/provision/roles/configure_ochami/templates/cloud_init/ci-group-slurm_node_x86_64.yaml.j2 +++ b/provision/roles/configure_ochami/templates/cloud_init/ci-group-slurm_node_x86_64.yaml.j2 @@ -419,8 +419,8 @@ - cp /cert/pulp_webserver.crt /etc/pki/ca-trust/source/anchors && update-ca-trust - sed -i 's/^gpgcheck=1/gpgcheck=0/' /etc/dnf/dnf.conf # DOCA and IB configuration - now ready before vendor_data mounts - - bash /usr/local/bin/doca-install.sh || true - - bash /usr/local/bin/configure-ib-network.sh + - bash /usr/local/bin/doca-install.sh || echo "DOCA install failed (non-critical)" + - bash /usr/local/bin/configure-ib-network.sh || echo "IB network configuration failed (non-critical)" {# Mount-specific runcmd entries - moved after DOCA to ensure RDMA is available #} {%- if cloud_init_groups_dict[functional_group_name].runcmd is defined %} {% for cmd in cloud_init_groups_dict[functional_group_name].runcmd %} @@ -451,29 +451,27 @@ - bash /usr/local/bin/setup_iscsi_storage_{{ pv_entry.name }}.sh {% endfor %} # VAST storage: create subdirectory structure for compute node - - mkdir -pv {{ vast_mount_point }}/apps {{ vast_mount_point }}/home {{ vast_mount_point }}/scratch {{ vast_mount_point }}/projects + - mkdir -pv {{ vast_mount_point }}/apps {{ vast_mount_point }}/scratch {{ vast_mount_point }}/projects - mkdir -pv {{ vast_mount_point }}/scratch/$(hostname -s)/tmp - - mkdir -pv /apps /home /scratch /projects + - mkdir -pv /apps /scratch /projects - echo "{{ vast_mount_point }}/apps /apps none bind 0 0" >> /etc/fstab - - echo "{{ vast_mount_point }}/home /home none bind 0 0" >> /etc/fstab - echo "{{ vast_mount_point }}/scratch /scratch none bind 0 0" >> /etc/fstab - echo "{{ vast_mount_point }}/scratch/$(hostname -s)/tmp /tmp none bind 0 0" >> /etc/fstab - echo "{{ vast_mount_point }}/projects /projects none bind 0 0" >> /etc/fstab - mount -av - chmod 1777 /tmp /scratch - - /usr/local/bin/install_nvidia_driver.sh + # GPU setup with timeout protection - non-critical operations + - timeout 300 /usr/local/bin/install_nvidia_driver.sh || echo "NVIDIA driver install failed or timed out (non-critical)" {% if dcgm_support %} - - /usr/local/bin/setup_dcgm.sh + - timeout 300 /usr/local/bin/setup_dcgm.sh || echo "DCGM setup failed or timed out (non-critical)" {% endif %} {% if slurm_node_present %} - - | - set -e - /usr/local/bin/slurm_cuda_coordinator.sh - /usr/local/bin/install_cuda_driver.sh + - /usr/local/bin/slurm_cuda_coordinator.sh || echo "CUDA coordinator setup failed (non-critical)" + - timeout 300 /usr/local/bin/install_cuda_driver.sh || echo "CUDA driver install failed or timed out (non-critical)" {% if dcgm_support %} - /usr/local/bin/install_dcgm.sh + - timeout 300 /usr/local/bin/install_dcgm.sh || echo "DCGM install failed or timed out (non-critical)" {% endif %} - /usr/local/bin/install_nvidia_peermem.sh + - timeout 600 /usr/local/bin/install_nvidia_peermem.sh || echo "NVIDIA peermem install failed or timed out (non-critical)" {% endif %} - /usr/local/bin/configure_slurmd_setup.sh @@ -482,17 +480,18 @@ - /usr/local/bin/configure_firewall_and_services.sh {% if hostvars['localhost']['openldap_support'] %} - /usr/local/bin/update_ldap_conf.sh - - mkdir /ldapcerts + - mkdir -p /ldapcerts || echo "LDAP cert directory already exists or creation failed (non-critical)" - echo "{{ cloud_init_nfs_path_openldap }}/certs /ldapcerts nfs defaults,_netdev 0 0" >> /etc/fstab - - if ! mountpoint -q /home; then echo "{{ cloud_init_nfs_path_openldap }}/ldapuser /home nfs defaults,_netdev 0 0" >> /etc/fstab; fi + - mkdir -pv {{ vast_mount_point }}/{{ openldap_dir_name }}/ldapuser /home + - echo "{{ vast_mount_point }}/{{ openldap_dir_name }}/ldapuser /home none bind 0 0" >> /etc/fstab - chmod {{ file_mode }} /etc/fstab - mount -av - - yes | cp /ldapcerts/* /etc/openldap/certs - - umount /ldapcerts - - firewall-cmd --permanent --add-port={{ ldap_starttls_port }}/tcp - - firewall-cmd --permanent --add-port={{ ldap_ssl_port }}/tcp - - firewall-cmd --reload - - setenforce 0 + - cp -f /ldapcerts/* /etc/openldap/certs/ || echo "LDAP cert copy failed (non-critical)" + - umount /ldapcerts || echo "LDAP cert unmount failed (non-critical)" + - firewall-cmd --permanent --add-port={{ ldap_starttls_port }}/tcp || echo "Firewall LDAP port configuration failed (non-critical)" + - firewall-cmd --permanent --add-port={{ ldap_ssl_port }}/tcp || echo "Firewall LDAP SSL port configuration failed (non-critical)" + - firewall-cmd --reload || echo "Firewall reload failed (non-critical)" + - setenforce 0 || echo "SELinux disable failed (may already be disabled)" - authselect select sssd with-mkhomedir --force - sudo systemctl enable --now oddjobd.service - sudo systemctl enable --now sssd @@ -510,15 +509,15 @@ {% endif %} {% if hostvars['localhost']['ucx_support'] or hostvars['localhost']['openmpi_support'] %} - echo "One or more shared components (UCX / OpenMPI / LDMS) are enabled." - - /usr/local/bin/configure_ucx_openmpi_env.sh + - /usr/local/bin/configure_ucx_openmpi_env.sh || echo "UCX/OpenMPI environment setup failed (non-critical)" {% endif %} {% if ldms_support %} - echo " Starting LDMS setup " | tee -a /var/log/ldms-cloudinit.log - - /root/ldms_sampler.sh + - /root/ldms_sampler.sh || echo "LDMS setup failed (non-critical)" {% endif %} - - /usr/local/bin/setup_nvhpc_sdk.sh - - /usr/local/bin/export_nvhpc_env.sh + - /usr/local/bin/setup_nvhpc_sdk.sh || echo "NVHPC SDK setup failed (non-critical)" + - /usr/local/bin/export_nvhpc_env.sh || echo "NVHPC environment export failed (non-critical)" - systemctl restart slurmd - echo "Cloud-Init has completed successfully." diff --git a/provision/roles/slurm_config/vars/main.yml b/provision/roles/slurm_config/vars/main.yml index fbd5596139..02b2d9e231 100644 --- a/provision/roles/slurm_config/vars/main.yml +++ b/provision/roles/slurm_config/vars/main.yml @@ -127,7 +127,7 @@ partition_params: State: "UP" Default: "YES" busy_nodes: {} -openldap_dir_name: "openldap/" +openldap_dir_name: "openldap" software_config_file: "{{ input_project_dir }}/software_config.json" omnia_run_tags: "{{ hostvars['localhost']['omnia_run_tags'] }}" auth_tls_certs_path: "/opt/omnia/auth/tls_certs/ldapserver.crt" diff --git a/utils/set_pxe_boot.yml b/utils/set_pxe_boot.yml index 406cffba28..fba614a5da 100644 --- a/utils/set_pxe_boot.yml +++ b/utils/set_pxe_boot.yml @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. ---- +--- # ───────────────────────────────────────────────────────────────────────── # Play 1: Validate and setup BMC inventory from CSV # ─────────────────────────────────────────────────────────────────────────