Merge pull request #13 from wilkos-dans/master

Deploy Bridge component to DataverseEU

kubernetes/README.md

@@ -57,17 +57,17 @@ You can use your own SSL certificates or use certbot/letsencrypt to do the SSL c
 ```
 You should now have created the following workloads:
 
-* dataverse-de (Deployment)
 * dataverse-en (Deployment)
+* bridge (Deployment)
 * letsencrypt-cronjob (Cron Job)
 * mailrelay (Deployment)
 * postgres (Deployment)
 * solr (Deployment)
 
 Exposed by the following services:
 
-* dataverse-de (Node Port)
 * dataverse-en (Node Port)
+* bridge (Cluster IP)
 * dataverse-dev-ingress-service (Ingress)
 * letsencrypt	(Node Port)
 * mailrelay (Cluster IP)
@@ -77,10 +77,10 @@ Exposed by the following services:
 PersistentVolumeClaims created:
 
  * dataverse-pvc	 (volume: dataverse-pv)
-  * dataverse-storage (file storage)
-  * solr-storage (index)
-  * postgres-storage (Postgres database)
-  * letsencrypt-storage (SSL certs & renewal info)
+ * dataverse-storage (file storage)
+ * solr-storage (index)
+ * postgres-storage (Postgres database)
+ * letsencrypt-storage (SSL certs & renewal info)
 
 Secret/config:
 

kubernetes/infrastructure/k8s/deployments/dataverse-dev-bridge.yaml

@@ -0,0 +1,32 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: bridge
+  namespace: dataverse-eu
+  labels:
+    component: bridge
+spec:
+  replicas: 1
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        component: bridge
+    spec:
+      containers:
+      - name: bridge
+        image: vtycloud/dvnbridge
+        ports:
+        - containerPort: 8592
+          protocol: TCP
+        - containerPort: 9285
+          protocol: TCP
+        env:
+        - name: doiProvider
+          value : "DARA"
+        - name: doiUsername
+          value : "dveu"
+        - name: doiPassword
+          value : "test_dveu3"
+

kubernetes/infrastructure/k8s/deployments/dataverse-dev-dv-en.yaml

@@ -12,10 +12,19 @@ spec:
     spec:
       containers:
       - name: dataverse-en
-        image: vtycloud/dvndara:latest
+        image: vtycloud/dataverse:4.9.31
         ports:
         - containerPort: 8080
-        - containerPort: 443
+        - containerPort: 443                
+        readinessProbe:
+          httpGet:
+            path: /loginpage.xhtml
+            port: 8080
+          initialDelaySeconds: 120
+          periodSeconds: 110
+          timeoutSeconds: 110
+          successThreshold: 1
+          failureThreshold: 10        
         env:
         - name: SITEURL
           value : "dataverse-dev.cessda.eu"
@@ -28,14 +37,14 @@ spec:
         - name: GLASSFISH_DIRECTORY
           value : "/opt/glassfish4"
         - name: ADMIN_EMAIL
-          value : "info@dataverse.cessda.eu"
+          value : "info@somedomain.org"
         - name: FROM_EMAIL
-          value : "do-not-reply@dataverse.cessda.eu"
+          value : "do-not-reply@somedomain.org"
         - name: MAIL_SERVER
           value : "mailrelay"
-        - name: POSTGRES_ADMIN_PASSWORD 
+        - name: POSTGRES_ADMIN_PASSWORD
           value : "secret"
-        - name: POSTGRES_SERVER 
+        - name: POSTGRES_SERVER
           value : "postgres"
         - name: POSTGRES_PORT
           value : "5432"
@@ -65,16 +74,16 @@ spec:
           value : "/"
         - name: baseuri
           value : "http://labs.da-ra.de"
-        - name: login
+        - name: login 
           value : "dveu"
         - name: password
           value : "test_dveu3"
         - name: DEBUG
           value : "yes"
         volumeMounts:
         - name: dataverse-storage
-          mountPath: "/usr/local/glassfish4/glassfish/domains/domain1/files"
-          subPath: "dataverse_res"
+          mountPath: "/opt/glassfish4/glassfish/domains/domain1/docroot"
+          subPath: "dataverse_files_docroot"
       volumes:
       - name: dataverse-storage
         persistentVolumeClaim:

kubernetes/infrastructure/k8s/ingress/dataverse-dev-ingress.yml

@@ -11,10 +11,8 @@ spec:
   - secretName: letsencrypt-certs
     hosts:
     - dataverse-dev.cessda.eu
-    - de.dataverse-dev.cessda.eu
   rules:
-  - host: dataverse-dev.cessda.eu
-    http:
+  - http:
       paths:
       - backend:
           serviceName: dataverse-en
@@ -23,13 +21,3 @@ spec:
         backend:
           serviceName: letsencrypt
           servicePort: 80
-  - host: de.dataverse-dev.cessda.eu
-    http:
-      paths:
-      - backend:
-          serviceName: dataverse-de
-          servicePort: 8080
-      - path: /.well-known/acme-challenge/*
-        backend:
-          serviceName: letsencrypt
-          servicePort: 80

kubernetes/infrastructure/k8s/letsencrypt/dataverse-dev-letsencrypt.yml

@@ -38,7 +38,7 @@ spec:
               containerPort: 80
             env:
             - name: DOMAINS
-              value: dataverse-dev.cessda.eu,de.dataverse-dev.cessda.eu
+              value: dataverse-dev.cessda.eu
             - name: EMAIL
               value: info@dataverse.cessda.eu
             - name: SECRET

kubernetes/infrastructure/k8s/services/dataverse-dev-bridge.yaml

@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: bridge
+  namespace: dataverse-eu
+  labels:
+    component: bridge
+spec:
+  ports:
+  - port: 8592
+    targetPort: 8592
+    protocol: TCP
+    name: api_port
+  - port: 9285
+    targetPort: 9285
+    protocol: TCP
+    name: admin_port
+  selector:
+    component: bridge