From 0ab29eb66f49da2431dd56b017bd787f787a93bf Mon Sep 17 00:00:00 2001 From: Jon Cope Date: Tue, 15 Jul 2025 11:18:38 -0500 Subject: [PATCH 1/4] update lvms-o to version 4.19.0-49 Signed-off-by: Jon Cope --- assets/release/release-aarch64.json | 2 +- assets/release/release-x86_64.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 3faeabe4a..b7029c310 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -10,7 +10,7 @@ "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8123533d36736a1d3f6b11e060c6a557f8d6995416fc4c86918b8c2ac817cb72", "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e7c93974ccc75b84c699b7f1ead135226bfe0689689d3f0d1d7d621ed5b5a7ab", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:178838fc3cfd7299d32082e423681f9a0bc2ba28a011de52c6e718ead2bc7634", - "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:0689e27defe411a07da33e339ec65df67e09a3a7080b8e5494fae5cb1a35db36", + "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:c857ffade720d157c11ad75e7d262a51966c169f7b0d519c82ffa12a4296db42", "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:291ed630d7551a39b3a720049400bcb8d0d8b3cf0f1a9bfe27358d3f6fe826c5" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 7f6c43f37..6f1f49fc1 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -10,7 +10,7 @@ "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d9b7e6bbdccc7edaa6682491bdb3e172cc2f7e484920ae690cf60f4b851285de", "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d6a7df177c6efee91051d9b09f600751b7685855f1791be9a08f777921daaa9d", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6e248968976bedbfb4f83d98241d8c97b14ee01261e1018c9aba3c7c68a4219", - "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:b372811ed8263f80c0903a63e9fd9d05d4dbf2b4d7adcb32304108124841e5bc", + "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:539e8b8e01e0333b79ee8a449716dc3e7a259beba9cc3025fc27777982cd9c19", "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2106c18d27a2638dd74d491f0fcfbdd65cf75a1fda337f34e30347f792a2bdb0" } } From 58c582e37151063a4765f9f91bc2223e77a77b25 Mon Sep 17 00:00:00 2001 From: copejon Date: Thu, 4 Sep 2025 14:28:51 +0000 Subject: [PATCH 2/4] update last_lvms_rebase.sh --- scripts/auto-rebase/last_lvms_rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto-rebase/last_lvms_rebase.sh b/scripts/auto-rebase/last_lvms_rebase.sh index ce678f398..5afb44b82 100755 --- a/scripts/auto-rebase/last_lvms_rebase.sh +++ b/scripts/auto-rebase/last_lvms_rebase.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase-lvms.sh to "registry.redhat.io/lvms4/lvms-operator-bundle:v4.18.2-2" +./scripts/auto-rebase/rebase-lvms.sh to "registry.redhat.io/lvms4/lvms-operator-bundle:v4.19.1" From 1934269da9f3eda4385fb275f0f87518287cda68 Mon Sep 17 00:00:00 2001 From: copejon Date: Thu, 4 Sep 2025 14:28:52 +0000 Subject: [PATCH 3/4] update rebase_job_entrypoint.sh --- scripts/auto-rebase/rebase_job_entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto-rebase/rebase_job_entrypoint.sh b/scripts/auto-rebase/rebase_job_entrypoint.sh index 2f61903c1..ba922adb5 100755 --- a/scripts/auto-rebase/rebase_job_entrypoint.sh +++ b/scripts/auto-rebase/rebase_job_entrypoint.sh @@ -111,7 +111,7 @@ RHOAI_RELEASE=${rhoai_release} \ # For example, ocp-release at 4.13 will more often than not # correspond to 4.12 LVMS, until the official 4.13 release when both # components will be 4.13. -release_lvms="v4.17.0-43" +release_lvms="v4.19.1" # Since LVMS is not part of the release payload, it is not kept in # CI. Use the latest z-stream that coincides with the release From 430f1cbb35fd20fa03a2f4f2c59f4794db64c421 Mon Sep 17 00:00:00 2001 From: copejon Date: Thu, 4 Sep 2025 14:28:56 +0000 Subject: [PATCH 4/4] update LVMS manifests --- .../lvms/lvm.topolvm.io_lvmclusters.yaml | 2 +- ...topolvm.io_lvmvolumegroupnodestatuses.yaml | 2 +- .../lvms/lvm.topolvm.io_lvmvolumegroups.yaml | 2 +- .../lvms-operator_apps_v1_deployment.yaml | 3 +++ ...c.authorization.k8s.io_v1_clusterrole.yaml | 19 +++++++++++++++++++ .../lvms/topolvm-configmap_lvms-version.yaml | 2 +- assets/release/release-aarch64.json | 2 +- assets/release/release-x86_64.json | 2 +- 8 files changed, 28 insertions(+), 6 deletions(-) diff --git a/assets/components/lvms/lvm.topolvm.io_lvmclusters.yaml b/assets/components/lvms/lvm.topolvm.io_lvmclusters.yaml index 3060746e8..bb641144a 100644 --- a/assets/components/lvms/lvm.topolvm.io_lvmclusters.yaml +++ b/assets/components/lvms/lvm.topolvm.io_lvmclusters.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.17.3 creationTimestamp: null name: lvmclusters.lvm.topolvm.io spec: diff --git a/assets/components/lvms/lvm.topolvm.io_lvmvolumegroupnodestatuses.yaml b/assets/components/lvms/lvm.topolvm.io_lvmvolumegroupnodestatuses.yaml index e6321b0fb..a5ca0ada5 100644 --- a/assets/components/lvms/lvm.topolvm.io_lvmvolumegroupnodestatuses.yaml +++ b/assets/components/lvms/lvm.topolvm.io_lvmvolumegroupnodestatuses.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.17.3 creationTimestamp: null name: lvmvolumegroupnodestatuses.lvm.topolvm.io spec: diff --git a/assets/components/lvms/lvm.topolvm.io_lvmvolumegroups.yaml b/assets/components/lvms/lvm.topolvm.io_lvmvolumegroups.yaml index 212161a0d..336e5e70f 100644 --- a/assets/components/lvms/lvm.topolvm.io_lvmvolumegroups.yaml +++ b/assets/components/lvms/lvm.topolvm.io_lvmvolumegroups.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.17.3 creationTimestamp: null name: lvmvolumegroups.lvm.topolvm.io spec: diff --git a/assets/components/lvms/lvms-operator_apps_v1_deployment.yaml b/assets/components/lvms/lvms-operator_apps_v1_deployment.yaml index c50a1b9ee..a4a912e29 100644 --- a/assets/components/lvms/lvms-operator_apps_v1_deployment.yaml +++ b/assets/components/lvms/lvms-operator_apps_v1_deployment.yaml @@ -66,6 +66,9 @@ spec: memory: 50Mi securityContext: allowPrivilegeEscalation: false + capabilities: + drop: + - NET_RAW terminationMessagePolicy: FallbackToLogsOnError volumeMounts: - mountPath: /tmp/k8s-webhook-server/serving-certs diff --git a/assets/components/lvms/lvms-operator_rbac.authorization.k8s.io_v1_clusterrole.yaml b/assets/components/lvms/lvms-operator_rbac.authorization.k8s.io_v1_clusterrole.yaml index f64d596d0..7a3fac454 100644 --- a/assets/components/lvms/lvms-operator_rbac.authorization.k8s.io_v1_clusterrole.yaml +++ b/assets/components/lvms/lvms-operator_rbac.authorization.k8s.io_v1_clusterrole.yaml @@ -65,6 +65,13 @@ rules: - get - list - watch + - apiGroups: + - apiextensions.k8s.io + resources: + - customresourcedefinitions + verbs: + - get + - list - apiGroups: - apps resources: @@ -134,6 +141,18 @@ rules: - get - patch - update + - apiGroups: + - monitoring.coreos.com + resources: + - servicemonitors + verbs: + - create + - delete + - get + - list + - patch + - update + - watch - apiGroups: - security.openshift.io resources: diff --git a/assets/components/lvms/topolvm-configmap_lvms-version.yaml b/assets/components/lvms/topolvm-configmap_lvms-version.yaml index 340e1a74c..5744950c9 100644 --- a/assets/components/lvms/topolvm-configmap_lvms-version.yaml +++ b/assets/components/lvms/topolvm-configmap_lvms-version.yaml @@ -4,4 +4,4 @@ metadata: name: lvms-version namespace: kube-public data: - version: v4.18.2-2 + version: v4.19.1 diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index b7029c310..4e24bda9b 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -10,7 +10,7 @@ "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8123533d36736a1d3f6b11e060c6a557f8d6995416fc4c86918b8c2ac817cb72", "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e7c93974ccc75b84c699b7f1ead135226bfe0689689d3f0d1d7d621ed5b5a7ab", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:178838fc3cfd7299d32082e423681f9a0bc2ba28a011de52c6e718ead2bc7634", - "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:c857ffade720d157c11ad75e7d262a51966c169f7b0d519c82ffa12a4296db42", + "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:3766640b19c336b443619ecdb35f36b479c79ea71b21de97febf024a5eaf6c84", "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:291ed630d7551a39b3a720049400bcb8d0d8b3cf0f1a9bfe27358d3f6fe826c5" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 6f1f49fc1..5f61fc1c2 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -10,7 +10,7 @@ "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d9b7e6bbdccc7edaa6682491bdb3e172cc2f7e484920ae690cf60f4b851285de", "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d6a7df177c6efee91051d9b09f600751b7685855f1791be9a08f777921daaa9d", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6e248968976bedbfb4f83d98241d8c97b14ee01261e1018c9aba3c7c68a4219", - "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:539e8b8e01e0333b79ee8a449716dc3e7a259beba9cc3025fc27777982cd9c19", + "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:58804d8baf922927b66cec9424d431a3bdb341d207024ce40cc8f0123bac03ee", "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2106c18d27a2638dd74d491f0fcfbdd65cf75a1fda337f34e30347f792a2bdb0" } }