removes minio config

nevermined-io · Jan 18, 2023 · f9001b9 · f9001b9
1 parent 425f046
commit f9001b9
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 121 deletions.
diff --git a/.env.sample b/.env.sample
@@ -26,9 +26,4 @@ ENABLE_COMPUTE=true
 ARGO_HOST=http://localhost:2746/
 ARGO_NAMESPACE=argo
 ARGO_AUTH_TOKEN="Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6IjZ1QThNV1VqQ1l1S2RRNXdSMlMxWnpqM1dWU0lhRTNZV0lObVJUeXZ6YTAifQ.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJudm0tZGlzYyIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VjcmV0Lm5hbWUiOiJhcmdvLXdvcmtmbG93LnNlcnZpY2UtYWNjb3VudC10b2tlbiIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50Lm5hbWUiOiJhcmdvLXdvcmtmbG93Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9zZXJ2aWNlLWFjY291bnQudWlkIjoiMmU5ZmJhYTgtNDE1ZS00MDg1LWFhNzktNWY2MTQ0ZmIwZDcwIiwic3ViIjoic3lzdGVtOnNlcnZpY2VhY2NvdW50Om52bS1kaXNjOmFyZ28td29ya2Zsb3cifQ.SLpDBbEgB0RjIH38xloZjB07N0UBVmswOg5-pQl_K3vqpb15XM5TpWlQpcli5qQKuGGcNttxaxWxDByZ2tjgLFDCDzKle1zDCKz7j0089ZE3mLkDO6hd4Ndb52X8suAWSNdWOCxX0zI3v_JGozEhgnBfxg_pk-aA0hJL7CBnxpPjMD6NuiboaRGwQD4d3Q1mbF6XGRpI_76w3zB8eO3GoIZ-Yrr-8U-5eAhuMuSyMDAX7nr7BF1ci2487q0gFaV2sIY2eVjbnrIxpQKqZ0dg86ZwgwffKeo4RXEYMvB4pJkyEgxhTWyhBbYw_fS-WC5qvXM6r0x_aVll8M0iGe-iWA"
-MINIO_HOST=localhost
-MINIO_PORT=9000
-MINIO_ACCESS_KEY=AKIAIOSFODNN7EXAMPLE
-MINIO_SECRET_KEY=`wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
-
 NO_GRAPH=true
diff --git a/README.md b/README.md
@@ -84,10 +84,6 @@ The Nevermined Node reads the following environment variables allowing the confi
 | **ARGO_HOST**                | HTTP url of the Argo Workflows instance we want to use for computing capabilities. Requires ENABLE_COMPUTE = true                                                            | `https://argo-workflows.instance`                                         |
 | **ARGO_NAMESPACE**           | Name of the Argo Workflows namespace where we will deploy the Nevermined's Compute Workflows. Requires ENABLE_COMPUTE = true                                                 | `argo`                                                                    |
 | **ARGO_AUTH_TOKEN**          | Authorization Token for Argo Workflows. Requires ENABLE_COMPUTE = true                                                                                                       | 'Bearer sdfsdfsdfvxcvVVSDFSDFSDFsdf...'                                   |
-| **MINIO_HOST**               | Host of the MinIO server. Requires ENABLE_COMPUTE = true                                                                                                                     | `https://minio-server.nevermined.rocks`                                   |
-| **MINIO_PORT**               | Port of the MinIO server. Requires ENABLE_COMPUTE = true                                                                                                                     | `9000`                                                                    |
-| **MINIO_ACCESS_KEY**         | Access Key for MinIO. Requires ENABLE_COMPUTE = true                                                                                                                         | `AKIAIOSFODNN7EXAMPLE`                                                    |
-| **MINIO_SECRET_KEY**         | Secret Key for MinIO.Requires ENABLE_COMPUTE = true                                                                                                                          | `wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY`                                |
 
 ## Install and run:
 

diff --git a/argo-workflows-templates/nvm-compute-template-geth-localnet.yaml b/argo-workflows-templates/nvm-compute-template-geth-localnet.yaml
@@ -43,16 +43,6 @@ spec:
         #   value:
         # - name: transformations_dir
         #   value:
-        # - name: minio_host
-        #   value:
-        # - name: minio_port
-        #   value:
-        # - name: minio_access_key
-        #   value:
-        # - name: minio_secret_key
-        #   value:
-        # - name: minio_bucket_prefix
-        #   value:
   dnsPolicy: ClusterFirstWithHostNet
   hostNetwork: true
   metadata:
@@ -186,16 +176,6 @@ spec:
             value: '{{workflow.parameters.volume}}'
           - name: OUTPUT_DIR
             value: '{{workflow.parameters.output_dir}}'
-          - name: MINIO_HOST
-            value: '{{workflow.parameters.minio_host}}'
-          - name: MINIO_PORT
-            value: '{{workflow.parameters.minio_port}}'
-          - name: MINIO_ACCESS_KEY
-            value: '{{workflow.parameters.minio_access_key}}'
-          - name: MINIO_SECRET_KEY
-            value: '{{workflow.parameters.minio_secret_key}}'
-          - name: MINIO_BUCKET_PREFIX
-            value: '{{workflow.parameters.minio_bucket_prefix}}'
           - name: VERBOSE
             value: '{{workflow.parameters.verbose}}'
         volumeMounts:

diff --git a/argo-workflows-templates/nvm-compute-template.yaml b/argo-workflows-templates/nvm-compute-template.yaml
@@ -43,16 +43,6 @@ spec:
         #   value:
         # - name: transformations_dir
         #   value:
-        # - name: minio_host
-        #   value:
-        # - name: minio_port
-        #   value:
-        # - name: minio_access_key
-        #   value:
-        # - name: minio_secret_key
-        #   value:
-        # - name: minio_bucket_prefix
-        #   value:
   dnsPolicy: ClusterFirstWithHostNet
   hostNetwork: true
   metadata:
@@ -186,16 +176,6 @@ spec:
             value: '{{workflow.parameters.volume}}'
           - name: OUTPUT_DIR
             value: '{{workflow.parameters.output_dir}}'
-          - name: MINIO_HOST
-            value: '{{workflow.parameters.minio_host}}'
-          - name: MINIO_PORT
-            value: '{{workflow.parameters.minio_port}}'
-          - name: MINIO_ACCESS_KEY
-            value: '{{workflow.parameters.minio_access_key}}'
-          - name: MINIO_SECRET_KEY
-            value: '{{workflow.parameters.minio_secret_key}}'
-          - name: MINIO_BUCKET_PREFIX
-            value: '{{workflow.parameters.minio_bucket_prefix}}'
           - name: VERBOSE
             value: '{{workflow.parameters.verbose}}'
         volumeMounts:

diff --git a/argo-workflows-templates/nvm-fl-template.yaml b/argo-workflows-templates/nvm-fl-template.yaml
@@ -45,16 +45,6 @@ spec:
         #   value:
         # - name: transformations_dir
         #   value:
-        # - name: minio_host
-        #   value:
-        # - name: minio_port
-        #   value:
-        # - name: minio_access_key
-        #   value:
-        # - name: minio_secret_key
-        #   value:
-        # - name: minio_bucket_prefix
-        #   value:
   dnsPolicy: ClusterFirstWithHostNet
   hostNetwork: true
   metadata:
@@ -207,16 +197,6 @@ spec:
             value: '{{workflow.parameters.volume}}'
           - name: OUTPUT_DIR
             value: '{{workflow.parameters.output_dir}}'
-          - name: MINIO_HOST
-            value: '{{workflow.parameters.minio_host}}'
-          - name: MINIO_PORT
-            value: '{{workflow.parameters.minio_port}}'
-          - name: MINIO_ACCESS_KEY
-            value: '{{workflow.parameters.minio_access_key}}'
-          - name: MINIO_SECRET_KEY
-            value: '{{workflow.parameters.minio_secret_key}}'
-          - name: MINIO_BUCKET_PREFIX
-            value: '{{workflow.parameters.minio_bucket_prefix}}'
           - name: VERBOSE
             value: '{{workflow.parameters.verbose}}'
         volumeMounts:

diff --git a/config/from-env.js b/config/from-env.js
@@ -29,10 +29,6 @@ const keys = [
   'ARGO_HOST',
   'ARGO_NAMESPACE',
   'ARGO_AUTH_TOKEN',
-  'MINIO_HOST',
-  'MINIO_PORT',
-  'MINIO_ACCESS_KEY',
-  'MINIO_SECRET_KEY',
   'COMPUTE_PROVIDER_KEYFILE',
   'COMPUTE_PROVIDER_PASSWORD',
 ]

diff --git a/src/compute/compute.service.spec.ts b/src/compute/compute.service.spec.ts
@@ -100,9 +100,6 @@ describe('ComputeService Testing', () => {
     configServiceMock = createMock<ConfigService>({
       computeConfig: () => ({
         argo_namespace: 'argo',
-        minio_port: '9000',
-        minio_access_key: 'aaaakey',
-        minio_secret_key: 'bbbsecret',
       }),
       cryptoConfig: () => ({
         provider_key: './keyfile.json',
@@ -138,15 +135,6 @@ describe('ComputeService Testing', () => {
     const argo_host = configServiceMock.computeConfig().argo_namespace
     expect(argo_host).toBe('argo')
 
-    const minio_port = configServiceMock.computeConfig().minio_port
-    expect(minio_port).toBe('9000')
-
-    const minio_access_key = configServiceMock.computeConfig().minio_access_key
-    expect(minio_access_key).toBe('aaaakey')
-
-    const minio_secret_key = configServiceMock.computeConfig().minio_secret_key
-    expect(minio_secret_key).toBe('bbbsecret')
-
     const provider_key = configServiceMock.cryptoConfig().provider_key
     expect(provider_key).toBe('./keyfile.json')
 

diff --git a/src/compute/compute.service.ts b/src/compute/compute.service.ts
@@ -203,26 +203,6 @@ export class ComputeService {
         name: 'consumer_address',
         value: consumerAddress,
       },
-      {
-        name: 'minio_host',
-        value: this.configService.computeConfig().minio_host,
-      },
-      {
-        name: 'minio_port',
-        value: this.configService.computeConfig().minio_port,
-      },
-      {
-        name: 'minio_access_key',
-        value: this.configService.computeConfig().minio_access_key,
-      },
-      {
-        name: 'minio_secret_key',
-        value: this.configService.computeConfig().minio_secret_key,
-      },
-      {
-        name: 'minio_bucket_prefix',
-        value: 'pod-publishing-',
-      },
       {
         name: 'transformation_container_image',
         value: `${image}:${tag}`,

diff --git a/src/shared/config/config.service.ts b/src/shared/config/config.service.ts
@@ -24,10 +24,6 @@ export interface ComputeConfig {
   argo_host: string
   argo_namespace: string
   argo_auth_token: string
-  minio_host: string
-  minio_port: string
-  minio_access_key: string
-  minio_secret_key: string
   compute_provider_keyfile: string
   compute_provider_key: string
   compute_provider_password: string
@@ -72,10 +68,6 @@ const DOTENV_SCHEMA = Joi.object({
   ARGO_HOST: Joi.string().default('http:localhost:2746/'),
   ARGO_NAMESPACE: Joi.string().default('argo'),
   ARGO_AUTH_TOKEN: Joi.string(),
-  MINIO_HOST: Joi.string().default('127.0.0.1'),
-  MINIO_PORT: Joi.string().default('9000'),
-  MINIO_ACCESS_KEY: Joi.string().default('AKIAIOSFODNN7EXAMPLE'),
-  MINIO_SECRET_KEY: Joi.string().default('wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY'),
   COMPUTE_PROVIDER_KEYFILE: Joi.string(),
   COMPUTE_PROVIDER_PASSWORD: Joi.string(),
 })
@@ -109,10 +101,6 @@ type DotenvSchemaKeys =
   | 'ARGO_HOST'
   | 'ARGO_NAMESPACE'
   | 'ARGO_AUTH_TOKEN'
-  | 'MINIO_HOST'
-  | 'MINIO_PORT'
-  | 'MINIO_ACCESS_KEY'
-  | 'MINIO_SECRET_KEY'
   | 'COMPUTE_PROVIDER_KEYFILE'
   | 'COMPUTE_PROVIDER_PASSWORD'
 
@@ -134,10 +122,6 @@ export class ConfigService {
       argo_host: this.get('ARGO_HOST'),
       argo_namespace: this.get('ARGO_NAMESPACE'),
       argo_auth_token: this.get('ARGO_AUTH_TOKEN'),
-      minio_host: this.get('MINIO_HOST'),
-      minio_port: this.get('MINIO_PORT'),
-      minio_access_key: this.get('MINIO_ACCESS_KEY'),
-      minio_secret_key: this.get('MINIO_SECRET_KEY'),
       compute_provider_keyfile: this.get('COMPUTE_PROVIDER_KEYFILE'),
       compute_provider_key:
         this.get('COMPUTE_PROVIDER_KEYFILE') &&