From 7ea9e2e3a54821a5003590698d2d47b014057664 Mon Sep 17 00:00:00 2001 From: Eric Vaandering Date: Tue, 31 Dec 2024 11:29:18 -0600 Subject: [PATCH 1/5] Remove patches from image --- docker/rucio-server/Dockerfile | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/docker/rucio-server/Dockerfile b/docker/rucio-server/Dockerfile index 490cacf..4472925 100644 --- a/docker/rucio-server/Dockerfile +++ b/docker/rucio-server/Dockerfile @@ -23,16 +23,9 @@ ADD docker/rucio-server/cms-entrypoint.sh / ADD docker/rucio-server/install_mail_templates.sh /tmp/ RUN /tmp/install_mail_templates.sh -# Cannot make patch directory unless there are patches -RUN mkdir -p /patch - -# Patch for dst_file_report: Remove when https://github.com/rucio/rucio/pull/7081 is available -ADD https://patch-diff.githubusercontent.com/raw/dynamic-entropy/rucio/pull/1.patch /patch/1.patch - -# Patch for directory scoped token support -ADD https://patch-diff.githubusercontent.com/raw/dynamic-entropy/rucio/pull/4.patch /patch/token.patch - -# Patch for deep flag -ADD https://patch-diff.githubusercontent.com/raw/rucio/rucio/pull/7170.diff /patch/7170.patch +# Patches are now included via flux secrets. Please see: +# https://github.com/dmwm/rucio-flux/blob/main/apps/base/patches/kustomization.yaml (and that directory) +# https://github.com/dmwm/rucio-flux/blob/main/apps/base/rucio-daemons/cms-rucio-daemons.yaml +# And prod/int-rucio-daemons.yaml ENTRYPOINT ["/cms-entrypoint.sh"] From 5be8c29db2051b91edaa98392a93b7cbfc3ec50e Mon Sep 17 00:00:00 2001 From: Eric Vaandering Date: Tue, 31 Dec 2024 11:49:42 -0600 Subject: [PATCH 2/5] Remove patches only from daemons --- docker/rucio-daemons/Dockerfile | 15 ++++----------- docker/rucio-server/Dockerfile | 15 +++++++++++---- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/docker/rucio-daemons/Dockerfile b/docker/rucio-daemons/Dockerfile index 96d6e67..0b25982 100644 --- a/docker/rucio-daemons/Dockerfile +++ b/docker/rucio-daemons/Dockerfile @@ -26,16 +26,9 @@ RUN rmdir /etc/grid-security/certificates && ln -s /cvmfs/grid.cern.ch/etc/grid- ADD docker/rucio-daemons/cms-entrypoint.sh / -# Cannot make patch directory unless there are patches -RUN mkdir -p /patch - -# Patch for dst_file_report: Remove when https://github.com/rucio/rucio/pull/7081 is available -ADD https://patch-diff.githubusercontent.com/raw/dynamic-entropy/rucio/pull/1.patch /patch/1.patch - -# Patch for directory scoped token support -ADD https://patch-diff.githubusercontent.com/raw/dynamic-entropy/rucio/pull/4.patch /patch/token.patch - -# Patch for deep flag -ADD https://patch-diff.githubusercontent.com/raw/rucio/rucio/pull/7170.diff /patch/7170.patch +# Patches are now included via flux secrets. Please see: +# https://github.com/dmwm/rucio-flux/blob/main/apps/base/patches/kustomization.yaml (and that directory) +# https://github.com/dmwm/rucio-flux/blob/main/apps/base/rucio-daemons/cms-rucio-daemons.yaml +# And prod/int-rucio-daemons.yaml ENTRYPOINT ["/cms-entrypoint.sh"] diff --git a/docker/rucio-server/Dockerfile b/docker/rucio-server/Dockerfile index 4472925..490cacf 100644 --- a/docker/rucio-server/Dockerfile +++ b/docker/rucio-server/Dockerfile @@ -23,9 +23,16 @@ ADD docker/rucio-server/cms-entrypoint.sh / ADD docker/rucio-server/install_mail_templates.sh /tmp/ RUN /tmp/install_mail_templates.sh -# Patches are now included via flux secrets. Please see: -# https://github.com/dmwm/rucio-flux/blob/main/apps/base/patches/kustomization.yaml (and that directory) -# https://github.com/dmwm/rucio-flux/blob/main/apps/base/rucio-daemons/cms-rucio-daemons.yaml -# And prod/int-rucio-daemons.yaml +# Cannot make patch directory unless there are patches +RUN mkdir -p /patch + +# Patch for dst_file_report: Remove when https://github.com/rucio/rucio/pull/7081 is available +ADD https://patch-diff.githubusercontent.com/raw/dynamic-entropy/rucio/pull/1.patch /patch/1.patch + +# Patch for directory scoped token support +ADD https://patch-diff.githubusercontent.com/raw/dynamic-entropy/rucio/pull/4.patch /patch/token.patch + +# Patch for deep flag +ADD https://patch-diff.githubusercontent.com/raw/rucio/rucio/pull/7170.diff /patch/7170.patch ENTRYPOINT ["/cms-entrypoint.sh"] From 79877962ed3b874b721181d82f3425d6786376b8 Mon Sep 17 00:00:00 2001 From: Eric Vaandering Date: Tue, 31 Dec 2024 11:58:13 -0600 Subject: [PATCH 3/5] Patch server from secrets --- docker/rucio-server/Dockerfile | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/docker/rucio-server/Dockerfile b/docker/rucio-server/Dockerfile index 490cacf..050ec6b 100644 --- a/docker/rucio-server/Dockerfile +++ b/docker/rucio-server/Dockerfile @@ -23,16 +23,9 @@ ADD docker/rucio-server/cms-entrypoint.sh / ADD docker/rucio-server/install_mail_templates.sh /tmp/ RUN /tmp/install_mail_templates.sh -# Cannot make patch directory unless there are patches -RUN mkdir -p /patch - -# Patch for dst_file_report: Remove when https://github.com/rucio/rucio/pull/7081 is available -ADD https://patch-diff.githubusercontent.com/raw/dynamic-entropy/rucio/pull/1.patch /patch/1.patch - -# Patch for directory scoped token support -ADD https://patch-diff.githubusercontent.com/raw/dynamic-entropy/rucio/pull/4.patch /patch/token.patch - -# Patch for deep flag -ADD https://patch-diff.githubusercontent.com/raw/rucio/rucio/pull/7170.diff /patch/7170.patch +# Patches are now included via flux secrets. Please see: +# https://github.com/dmwm/rucio-flux/blob/main/apps/base/patches/kustomization.yaml (and that directory) +# https://github.com/dmwm/rucio-flux/blob/main/apps/base/rucio-server/cms-rucio-server.yaml +# And prod/int-rucio-server.yaml ENTRYPOINT ["/cms-entrypoint.sh"] From a1946900adf701cf924491ffbe55fe4a6e503841 Mon Sep 17 00:00:00 2001 From: Eric Vaandering Date: Fri, 10 Jan 2025 09:23:45 -0600 Subject: [PATCH 4/5] New format for supported releases --- src/policy/CMSRucioPolicy/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/policy/CMSRucioPolicy/__init__.py b/src/policy/CMSRucioPolicy/__init__.py index 31cc983..42bc2e6 100644 --- a/src/policy/CMSRucioPolicy/__init__.py +++ b/src/policy/CMSRucioPolicy/__init__.py @@ -4,7 +4,7 @@ from CMSRucioPolicy.algorithms import lfn2pfn, auto_approve, pfn2lfn -SUPPORTED_VERSION = ["32", "33", "34", "35"] +SUPPORTED_VERSION = ["~=35", "~=36"] def get_algorithms(): From a039e55ed1cd096dd02d520b7b951f0688b04087 Mon Sep 17 00:00:00 2001 From: Eric Vaandering Date: Fri, 10 Jan 2025 09:32:32 -0600 Subject: [PATCH 5/5] New format done right --- src/policy/CMSRucioPolicy/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/policy/CMSRucioPolicy/__init__.py b/src/policy/CMSRucioPolicy/__init__.py index 42bc2e6..b471f01 100644 --- a/src/policy/CMSRucioPolicy/__init__.py +++ b/src/policy/CMSRucioPolicy/__init__.py @@ -4,7 +4,7 @@ from CMSRucioPolicy.algorithms import lfn2pfn, auto_approve, pfn2lfn -SUPPORTED_VERSION = ["~=35", "~=36"] +SUPPORTED_VERSION = [">= 36.0"] def get_algorithms():