Merge pull request #15 from SamuAlfageme/iop_ingress_update

iop: rm ingress, update components

Author: dagl

.gitignore

@@ -1 +1,2 @@
 *.tgz
+.DS_Store

iop/.helmignore

@@ -21,3 +21,5 @@
 .idea/
 *.tmproj
 .vscode/
+# chart-testing-action configurations
+ci/

iop/Chart.yaml

@@ -2,43 +2,43 @@ apiVersion: v2
 name: iop
 description: ScienceMesh IOP is the reference Federated Scientific Mesh platform
 type: application
-version: 0.1.5
+version: 0.2.0
 appVersion: 0.0.1
 icon: https://developer.sciencemesh.io/logo.svg
 home: https://developer.sciencemesh.io/
 source: https://github.com/sciencemesh/sciencemesh
 dependencies:
 - name: revad
-  version: "1.2.3"
+  version: "1.3.1"
   repository: "https://cs3org.github.io/charts"
   alias: gateway
   condition: gateway.enabled
 - name: revad
-  version: "1.2.3"
+  version: "1.3.1"
   repository: "https://cs3org.github.io/charts"
   alias: storageprovider-home
   condition: storageprovider-home.enabled
 - name: revad
-  version: "1.2.3"
+  version: "1.3.1"
   repository: "https://cs3org.github.io/charts"
   alias: storageprovider-reva
   condition: storageprovider-reva.enabled
 - name: wopiserver
-  version: "0.2.2"
+  version: "0.2.4"
   repository: "https://cs3org.github.io/charts"
   condition: wopiserver.enabled
 maintainers:
   - name: SamuAlfageme
     email: samuel.alfageme.sainz@cern.ch
 annotations:
   artifacthub.io/changes: |
-    - "Migrate chart dependencies to Helm3"
-    - "Lint and test the installation on PRs"
-    - "Fix: bump revad chart to v1.2.3 to prevent premature exit"
+    - "Release IOP v0.2, update revad and wopiserver versions"
+    - "Move 'revad' ingress resource to its own chart"
+    - "Improve smoke installation tests to enable all sub-components"
   artifacthub.io/images: |
     - name: revad
-      image: cs3org/revad:latest
+      image: cs3org/revad:v1.7.0
     - name: wopiserver
-      image: cs3org/wopiserver:latest
+      image: cs3org/wopiserver:v6.5.0
     - name: wopibridge
-      image: cs3org/wopibridge:latest
+      image: cs3org/wopibridge:v3.2.0

iop/ci/complete-iop-values.yaml

@@ -0,0 +1,84 @@
+gateway:
+  enabled: true
+  configFiles:
+    revad.toml: |
+      [grpc.services.gateway]
+      datagateway = "iop-gateway/iop/datagateway"
+      commit_share_to_storage_grant = true
+      commit_share_to_storage_ref = true
+
+      [grpc.services.storageregistry]
+      [grpc.services.storageregistry.drivers.static]
+      home_provider = "/home"
+
+      [grpc.services.storageregistry.drivers.static.rules]
+      "/home" = {"address" = "iop-storageprovider-home:17000"}
+      "/reva" = {"address" = "iop-storageprovider-reva:18000"}
+      "123e4567-e89b-12d3-a456-426655440000" = {"address" = "iop-storageprovider-reva:18000"}
+
+      [grpc.services.authprovider]
+      [grpc.services.authregistry]
+      [grpc.services.userprovider]
+      [grpc.services.usershareprovider]
+      [grpc.services.groupprovider]
+      [grpc.services.publicshareprovider]
+      [grpc.services.ocmcore]
+      [grpc.services.ocmshareprovider]
+      [grpc.services.ocminvitemanager]
+      [grpc.services.ocmproviderauthorizer]
+
+      [http.services.datagateway]
+      [http.services.ocmd]
+      [http.services.ocdav]
+      [http.services.ocs]
+
+storageprovider-home:
+  enabled: true
+  service:
+    grpc:
+      port: 17000
+    http:
+      port: 17001
+  configFiles:
+    revad.toml: |
+      [grpc]
+      address = "0.0.0.0:17000"
+
+      [grpc.services.storageprovider]
+      driver = "localhome"
+      mount_path = "/home"
+      mount_id = "123e4567-e89b-12d3-a456-426655440000"
+      data_server_url = "http://iop-storageprovider-home:17001/data"
+
+      [http]
+      address = "0.0.0.0:17001"
+
+      [http.services.dataprovider]
+      driver = "localhome"
+
+storageprovider-reva:
+  enabled: true
+  service:
+    grpc:
+      port: 18000
+    http:
+      port: 18001
+  configFiles:
+    revad.toml: |
+      [grpc]
+      address = "0.0.0.0:18000"
+
+      [grpc.services.storageprovider]
+      driver = "local"
+      mount_path = "/reva"
+      mount_id = "123e4567-e89b-12d3-a456-426655440000"
+      data_server_url = "http://iop-storageprovider-reva:18001/data"
+
+      [http]
+      address = "0.0.0.0:18001"
+
+      [http.services.dataprovider]
+      driver = "local"
+
+wopiserver:
+  enabled: true

iop/templates/_helpers.tpl

@@ -1,31 +1,3 @@
-ingress:
-  enabled: false
-  services:
-    http:
-      hostname: iop.local
-      path: /iop
-      # path: /iop(/|$)(.*)
-      annotations: {}
-        # kubernetes.io/ingress.class: nginx
-        # nginx.ingress.kubernetes.io/ssl-redirect: "true"
-        # nginx.ingress.kubernetes.io/rewrite-target: /$2
-      tls: []
-        # Secrets must be present in the namespace beforehand.
-        # - secretName: iop-tls
-        #   hosts:
-        #     - iop.local
-    grpc:
-      hostname: iop.local
-      path: /
-      annotations: {}
-        # kubernetes.io/ingress.class: nginx
-        # nginx.ingress.kubernetes.io/ssl-redirect: "true"
-        # nginx.ingress.kubernetes.io/backend-protocol: "GRPC"
-      tls: []
-        # - secretName: iop-tls
-        #   hosts:
-        #     - iop.local
-
 gateway:
   enabled: true