Forced "rebase" of int onto main removing changes from main

apps/base/rucio-newui/cms-rucio-newui.yaml

@@ -1,7 +1,8 @@
 replicaCount: 1
 
 image:
-  repository: registry.cern.ch/cmsrucio/rucio-webui
+  tag: release-35.3.1
+#  repository: registry.cern.ch/cmsrucio/rucio-webui
 
 resources:
   limits:
@@ -14,6 +15,26 @@ ingress:
 #    kubernetes.io/ingress.class: nginx
     nginx.ingress.kubernetes.io/ssl-passthrough: "true"
     nginx.ingress.kubernetes.io/ssl-redirect: "true"
+  hosts:
+    - "cms-rucio-newui.cern.ch"
+
+config:
+  webui:
+    # hostname of the rucio server, include http:// or https://
+    rucio_host: "https://cms-rucio.cern.ch"
+    # hostname of the rucio-auth server, include http:// or https://
+    rucio_auth_host: "https://cms-rucio-auth.cern.ch"
+    # hostname of the webui ( without http:// or https://, just the hostname, no port or scheme required)
+    hostname: "cms-rucio-newui-int.cern.ch"
+    project_url: "https://rucio.cern.ch"
+    multivo_enabled: "False"
+    # A csv string of vos containing their short names. For example: "def,atl,cms"
+    vo_list: "def"
+    vo_default: "def"
+    oidc_enabled: "False"
+    # A csv string of names of supported oidc providers that will be configured in the webui. For example: "cern,indico"
+    oidc_providers: ""
+
 
 proxy:
   rucioProxyScheme: "http"
@@ -30,5 +51,26 @@ service:
   port: 443
   targetPort: https
   portName: https
+  allocateLoadBalancerNodePorts: false
 
 exposeErrorLogs: False
+
+secretMounts:
+  - secretFullName: hostcert
+    mountPath: /etc/grid-security/hostcert.pem
+    subPath: hostcert.pem
+  - secretFullName: hostkey
+    mountPath: /etc/grid-security/hostkey.pem
+    subPath: hostkey.pem
+  - secretFullName: ca-bundle
+    mountPath: /etc/grid-security/CERN-bundle.pem
+    subPath: CERN-bundle.pem
+
+additionalEnvs:
+  - name: RUCIO_CA_PATH
+    value: "/cvmfs/grid.cern.ch/etc/grid-security/certificates"
+  - name: RUCIO_WEBUI_SERVER_CA_BUNDLE
+    value: "/etc/grid-security/CERN-bundle.pem"
+  - name: RUCIO_SSL_PROTOCOL
+    value: "-SSLv3 -TLSv1 -TLSv1.1 +TLSv1.2"
+

apps/base/rucio-newui/rucio-newui-helm.yaml

@@ -7,7 +7,7 @@ spec:
   chart:
     spec:
       chart: rucio-webui
-      version: "<1.32.0"
+      version: "<36"
       sourceRef:
         kind: HelmRepository
         name: rucio

apps/integration/int-cms-cron.yaml

@@ -1,6 +1,11 @@
 cronjobSettings:
   daemonName: "daemons"
   instance: "int"
+  additionalEnvs:
+    - name: USERCERT_NAME
+      value: "rootcert.pem"
+    - name: USERKEY_NAME
+      value: "rootkey.pem"
 
 image:
   repository: registry.cern.ch/cmsrucio/rucio_client

apps/integration/int-consistency-jobs.yaml

@@ -1,15 +1,4 @@
 consistency:
   ignore:
     - /store/test/rucio/int/store/backfill
-    - /store/test/rucio/int/store/test
-  sites:
-    T2_US_Purdue:      
-      interval: 1
-      server: cms-m001.rcac.purdue.edu
-      server_root:   /store/test/rucio/int/store
-    T2_US_Wisconsin:
-      server: g22n07.hep.wisc.edu:1094
-      interval: 1
-    T2_US_Nebraska:
-      server: red-gridftp10.unl.edu:1094
-      interval: 1
+    - /store/test/rucio/int/store/test

apps/integration/int-consistency.yaml

@@ -1,9 +1,17 @@
 consistency:
   instance: "int"
   defaultRoot: "/store/test/rucio/int/store"
+  prometheus_servers: "prometheus-prometheus-pushgateway.prometheus:9091"
+  prometheus_prefix: "rucio.consistency"
+  prometheus_labels: "'{\"rucioInstance\": \"int\"}'"
+  rucio_host: "http://cms-rucio.cern.ch"
+  auth_host: "https://cms-rucio-auth.cern.ch"
+  auth_type: "x509_proxy"
+  ca_cert: "/etc/grid-security/certificates/"
+  request_retries: "3"
 reportStorageClass:
-  osShareID: 635ac65d-f995-43a0-be8c-f502fa4d7b2c
-  osShareAccessID: c5d8db3f-4465-4913-8c96-e1613307638d
+  osShareID: 8fdf6903-e97d-4733-a377-b374205355bc
+  osShareAccessID: 4eba641d-6a38-4e88-8e4b-b127e6c92867 
 image:
   repository: registry.cern.ch/cmsrucio/rucio-consistency
-  tag: release-4.0.3
+  tag: release-4.8.1

apps/integration/int-globus-daemons.yaml

@@ -29,8 +29,9 @@ cacheConsumerCount: 0
 
 config:
     common:
-#        loglevel: "DEBUG"
         loglevel: "INFO"
+    oidc:
+        admin_issuer: "def"
     conveyor:
       use_preparer: "True"
       scheme: "srm,gsiftp,root,http,https"
@@ -39,6 +40,7 @@ config:
 
 conveyorTransferSubmitter:
   activities: "'User Subscriptions'"
+    # Same size or smaller than bulk which is 100
   threads: 1
   bulk: 50
   groupBulk: 50

apps/integration/int-release.yaml

@@ -1,5 +1,5 @@
 image:
-  tag: release-35.2.1.cms6
+  tag: release-35.6.0.cms3
 
 # Sometimes we need to explicitly note the database schema name
 config:

apps/integration/int-rucio-daemons.yaml

@@ -4,13 +4,15 @@ conveyorFinisherCount: 1
 conveyorPreparerCount: 1
 darkReaperCount: 1
 cacheConsumerCount: 0
-tracerKronosCount: 0
 
 reaper:
   includeRses: "cms_type=int"
   greedy: 1
   threads: 1
 
+darkReaper:
+  includeRses: "T2_US_Purdue"
+
 conveyorTransferSubmitter:
   threads: 1
 
@@ -28,8 +30,10 @@ config:
     use_preparer: "True"
     transfertool: "fts3,globus"
     transfertype: "bulk"
-    scheme: "srm,gsiftp,root,http,https,globus"
+    scheme: "davs,root,gsiftp,srm,globus"
     globus_auth_app: "CMSRucioProduction"
+  messaging_hermes:
+    brokers: "cms-test-mb.cern.ch"
 
 conveyorPoller:
   config:

apps/integration/int-rucio-newui.yaml

@@ -0,0 +1,19 @@
+replicaCount: 1
+
+image:
+  tag: release-35.5.0
+#  repository: registry.cern.ch/cmsrucio/rucio-webui
+
+ingress:
+  enabled: true
+
+config:
+  webui:
+    # hostname of the rucio server, include http:// or https://
+    rucio_host: "https://cms-rucio.cern.ch"
+    # hostname of the rucio-auth server, include http:// or https://
+    rucio_auth_host: "https://cms-rucio-auth.cern.ch"
+    # hostname of the webui ( without http:// or https://, just the hostname, no port or scheme required)
+    hostname: "cms-rucio-newui.cern.ch"
+    project_url: "https://rucio.cern.ch"
+

apps/integration/int-rucio-probes.yaml

@@ -5,6 +5,3 @@ probes:
 config:
   monitor:
     prometheus_labels: '{"rucioInstance": "int"}'
-
-image:
-  tag: release-1.29.8.cms2

apps/integration/int-rucio-webui.yaml

@@ -4,3 +4,13 @@ ingress:
 proxy:
   rucioProxy: "cms-rucio-int.cern.ch"
   rucioAuthProxy: "cms-rucio-auth-int.cern.ch:443"
+
+service:
+  type: NodePort
+  useSSL: true
+  port: 443
+  targetPort: https
+  portName: https
+
+httpd_config:
+  rucio_hostname: "cms-rucio-webui-int.cern.ch"

apps/integration/kustomization.yaml

@@ -9,11 +9,10 @@ resources:
   - ../base/rucio-traceserver
   - ../base/rucio-webui
   - ../base/rucio-probes
-  #  - ../base/cms-rucio-traces
-  - ../base/cms-rucio-consistency
   - ../base/cms-rucio-cron
+  - ../base/cms-rucio-cvmfs
   - ../options/globus-daemons
-#  - ../options/loadtest
+  - ../base/rucio-newui
 
 configMapGenerator:
   - name: instance-rucio-server
@@ -28,9 +27,12 @@ configMapGenerator:
   - name: instance-rucio-daemons
     files:
       - values.yaml=int-rucio-daemons.yaml
-  #- name: instance-rucio-webui
-  #  files:
-  #    - values.yaml=int-rucio-webui.yaml
+  - name: instance-rucio-webui
+    files:
+      - values.yaml=int-rucio-webui.yaml
+  - name: instance-rucio-newui
+    files:
+      - values.yaml=int-rucio-newui.yaml
   - name: instance-rucio-probes
     files:
       - values.yaml=int-rucio-probes.yaml