From 05a6d97b6939679d61c1aea519008db9459e544d Mon Sep 17 00:00:00 2001 From: Hugo Gonzalez Labrador Date: Wed, 17 Apr 2024 17:46:04 +0200 Subject: [PATCH 1/3] rucio-daemons: follow helm best practices for template names --- .../templates/{abacus.yaml => abacus-deployment.yaml} | 0 .../templates/{automatix.yaml => automatix-deployment.yaml} | 0 .../{cache-consumer.yaml => cache-consumer-deployment.yaml} | 0 .../templates/{conveyor.yaml => conveyor-deployment.yaml} | 0 .../templates/{dark-reaper.yaml => dark-reaper-deployment.yaml} | 0 .../templates/{hermes.yaml => hermes-deployment.yaml} | 0 .../{hermes-legacy.yaml => hermes-legacy-deployment.yaml} | 0 .../rucio-daemons/templates/{judge.yaml => judge-deployment.yaml} | 0 .../rucio-daemons/templates/{minos.yaml => minos-deployment.yaml} | 0 .../templates/{necromancer.yaml => necromancer-deployment.yaml} | 0 .../{oauth-manager.yaml => oauth-manager-deployment.yaml} | 0 .../templates/{reaper.yaml => reaper-deployment.yaml} | 0 .../{replica-recoverer.yaml => replica-recoverer-deployment.yaml} | 0 .../{tracer-kronos.yaml => tracer-kronos-deployment.yaml} | 0 .../{transmogrifier.yaml => transmogrifier-deployment.yaml} | 0 .../templates/{undertaker.yaml => undertaker-deployment.yaml} | 0 16 files changed, 0 insertions(+), 0 deletions(-) rename charts/rucio-daemons/templates/{abacus.yaml => abacus-deployment.yaml} (100%) rename charts/rucio-daemons/templates/{automatix.yaml => automatix-deployment.yaml} (100%) rename charts/rucio-daemons/templates/{cache-consumer.yaml => cache-consumer-deployment.yaml} (100%) rename charts/rucio-daemons/templates/{conveyor.yaml => conveyor-deployment.yaml} (100%) rename charts/rucio-daemons/templates/{dark-reaper.yaml => dark-reaper-deployment.yaml} (100%) rename charts/rucio-daemons/templates/{hermes.yaml => hermes-deployment.yaml} (100%) rename charts/rucio-daemons/templates/{hermes-legacy.yaml => hermes-legacy-deployment.yaml} (100%) rename charts/rucio-daemons/templates/{judge.yaml => judge-deployment.yaml} (100%) rename charts/rucio-daemons/templates/{minos.yaml => minos-deployment.yaml} (100%) rename charts/rucio-daemons/templates/{necromancer.yaml => necromancer-deployment.yaml} (100%) rename charts/rucio-daemons/templates/{oauth-manager.yaml => oauth-manager-deployment.yaml} (100%) rename charts/rucio-daemons/templates/{reaper.yaml => reaper-deployment.yaml} (100%) rename charts/rucio-daemons/templates/{replica-recoverer.yaml => replica-recoverer-deployment.yaml} (100%) rename charts/rucio-daemons/templates/{tracer-kronos.yaml => tracer-kronos-deployment.yaml} (100%) rename charts/rucio-daemons/templates/{transmogrifier.yaml => transmogrifier-deployment.yaml} (100%) rename charts/rucio-daemons/templates/{undertaker.yaml => undertaker-deployment.yaml} (100%) diff --git a/charts/rucio-daemons/templates/abacus.yaml b/charts/rucio-daemons/templates/abacus-deployment.yaml similarity index 100% rename from charts/rucio-daemons/templates/abacus.yaml rename to charts/rucio-daemons/templates/abacus-deployment.yaml diff --git a/charts/rucio-daemons/templates/automatix.yaml b/charts/rucio-daemons/templates/automatix-deployment.yaml similarity index 100% rename from charts/rucio-daemons/templates/automatix.yaml rename to charts/rucio-daemons/templates/automatix-deployment.yaml diff --git a/charts/rucio-daemons/templates/cache-consumer.yaml b/charts/rucio-daemons/templates/cache-consumer-deployment.yaml similarity index 100% rename from charts/rucio-daemons/templates/cache-consumer.yaml rename to charts/rucio-daemons/templates/cache-consumer-deployment.yaml diff --git a/charts/rucio-daemons/templates/conveyor.yaml b/charts/rucio-daemons/templates/conveyor-deployment.yaml similarity index 100% rename from charts/rucio-daemons/templates/conveyor.yaml rename to charts/rucio-daemons/templates/conveyor-deployment.yaml diff --git a/charts/rucio-daemons/templates/dark-reaper.yaml b/charts/rucio-daemons/templates/dark-reaper-deployment.yaml similarity index 100% rename from charts/rucio-daemons/templates/dark-reaper.yaml rename to charts/rucio-daemons/templates/dark-reaper-deployment.yaml diff --git a/charts/rucio-daemons/templates/hermes.yaml b/charts/rucio-daemons/templates/hermes-deployment.yaml similarity index 100% rename from charts/rucio-daemons/templates/hermes.yaml rename to charts/rucio-daemons/templates/hermes-deployment.yaml diff --git a/charts/rucio-daemons/templates/hermes-legacy.yaml b/charts/rucio-daemons/templates/hermes-legacy-deployment.yaml similarity index 100% rename from charts/rucio-daemons/templates/hermes-legacy.yaml rename to charts/rucio-daemons/templates/hermes-legacy-deployment.yaml diff --git a/charts/rucio-daemons/templates/judge.yaml b/charts/rucio-daemons/templates/judge-deployment.yaml similarity index 100% rename from charts/rucio-daemons/templates/judge.yaml rename to charts/rucio-daemons/templates/judge-deployment.yaml diff --git a/charts/rucio-daemons/templates/minos.yaml b/charts/rucio-daemons/templates/minos-deployment.yaml similarity index 100% rename from charts/rucio-daemons/templates/minos.yaml rename to charts/rucio-daemons/templates/minos-deployment.yaml diff --git a/charts/rucio-daemons/templates/necromancer.yaml b/charts/rucio-daemons/templates/necromancer-deployment.yaml similarity index 100% rename from charts/rucio-daemons/templates/necromancer.yaml rename to charts/rucio-daemons/templates/necromancer-deployment.yaml diff --git a/charts/rucio-daemons/templates/oauth-manager.yaml b/charts/rucio-daemons/templates/oauth-manager-deployment.yaml similarity index 100% rename from charts/rucio-daemons/templates/oauth-manager.yaml rename to charts/rucio-daemons/templates/oauth-manager-deployment.yaml diff --git a/charts/rucio-daemons/templates/reaper.yaml b/charts/rucio-daemons/templates/reaper-deployment.yaml similarity index 100% rename from charts/rucio-daemons/templates/reaper.yaml rename to charts/rucio-daemons/templates/reaper-deployment.yaml diff --git a/charts/rucio-daemons/templates/replica-recoverer.yaml b/charts/rucio-daemons/templates/replica-recoverer-deployment.yaml similarity index 100% rename from charts/rucio-daemons/templates/replica-recoverer.yaml rename to charts/rucio-daemons/templates/replica-recoverer-deployment.yaml diff --git a/charts/rucio-daemons/templates/tracer-kronos.yaml b/charts/rucio-daemons/templates/tracer-kronos-deployment.yaml similarity index 100% rename from charts/rucio-daemons/templates/tracer-kronos.yaml rename to charts/rucio-daemons/templates/tracer-kronos-deployment.yaml diff --git a/charts/rucio-daemons/templates/transmogrifier.yaml b/charts/rucio-daemons/templates/transmogrifier-deployment.yaml similarity index 100% rename from charts/rucio-daemons/templates/transmogrifier.yaml rename to charts/rucio-daemons/templates/transmogrifier-deployment.yaml diff --git a/charts/rucio-daemons/templates/undertaker.yaml b/charts/rucio-daemons/templates/undertaker-deployment.yaml similarity index 100% rename from charts/rucio-daemons/templates/undertaker.yaml rename to charts/rucio-daemons/templates/undertaker-deployment.yaml From cd15736e25317152953f5494b02d4321b445c9e2 Mon Sep 17 00:00:00 2001 From: Hugo Gonzalez Labrador Date: Wed, 17 Apr 2024 18:03:28 +0200 Subject: [PATCH 2/3] all: avoid using floating tags --- charts/rucio-daemons/values.yaml | 6 +++--- charts/rucio-probes/values.yaml | 2 +- charts/rucio-server/values.yaml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/charts/rucio-daemons/values.yaml b/charts/rucio-daemons/values.yaml index 0c6d2761..440d258a 100644 --- a/charts/rucio-daemons/values.yaml +++ b/charts/rucio-daemons/values.yaml @@ -34,7 +34,7 @@ necromancerCount: 0 image: repository: rucio/rucio-daemons - tag: latest + tag: release-34.2.0 pullPolicy: Always imagePullSecrets: [] @@ -413,7 +413,7 @@ ftsRenewal: schedule: "12 */6 * * *" image: repository: rucio/fts-cron - tag: latest + tag: 34.2.0 pullPolicy: Always servers: "https://fts3-devel.cern.ch:8446,https://cmsfts3.fnal.gov:8446,https://fts3.cern.ch:8446,https://lcgfts3.gridpp.rl.ac.uk:8446,https://fts3-pilot.cern.ch:8446" script: 'default' # one of: 'default', 'atlas', 'dteam', 'multi_vo', 'tutorial', 'escape'. The associated scripts can be found here: https://github.com/rucio/containers/tree/master/fts-cron @@ -456,7 +456,7 @@ automaticRestart: enabled: 0 image: repository: bitnami/kubectl - tag: latest + tag: 1.29.4 pullPolicy: IfNotPresent schedule: "0 0 * * *" selectorLabel: "app-group=rucio-daemons" diff --git a/charts/rucio-probes/values.yaml b/charts/rucio-probes/values.yaml index ad275250..c884fdb5 100644 --- a/charts/rucio-probes/values.yaml +++ b/charts/rucio-probes/values.yaml @@ -6,7 +6,7 @@ replicaCount: 1 image: repository: rucio/probes - tag: latest + tag: 34.2.0 pullPolicy: Always imagePullSecrets: [] diff --git a/charts/rucio-server/values.yaml b/charts/rucio-server/values.yaml index 5be65b68..76a24efd 100644 --- a/charts/rucio-server/values.yaml +++ b/charts/rucio-server/values.yaml @@ -23,7 +23,7 @@ useSSL: false image: repository: rucio/rucio-server - tag: release-1.24.3 + tag: release-34.2.0 pullPolicy: Always imagePullSecrets: [] @@ -109,7 +109,7 @@ ftsRenewal: schedule: "42 */6 * * *" image: repository: rucio/fts-cron - tag: latest + tag: 34.2.0 pullPolicy: Always servers: "https://fts3-devel.cern.ch:8446,https://cmsfts3.fnal.gov:8446,https://fts3.cern.ch:8446,https://lcgfts3.gridpp.rl.ac.uk:8446,https://fts3-pilot.cern.ch:8446" script: 'default' # one of: 'default', 'atlas', 'dteam', 'multi_vo', 'tutorial', 'escape'. The associated scripts can be found here: https://github.com/rucio/containers/tree/master/fts-cron @@ -152,7 +152,7 @@ automaticRestart: enabled: 0 image: repository: bitnami/kubectl - tag: latest + tag: 1.29.4 pullPolicy: IfNotPresent schedule: "0 0 * * *" selectorLabel: "app=rucio-server" From c259a34acbddfeb6a8b468397c549b0dc5669b39 Mon Sep 17 00:00:00 2001 From: Hugo Gonzalez Labrador Date: Thu, 18 Apr 2024 10:54:48 +0200 Subject: [PATCH 3/3] bump versions for components --- charts/rucio-daemons/Chart.yaml | 2 +- charts/rucio-probes/Chart.yaml | 2 +- charts/rucio-server/Chart.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/rucio-daemons/Chart.yaml b/charts/rucio-daemons/Chart.yaml index 737dda12..2cb216d1 100644 --- a/charts/rucio-daemons/Chart.yaml +++ b/charts/rucio-daemons/Chart.yaml @@ -1,5 +1,5 @@ name: rucio-daemons -version: 34.0.2 +version: 34.0.3 apiVersion: v1 description: A Helm chart to deploy daemons for Rucio keywords: diff --git a/charts/rucio-probes/Chart.yaml b/charts/rucio-probes/Chart.yaml index a8d154ee..320576b9 100644 --- a/charts/rucio-probes/Chart.yaml +++ b/charts/rucio-probes/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Helm chart for probe cron jobs needed in Rucio name: rucio-probes -version: 34.0.0 +version: 34.0.1 diff --git a/charts/rucio-server/Chart.yaml b/charts/rucio-server/Chart.yaml index fff16fd5..fde9990d 100644 --- a/charts/rucio-server/Chart.yaml +++ b/charts/rucio-server/Chart.yaml @@ -1,5 +1,5 @@ name: rucio-server -version: 34.0.1 +version: 34.0.2 apiVersion: v1 description: A Helm chart to deploy servers for Rucio keywords: