From c221909bc38a938f6c1b223835e711f4c12e3c01 Mon Sep 17 00:00:00 2001 From: garciagenrique Date: Wed, 19 Jun 2024 13:47:47 +0200 Subject: [PATCH] reapply reana helm charts with new minor v 0.9.3 --- .../cluster/flux-v2/reana/reana-ingress.yaml | 84 ++++---- .../cluster/flux-v2/reana/reana-release.yaml | 204 +++++++++--------- 2 files changed, 144 insertions(+), 144 deletions(-) diff --git a/infrastructure/cluster/flux-v2/reana/reana-ingress.yaml b/infrastructure/cluster/flux-v2/reana/reana-ingress.yaml index 0c468abe..71cde86e 100644 --- a/infrastructure/cluster/flux-v2/reana/reana-ingress.yaml +++ b/infrastructure/cluster/flux-v2/reana/reana-ingress.yaml @@ -1,43 +1,43 @@ -# apiVersion: networking.k8s.io/v1 -# kind: Ingress -# metadata: -# annotations: -# cert-manager.io/cluster-issuer: letsencrypt -# ingress.kubernetes.io/ssl-redirect: "true" -# meta.helm.sh/release-name: reana -# meta.helm.sh/release-namespace: reana -# traefik.frontend.entryPoints: http,https -# name: reana-ingress -# namespace: reana -# spec: -# ingressClassName: nginx -# tls: -# - secretName: cert-manager-tls-ingress-secret-reana -# hosts: -# - reana-vre.cern.ch -# rules: -# - host: reana-vre.cern.ch -# http: -# paths: -# - backend: -# service: -# name: reana-server -# port: -# number: 80 -# path: /api -# pathType: Prefix -# - backend: -# service: -# name: reana-server -# port: -# number: 80 -# path: /oauth -# pathType: Prefix -# - backend: -# service: -# name: reana-ui -# port: -# number: 80 -# path: / -# pathType: Prefix +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + annotations: + cert-manager.io/cluster-issuer: letsencrypt + ingress.kubernetes.io/ssl-redirect: "true" + meta.helm.sh/release-name: reana + meta.helm.sh/release-namespace: reana + traefik.frontend.entryPoints: http,https + name: reana-ingress + namespace: reana +spec: + ingressClassName: nginx + tls: + - secretName: cert-manager-tls-ingress-secret-reana + hosts: + - reana-vre.cern.ch + rules: + - host: reana-vre.cern.ch + http: + paths: + - backend: + service: + name: reana-server + port: + number: 80 + path: /api + pathType: Prefix + - backend: + service: + name: reana-server + port: + number: 80 + path: /oauth + pathType: Prefix + - backend: + service: + name: reana-ui + port: + number: 80 + path: / + pathType: Prefix diff --git a/infrastructure/cluster/flux-v2/reana/reana-release.yaml b/infrastructure/cluster/flux-v2/reana/reana-release.yaml index c4b47223..71332e97 100644 --- a/infrastructure/cluster/flux-v2/reana/reana-release.yaml +++ b/infrastructure/cluster/flux-v2/reana/reana-release.yaml @@ -1,115 +1,115 @@ -# apiVersion: helm.toolkit.fluxcd.io/v2beta1 -# kind: HelmRelease -# metadata: -# name: reana -# namespace: reana -# annotations: -# flux.weave.works/automated: "false" +apiVersion: helm.toolkit.fluxcd.io/v2beta1 +kind: HelmRelease +metadata: + name: reana + namespace: reana + annotations: + flux.weave.works/automated: "false" -# spec: -# releaseName: reana -# interval: 5m -# chart: -# spec: -# sourceRef: -# kind: HelmRepository -# name: reana -# namespace: reana -# chart: reana -# interval: 1m -# # version: 0.9.1-alpha.4 -# version: 0.9.3 +spec: + releaseName: reana + interval: 5m + chart: + spec: + sourceRef: + kind: HelmRepository + name: reana + namespace: reana + chart: reana + interval: 1m + # version: 0.9.1-alpha.4 + version: 0.9.3 -# valuesFrom: -# - kind: Secret -# name: reana-vre-iam-client -# valuesKey: client_id -# targetPath: secrets.login.escape-iam.consumer_key -# - kind: Secret -# name: reana-vre-iam-client -# valuesKey: client_secret -# targetPath: secrets.login.escape-iam.consumer_secret -# - kind: Secret -# name: reana-share -# valuesKey: share_id -# targetPath: shared_storage.cephfs.cephfs_os_share_id -# - kind: Secret -# name: reana-share -# valuesKey: share_access_id -# targetPath: shared_storage.cephfs.cephfs_os_share_access_id -# - kind: Secret -# name: reana-db -# valuesKey: user -# targetPath: secrets.database.user -# - kind: Secret -# name: reana-db -# valuesKey: password -# targetPath: secrets.database.password + valuesFrom: + - kind: Secret + name: reana-vre-iam-client + valuesKey: client_id + targetPath: secrets.login.escape-iam.consumer_key + - kind: Secret + name: reana-vre-iam-client + valuesKey: client_secret + targetPath: secrets.login.escape-iam.consumer_secret + - kind: Secret + name: reana-share + valuesKey: share_id + targetPath: shared_storage.cephfs.cephfs_os_share_id + - kind: Secret + name: reana-share + valuesKey: share_access_id + targetPath: shared_storage.cephfs.cephfs_os_share_access_id + - kind: Secret + name: reana-db + valuesKey: user + targetPath: secrets.database.user + - kind: Secret + name: reana-db + valuesKey: password + targetPath: secrets.database.password -# values: + values: -# shared_storage: -# backend: cephfs -# volume_size: 1000 -# access_modes: ReadWriteMany -# cephfs: -# provisioner: manila-provisioner -# type: "Meyrin CephFS" -# availability_zone: nova -# os_secret_name: os-trustee -# os_secret_namespace: kube-system -# # get shares with `openstack share list`, `openstack share show share_id` -# # YOU NEED TO CREATE AN ACCESS RULE TO GET THE ACCESS RULE ID with `openstack share access list share_name` + shared_storage: + backend: cephfs + volume_size: 1000 + access_modes: ReadWriteMany + cephfs: + provisioner: manila-provisioner + type: "Meyrin CephFS" + availability_zone: nova + os_secret_name: os-trustee + os_secret_namespace: kube-system + # get shares with `openstack share list`, `openstack share show share_id` + # YOU NEED TO CREATE AN ACCESS RULE TO GET THE ACCESS RULE ID with `openstack share access list share_name` -# components: -# reana_ui: -# enabled: true -# local_users: false -# reana_db: -# enabled: false -# reana_server: -# environment: -# REANA_USER_EMAIL_CONFIRMATION: false -# # reana_workflow_controller: -# # image: docker.io/mdonadoni/reana-workflow-controller:0.9.1-7e03f0a-cvmfs -# # reana_job_controller: -# # image: docker.io/reanahub/reana-job-controller-htcondorcern-slurmcern:0.9.1 + components: + reana_ui: + enabled: true + local_users: false + reana_db: + enabled: false + reana_server: + environment: + REANA_USER_EMAIL_CONFIRMATION: false + # reana_workflow_controller: + # image: docker.io/mdonadoni/reana-workflow-controller:0.9.1-7e03f0a-cvmfs + # reana_job_controller: + # image: docker.io/reanahub/reana-job-controller-htcondorcern-slurmcern:0.9.1 -# compute_backends: -# - "kubernetes" -# - "htcondorcern" -# - "slurmcern" + compute_backends: + - "kubernetes" + - "htcondorcern" + - "slurmcern" -# notifications: -# enabled: true -# email_config: -# receiver: escape-cern-ops@cern.ch -# sender: escape-cern-ops@cern.ch -# login: "" -# smtp_server: cernmx.cern.ch -# smtp_port: 25 + notifications: + enabled: true + email_config: + receiver: escape-cern-ops@cern.ch + sender: escape-cern-ops@cern.ch + login: "" + smtp_server: cernmx.cern.ch + smtp_port: 25 -# reana_hostname: "reana-vre.cern.ch" + reana_hostname: "reana-vre.cern.ch" -# db_env_config: + db_env_config: -# REANA_DB_NAME: "reana" -# REANA_DB_PORT: "6600" -# REANA_DB_HOST: "dbod-vre.cern.ch" + REANA_DB_NAME: "reana" + REANA_DB_PORT: "6600" + REANA_DB_HOST: "dbod-vre.cern.ch" -# login: -# - name: "escape-iam" -# type: "keycloak" -# config: -# title: "ESCAPE IAM" -# base_url: "https://iam-escape.cloud.cnaf.infn.it" -# realm_url: "https://iam-escape.cloud.cnaf.infn.it" -# auth_url: "https://iam-escape.cloud.cnaf.infn.it/authorize" -# token_url: "https://iam-escape.cloud.cnaf.infn.it/token" -# userinfo_url: "https://iam-escape.cloud.cnaf.infn.it/userinfo" + login: + - name: "escape-iam" + type: "keycloak" + config: + title: "ESCAPE IAM" + base_url: "https://iam-escape.cloud.cnaf.infn.it" + realm_url: "https://iam-escape.cloud.cnaf.infn.it" + auth_url: "https://iam-escape.cloud.cnaf.infn.it/authorize" + token_url: "https://iam-escape.cloud.cnaf.infn.it/token" + userinfo_url: "https://iam-escape.cloud.cnaf.infn.it/userinfo" -# ingress: -# enabled: false + ingress: + enabled: false -# traefik: -# enabled: false + traefik: + enabled: false