From 47ea78c3704bf3cfd8b692ff733c9762322c1dfd Mon Sep 17 00:00:00 2001
From: Xiao Gui <xgui3783@gmail.com>
Date: Wed, 17 Apr 2024 12:42:02 +0200
Subject: [PATCH] fix cert, siibra req

---
 .helm/adhoc/certificate-rc.yaml | 20 ----------
 .helm/adhoc/certificate.yml     | 65 ++++++++++++++++++++++++++++++++-
 .helm/siibra-api/values.yaml    |  7 ++++
 requirements/siibra.txt         |  2 +-
 4 files changed, 72 insertions(+), 22 deletions(-)
 delete mode 100644 .helm/adhoc/certificate-rc.yaml

diff --git a/.helm/adhoc/certificate-rc.yaml b/.helm/adhoc/certificate-rc.yaml
deleted file mode 100644
index 69cb826..0000000
--- a/.helm/adhoc/certificate-rc.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
-  name: siibra-api-rc
-spec:
-  commonName: siibra-api-rc.apps.tc.humanbrainproject.eu
-  isCA: false
-  dnsNames:
-  - siibra-api-rc.apps.tc.humanbrainproject.eu
-  issuerRef:
-    kind: ClusterIssuer
-    name: letsencrypt-production-issuer-1
-  privateKey:
-    algorithm: RSA
-    encoding: PKCS1
-    size: 2048
-  renewBefore: 120h
-  secretName: siibra-api-rc-secret
-  usages:
-  - server auth
\ No newline at end of file
diff --git a/.helm/adhoc/certificate.yml b/.helm/adhoc/certificate.yml
index 2cbb06d..9c5bf68 100644
--- a/.helm/adhoc/certificate.yml
+++ b/.helm/adhoc/certificate.yml
@@ -17,4 +17,67 @@ spec:
   renewBefore: 120h
   secretName: siibra-api-prod-secret
   usages:
-  - server auth
\ No newline at end of file
+  - server auth
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: siibra-api-rc
+spec:
+  commonName: siibra-api-rc.apps.tc.humanbrainproject.eu
+  isCA: false
+  dnsNames:
+  - siibra-api-rc.apps.tc.humanbrainproject.eu
+  issuerRef:
+    kind: ClusterIssuer
+    name: letsencrypt-production-issuer-1
+  privateKey:
+    algorithm: RSA
+    encoding: PKCS1
+    size: 2048
+  renewBefore: 120h
+  secretName: siibra-api-rc-secret
+  usages:
+  - server auth
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: siibra-api-prod-ebrains
+spec:
+  commonName: siibra-api.apps.ebrains.eu
+  isCA: false
+  dnsNames:
+  - siibra-api.apps.ebrains.eu
+  issuerRef:
+    kind: ClusterIssuer
+    name: letsencrypt-production-issuer-1
+  privateKey:
+    algorithm: RSA
+    encoding: PKCS1
+    size: 2048
+  renewBefore: 120h
+  secretName: siibra-api-prod-ebrains-secret
+  usages:
+  - server auth
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: siibra-api-prod-ebrains-alt
+spec:
+  commonName: siibra-atlases.apps.ebrains.eu
+  isCA: false
+  dnsNames:
+  - siibra-atlases.apps.ebrains.eu
+  issuerRef:
+    kind: ClusterIssuer
+    name: letsencrypt-production-issuer-1
+  privateKey:
+    algorithm: RSA
+    encoding: PKCS1
+    size: 2048
+  renewBefore: 120h
+  secretName: siibra-api-prod-ebrains-alt-secret
+  usages:
+  - server auth
diff --git a/.helm/siibra-api/values.yaml b/.helm/siibra-api/values.yaml
index 3b0242d..678596e 100644
--- a/.helm/siibra-api/values.yaml
+++ b/.helm/siibra-api/values.yaml
@@ -56,10 +56,17 @@ ingress:
       paths:
         - path: /
           pathType: Prefix
+    - host: siibra-api.apps.ebrains.eu
+      paths:
+        - path: /
+          pathType: Prefix
   tls:
    - secretName: siibra-api-prod-secret
      hosts:
        - siibra-api-prod.apps.tc.humanbrainproject.eu
+   - secretName: siibra-api-prod-ebrains-secret
+     hosts:
+       - siibra-api.apps.ebrains.eu
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/requirements/siibra.txt b/requirements/siibra.txt
index 9858ece..3f0541a 100644
--- a/requirements/siibra.txt
+++ b/requirements/siibra.txt
@@ -1,3 +1,3 @@
 # siibra==1.0a5
-git+https://github.com/FZJ-INM1-BDA/siibra-python.git@26efca0ccdbd69971cce6114ec8d4e8b38f109d5
+git+https://github.com/FZJ-INM1-BDA/siibra-python.git@23238ac17bee726e9daeb2519f08f9a1621d3fa7
 plotly