Merge pull request #141 from rcarpa/fix_number_env (8674ba5c) · Commits · Rucio / helm-charts

.github/workflows/lint-test.yml

+6 −3

Original line number	Diff line number	Diff line
		name: Lint and Test Charts

		on: pull_request
		on:
		- pull_request
		- push

		jobs:
		lint-test:
		@@ -39,5 +41,6 @@ jobs:
		uses: helm/kind-action@v1.4.0
		if: steps.list-changed.outputs.changed == 'true'

		- name: Run chart-testing (install)
		run: ct install
		No newline at end of file
		# TODO: enable again when skip-clean-up is released in the next version
		# - name: Run chart-testing (install)
		# run: ct install --debug --skip-clean-up --helm-extra-args=" --dry-run "

charts/rucio-daemons/Chart.yaml

+1 −1

Original line number	Diff line number	Diff line
		name: rucio-daemons
		version: 1.30.6
		version: 1.30.7
		apiVersion: v1
		description: A Helm chart to deploy daemons for Rucio
		keywords:

charts/rucio-daemons/ci/testing-values.yaml

0 → 100644

+353 −0

Original line number	Diff line number	Diff line
		abacusAccountCount: 1
		abacusCollectionReplicaCount: 1
		abacusRseCount: 1
		automatixCount: 1
		cacheConsumerCount: 1
		conveyorTransferSubmitterCount: 1
		conveyorPollerCount: 1
		conveyorFinisherCount: 1
		conveyorReceiverCount: 1
		conveyorThrottlerCount: 1
		conveyorStagerCount: 1
		darkReaperCount: 1
		hermesCount: 1
		hermes2Count: 1
		judgeCleanerCount: 1
		judgeEvaluatorCount: 1
		judgeInjectorCount: 1
		judgeRepairerCount: 1
		minosCount: 1
		minosTemporaryExpirationCount: 1
		necromancerCount: 1
		oauthManagerCount: 1
		reaperCount: 1
		replicaRecovererCount: 1
		tracerKronosCount: 1
		transmogrifierCount: 1
		undertakerCount: 1

		useDeprecatedImplicitSecrets: false

		image:
		repository: rucio/rucio-daemons
		tag: release-1.26.5
		pullPolicy: IfNotPresent

		automaticRestart:
		enabled: 1
		image:
		repository: bitnami/kubectl
		tag: 1.18
		pullPolicy: IfNotPresent
		schedule: "7 1 * * *"

		monitoring:
		enabled: false
		exporterPort: 8080
		targetPort: 8080
		interval: 30s
		telemetryPath: /metrics
		namespace: monitoring
		labels:
		release: prometheus-operator
		serviceMonitor:
		relabelings:
		- sourceLabels: [__meta_kubernetes_pod_node_name]
		separator: ;
		regex: ^(.*)$
		targetLabel: nodename
		replacement: $1
		action: replace

		additionalSecrets:
		rse-accounts:
		secretName: rse-accounts
		mountPath: /opt/rucio/etc/rse-accounts.cfg
		subPath: rse-accounts.cfg

		secretMounts:
		- secretName: suffix-of-the-secret-name
		mountPath: /some/path.json
		- volumeName: gcsrucio
		secretName: gcsrucio
		mountPath: /opt/rucio/etc/gcs_rucio.json
		subPath: gcs_rucio.json
		- secretFullName: daemonint-reaper-archive-bulk-patch
		secretName: reaper-archive-bulk-patch
		mountPath: /patch/reaper_archive_bulk.patch
		subPath: reaper_archive_bulk.patch

		conveyorTransferSubmitter:
		activities: "'Data Challenge'"
		sleepTime: 10
		threads: 1
		sourceStrategy: "throughput"
		bulk: 1000
		groupBulk: 10
		groupPolicy: "activity_dest"
		resources:
		limits:
		memory: "100Mi"
		cpu: "100m"
		requests:
		memory: "100Mi"
		cpu: "100m"
		config:
		a: b


		conveyorPoller:
		activities: "'Activity 1'"
		dbBulk: 2000
		threads: 1
		resources:
		limits:
		memory: "100Mi"
		cpu: "100m"
		requests:
		memory: "100Mi"
		cpu: "100m"
		config:
		conveyor:
		scheme: "srm,gsiftp,root,http,https"
		transfertool: "fts3"

		conveyorFinisher:
		threads: 1
		resources:
		limits:
		memory: "000Mi"
		cpu: "100m"
		requests:
		memory: "100Mi"
		cpu: "100m"
		config:
		c: d

		conveyorReceiver:
		threads: 1
		resources:
		limits:
		memory: "100Mi"
		cpu: "100m"
		requests:
		memory: "100Mi"
		cpu: "100m"

		conveyorThrottler:
		threads: 1
		resources:
		limits:
		memory: "100Mi"
		cpu: "100m"
		requests:
		memory: "100Mi"
		cpu: "100m"

		darkReaper:
		workers: 1
		includeRses: "(type=CALIBDISK\|type=DATADISK\|type=GROUPDISK\|type=LOCALGROUPDISK\|type=SCRATCHDISK)"
		resources:
		limits:
		memory: "100Mi"
		cpu: "100m"
		requests:
		memory: "100Mi"
		cpu: "100m"

		hermes:
		threads: 1
		bulk: 1000
		delay: 10
		resources:
		limits:
		memory: "100Mi"
		cpu: "100m"
		requests:
		memory: "100Mi"
		cpu: "50m"

		judgeCleaner:
		threads: 1
		resources:
		limits:
		memory: "100Mi"
		cpu: "100m"
		requests:
		memory: "100Mi"
		cpu: "50m"

		judgeEvaluator:
		threads: 2
		resources:
		limits:
		memory: "100Mi"
		cpu: "100m"
		requests:
		memory: "100Mi"
		cpu: "100m"

		judgeInjector:
		threads: 1
		resources:
		limits:
		memory: "100Mi"
		cpu: "100m"
		requests:
		memory: "100Mi"
		cpu: "100m"

		judgeRepairer:
		threads: 1
		resources:
		limits:
		memory: "100Mi"
		cpu: "100m"
		requests:
		memory: "100Mi"
		cpu: "50m"

		minos:
		threads: 1
		resources:
		limits:
		memory: "100Mi"
		cpu: "100m"
		requests:
		memory: "100Mi"
		cpu: "100m"

		minosTemporaryExpiration:
		threads: 1
		resources:
		limits:
		memory: "100Mi"
		cpu: "100m"
		requests:
		memory: "100Mi"
		cpu: "100m"

		necromancer:
		bulk: 1000
		resources:
		limits:
		memory: "100Mi"
		cpu: "100m"
		requests:
		memory: "100Mi"
		cpu: "100m"

		undertaker:
		threads: 1
		resources:
		limits:
		memory: "100Mi"
		cpu: "100m"
		requests:
		memory: "100Mi"
		cpu: "100m"

		reaper:
		includeRses: "(type=X\|type=Y)"
		excludeRses: "(site=A\|site=B)"
		threads: 1
		resources:
		limits:
		memory: "1000Mi"
		cpu: "100m"
		requests:
		memory: "100Mi"
		cpu: "100m"

		transmogrifier:
		threads: 1
		resources:
		limits:
		memory: "100Mi"
		cpu: "100m"
		requests:
		memory: "100Mi"
		cpu: "100m"

		tracerKronos:
		threads: 1
		resources:
		limits:
		memory: "100Mi"
		cpu: "100m"
		requests:
		memory: "100Mi"
		cpu: "100m"

		ftsRenewal:
		enabled: 1
		image:
		repository: rucio/fts-cron
		tag: java
		pullPolicy: IfNotPresent
		script: "cms"
		vos:
		- vo: "cms"
		voms: "cms:/cms/Role=production"
		servers: "https://d.f:8446,https://a.b.c:8446"
		secretMounts:
		- secretName: longproxy
		mountPath: /opt/rucio/certs/
		additionalEnvs:
		- name: RUCIO_FTS_SECRETS
		value: daemonint-rucio-x509up
		- name: RUCIO_LONG_PROXY
		value: "latest_x509up.rfc.proxy"

		config:
		core:
		default_mail_from: "a@b.c"

		monitor:
		carbon_server: "a.carbon.server"
		carbon_port: "8888"
		user_scope: "rucio-scope"
		enable_metrics: "True"

		conveyor:
		scheme: "srm,gsiftp,root,http,https"
		transfertool: "fts3"
		ftshosts: "https://fts1.a.b:8446,https://fts3-b.c:8446"
		cache_time: "600"
		user_deterministic_id: "True"
		poll_timeout: "30"
		submit_timeout: "30"
		bring_online: "604800"
		queue_mode: "strict"
		using_memcache: "True"
		ftsmonhosts: "https://fts1.a.b:8446,https://fts3-b.c:8446"
		webdav_transfer_mode: "pull"

		messaging_hermes:
		brokers: "a.com"
		voname: "cms"
		email_from: "a@b.c"

		messaging_fts3:
		brokers: "a.com"
		voname: "cms"
		email_from: "a@b.c"

		tracer_kronos:
		dataset_wait: "10"
		brokers: "a.com"
		voname: "cms"
		email_from: "a@b.c"
		chunksize: "1"
		subscription_id: "subscription-id"
		queue: "/queue/"
		reconnect_attempts: "100"
		port: "1111"
		prefetch_size: "1"

		policy:
		permission: "cms"
		schema: "cms"

		credentials:
		gcs: "/opt/rucio/etc/gcs_rucio.json"

charts/rucio-daemons/templates/renew-fts-cronjob.yaml

+1 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@
		- name: RUCIO_FTS_SCRIPT
		value: "{{ .Values.ftsRenewal.script }}"
		- name: RUCIO_FTS_VO_COUNT
		value: {{ len .Values.ftsRenewal.vos }}
		value: "{{ len .Values.ftsRenewal.vos }}"
		{{- range $key, $val := .Values.ftsRenewal.vos }}
		- name: RUCIO_FTS_VO_{{ $key }}
		value: {{ $val.vo }}

charts/rucio-daemons/values.yaml

+16 −2

Original line number	Diff line number	Diff line
		@@ -149,6 +149,20 @@ conveyorTransferSubmitter:
		memory: "200Mi"
		cpu: "700m"

		conveyorStager:
		threads: 1
		podAnnotations: {}
		activities: "'test1' 'test2'"
		sleepTime: 10
		archiveTimeout: ""
		resources:
		limits:
		memory: "200Mi"
		cpu: "700m"
		requests:
		memory: "200Mi"
		cpu: "700m"

		conveyorPoller:
		threads: 1
		podAnnotations: {}
		@@ -403,7 +417,7 @@ ftsRenewal:
		vos:
		- vo: "cms"
		voms: "cms:/cms/Role=production"
		secretMounts: {}
		secretMounts: []
		# - secretName: fts-cert
		# mountPath: /opt/rucio/certs/usercert.pem
		# subPath: usercert.pem
		@@ -413,7 +427,7 @@ ftsRenewal:
		# - secretName: longproxy
		# mountPath: /opt/rucio/certs/long.proxy
		# subPath: long.proxy
		additionalEnvs: {}
		additionalEnvs: []
		# - name: RUCIO_FTS_SECRETS
		# value: release-rucio-x509up
		# - name: USERCERT_NAME