Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UPSTREAM:<carry>:fix:Endpoint fix for AWS S3 Bucket Session #30

Merged
merged 1 commit into from
Apr 16, 2024

Conversation

amadhusu
Copy link

@amadhusu amadhusu commented Mar 21, 2024

Description of your changes:
Resolves RHOAIENG-3774 . This resolves the issue of having to specify the region within the host field in DSPA after already providing the same in "Region" field.

Testing Instructions:

  1. Deploy DSPO
  2. Create the secret 'aws-bucket-creds' in the namespace where you are going to deploy the DSPA.
  3. Deploy DSPA [a] attached below where the host is 's3.amazonaws.com'
  4. Run the sample Pipeline and ensure it executes properly.
  5. Deploy DSPA [b] attached below where the host is 's3.us-east-2.amazonaws.com'
  6. Run the sample Pipeline and ensure it executes properly again.
DSPA [a]
apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1
kind: DataSciencePipelinesApplication
metadata:
  name: pr-30
spec:
  dspVersion: v2
  apiServer:
    enableSamplePipeline: true
    image: "quay.io/opendatahub/ds-pipelines-api-server:pr-30"
    argoDriverImage: "quay.io/opendatahub/ds-pipelines-driver:pr-30"
    argoLauncherImage: "quay.io/opendatahub/ds-pipelines-launcher:pr-30"
  persistenceAgent:
    image: "quay.io/opendatahub/ds-pipelines-persistenceagent:pr-30"
  scheduledWorkflow:
    image: "quay.io/opendatahub/ds-pipelines-scheduledworkflow:pr-30"
  mlmd:  
    deploy: true  # Optional component
    grpc:
      image: "quay.io/opendatahub/mlmd-grpc-server:latest"
    envoy:
      image: "registry.redhat.io/openshift-service-mesh/proxyv2-rhel8:2.3.9-2"
  mlpipelineUI:
    deploy: true  # Optional component 
    image: "quay.io/opendatahub/ds-pipelines-frontend:pr-30"
  objectStorage:
    externalStorage:
      bucket: rhods-dsp-dev
      host: s3.amazonaws.com
      region: us-east-2
      s3CredentialsSecret:
        accessKey: k8saccesskey
        secretKey: k8ssecretkey
        secretName: aws-bucket-creds
      scheme: https

DSPA [b]
apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1
kind: DataSciencePipelinesApplication
metadata:
  name: pr-30
spec:
  dspVersion: v2
  apiServer:
    enableSamplePipeline: true
    image: "quay.io/opendatahub/ds-pipelines-api-server:pr-30"
    argoDriverImage: "quay.io/opendatahub/ds-pipelines-driver:pr-30"
    argoLauncherImage: "quay.io/opendatahub/ds-pipelines-launcher:pr-30"
  persistenceAgent:
    image: "quay.io/opendatahub/ds-pipelines-persistenceagent:pr-30"
  scheduledWorkflow:
    image: "quay.io/opendatahub/ds-pipelines-scheduledworkflow:pr-30"
  mlmd:  
    deploy: true  # Optional component
    grpc:
      image: "quay.io/opendatahub/mlmd-grpc-server:latest"
    envoy:
      image: "registry.redhat.io/openshift-service-mesh/proxyv2-rhel8:2.3.9-2"
  mlpipelineUI:
    deploy: true  # Optional component 
    image: "quay.io/opendatahub/ds-pipelines-frontend:pr-30"
  objectStorage:
    externalStorage:
      bucket: rhods-dsp-dev
      host: s3.us-east-2.amazonaws.com
      region: us-east-2
      s3CredentialsSecret:
        accessKey: k8saccesskey
        secretKey: k8ssecretkey
        secretName: aws-bucket-creds
      scheme: https

Checklist:

@dsp-developers
Copy link

A set of new images have been built to help with testing out this PR:
API Server: quay.io/opendatahub/ds-pipelines-api-server:pr-30
DSP DRIVER: quay.io/opendatahub/ds-pipelines-driver:pr-30
DSP LAUNCHER: quay.io/opendatahub/ds-pipelines-launcher:pr-30
Persistence Agent: quay.io/opendatahub/ds-pipelines-persistenceagent:pr-30
Scheduled Workflow Manager: quay.io/opendatahub/ds-pipelines-scheduledworkflow:pr-30
MLMD Server: quay.io/opendatahub/mlmd-grpc-server:latest
MLMD Envoy Proxy: registry.redhat.io/openshift-service-mesh/proxyv2-rhel8:2.3.9-2
UI: quay.io/opendatahub/ds-pipelines-frontend:pr-30

@dsp-developers
Copy link

An OCP cluster where you are logged in as cluster admin is required.

The Data Science Pipelines team recommends testing this using the Data Science Pipelines Operator. Check here for more information on using the DSPO.

To use and deploy a DSP stack with these images (assuming the DSPO is deployed), first save the following YAML to a file named dspa.pr-30.yaml:

apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1
kind: DataSciencePipelinesApplication
metadata:
  name: pr-30
spec:
  dspVersion: v2
  apiServer:
    image: "quay.io/opendatahub/ds-pipelines-api-server:pr-30"
    argoDriverImage: "quay.io/opendatahub/ds-pipelines-driver:pr-30"
    argoLauncherImage: "quay.io/opendatahub/ds-pipelines-launcher:pr-30"
  persistenceAgent:
    image: "quay.io/opendatahub/ds-pipelines-persistenceagent:pr-30"
  scheduledWorkflow:
    image: "quay.io/opendatahub/ds-pipelines-scheduledworkflow:pr-30"
  mlmd:  
    deploy: true  # Optional component
    grpc:
      image: "quay.io/opendatahub/mlmd-grpc-server:latest"
    envoy:
      image: "registry.redhat.io/openshift-service-mesh/proxyv2-rhel8:2.3.9-2"
  mlpipelineUI:
    deploy: true  # Optional component 
    image: "quay.io/opendatahub/ds-pipelines-frontend:pr-30"
  objectStorage:
    minio:
      deploy: true
      image: 'quay.io/opendatahub/minio:RELEASE.2019-08-14T20-37-41Z-license-compliance'

Then run the following:

cd $(mktemp -d)
git clone git@github.com:opendatahub-io/data-science-pipelines.git
cd data-science-pipelines/
git fetch origin pull/30/head
git checkout -b pullrequest adeec9b36f0948ef03a057dd59fa234234427633
oc apply -f dspa.pr-30.yaml

More instructions here on how to deploy and test a Data Science Pipelines Application.

@amadhusu amadhusu changed the title WIP:UPSTREAM:<carry>:fix:Updated the aws-sdk-go version WIP:UPSTREAM:<carry>:fix:Endpoint fix for AWS S3 Bucket Session Apr 8, 2024
@dsp-developers
Copy link

Change to PR detected. A new PR build was completed.
A set of new images have been built to help with testing out this PR:
API Server: quay.io/opendatahub/ds-pipelines-api-server:pr-30
DSP DRIVER: quay.io/opendatahub/ds-pipelines-driver:pr-30
DSP LAUNCHER: quay.io/opendatahub/ds-pipelines-launcher:pr-30
Persistence Agent: quay.io/opendatahub/ds-pipelines-persistenceagent:pr-30
Scheduled Workflow Manager: quay.io/opendatahub/ds-pipelines-scheduledworkflow:pr-30
MLMD Server: quay.io/opendatahub/mlmd-grpc-server:latest
MLMD Envoy Proxy: registry.redhat.io/openshift-service-mesh/proxyv2-rhel8:2.3.9-2
UI: quay.io/opendatahub/ds-pipelines-frontend:pr-30

@dsp-developers
Copy link

Change to PR detected. A new PR build was completed.
A set of new images have been built to help with testing out this PR:
API Server: quay.io/opendatahub/ds-pipelines-api-server:pr-30
DSP DRIVER: quay.io/opendatahub/ds-pipelines-driver:pr-30
DSP LAUNCHER: quay.io/opendatahub/ds-pipelines-launcher:pr-30
Persistence Agent: quay.io/opendatahub/ds-pipelines-persistenceagent:pr-30
Scheduled Workflow Manager: quay.io/opendatahub/ds-pipelines-scheduledworkflow:pr-30
MLMD Server: quay.io/opendatahub/mlmd-grpc-server:latest
MLMD Envoy Proxy: registry.redhat.io/openshift-service-mesh/proxyv2-rhel8:2.3.9-2
UI: quay.io/opendatahub/ds-pipelines-frontend:pr-30

2 similar comments
@dsp-developers
Copy link

Change to PR detected. A new PR build was completed.
A set of new images have been built to help with testing out this PR:
API Server: quay.io/opendatahub/ds-pipelines-api-server:pr-30
DSP DRIVER: quay.io/opendatahub/ds-pipelines-driver:pr-30
DSP LAUNCHER: quay.io/opendatahub/ds-pipelines-launcher:pr-30
Persistence Agent: quay.io/opendatahub/ds-pipelines-persistenceagent:pr-30
Scheduled Workflow Manager: quay.io/opendatahub/ds-pipelines-scheduledworkflow:pr-30
MLMD Server: quay.io/opendatahub/mlmd-grpc-server:latest
MLMD Envoy Proxy: registry.redhat.io/openshift-service-mesh/proxyv2-rhel8:2.3.9-2
UI: quay.io/opendatahub/ds-pipelines-frontend:pr-30

@dsp-developers
Copy link

Change to PR detected. A new PR build was completed.
A set of new images have been built to help with testing out this PR:
API Server: quay.io/opendatahub/ds-pipelines-api-server:pr-30
DSP DRIVER: quay.io/opendatahub/ds-pipelines-driver:pr-30
DSP LAUNCHER: quay.io/opendatahub/ds-pipelines-launcher:pr-30
Persistence Agent: quay.io/opendatahub/ds-pipelines-persistenceagent:pr-30
Scheduled Workflow Manager: quay.io/opendatahub/ds-pipelines-scheduledworkflow:pr-30
MLMD Server: quay.io/opendatahub/mlmd-grpc-server:latest
MLMD Envoy Proxy: registry.redhat.io/openshift-service-mesh/proxyv2-rhel8:2.3.9-2
UI: quay.io/opendatahub/ds-pipelines-frontend:pr-30

@dsp-developers
Copy link

Change to PR detected. A new PR build was completed.
A set of new images have been built to help with testing out this PR:
API Server: quay.io/opendatahub/ds-pipelines-api-server:pr-30
DSP DRIVER: quay.io/opendatahub/ds-pipelines-driver:pr-30
DSP LAUNCHER: quay.io/opendatahub/ds-pipelines-launcher:pr-30
Persistence Agent: quay.io/opendatahub/ds-pipelines-persistenceagent:pr-30
Scheduled Workflow Manager: quay.io/opendatahub/ds-pipelines-scheduledworkflow:pr-30
MLMD Server: quay.io/opendatahub/mlmd-grpc-server:latest
MLMD Envoy Proxy: registry.redhat.io/openshift-service-mesh/proxyv2-rhel8:2.3.9-2
UI: quay.io/opendatahub/ds-pipelines-frontend:pr-30

@dsp-developers
Copy link

Change to PR detected. A new PR build was completed.
A set of new images have been built to help with testing out this PR:
API Server: quay.io/opendatahub/ds-pipelines-api-server:pr-30
DSP DRIVER: quay.io/opendatahub/ds-pipelines-driver:pr-30
DSP LAUNCHER: quay.io/opendatahub/ds-pipelines-launcher:pr-30
Persistence Agent: quay.io/opendatahub/ds-pipelines-persistenceagent:pr-30
Scheduled Workflow Manager: quay.io/opendatahub/ds-pipelines-scheduledworkflow:pr-30
MLMD Server: quay.io/opendatahub/mlmd-grpc-server:latest
MLMD Envoy Proxy: registry.redhat.io/openshift-service-mesh/proxyv2-rhel8:2.3.9-2
UI: quay.io/opendatahub/ds-pipelines-frontend:pr-30

@dsp-developers
Copy link

Change to PR detected. A new PR build was completed.
A set of new images have been built to help with testing out this PR:
API Server: quay.io/opendatahub/ds-pipelines-api-server:pr-30
DSP DRIVER: quay.io/opendatahub/ds-pipelines-driver:pr-30
DSP LAUNCHER: quay.io/opendatahub/ds-pipelines-launcher:pr-30
Persistence Agent: quay.io/opendatahub/ds-pipelines-persistenceagent:pr-30
Scheduled Workflow Manager: quay.io/opendatahub/ds-pipelines-scheduledworkflow:pr-30
MLMD Server: quay.io/opendatahub/mlmd-grpc-server:latest
MLMD Envoy Proxy: registry.redhat.io/openshift-service-mesh/proxyv2-rhel8:2.3.9-2
UI: quay.io/opendatahub/ds-pipelines-frontend:pr-30

@amadhusu amadhusu changed the title WIP:UPSTREAM:<carry>:fix:Endpoint fix for AWS S3 Bucket Session UPSTREAM:<carry>:fix:Endpoint fix for AWS S3 Bucket Session Apr 9, 2024
@dsp-developers
Copy link

Change to PR detected. A new PR build was completed.
A set of new images have been built to help with testing out this PR:
API Server: quay.io/opendatahub/ds-pipelines-api-server:pr-30
DSP DRIVER: quay.io/opendatahub/ds-pipelines-driver:pr-30
DSP LAUNCHER: quay.io/opendatahub/ds-pipelines-launcher:pr-30
Persistence Agent: quay.io/opendatahub/ds-pipelines-persistenceagent:pr-30
Scheduled Workflow Manager: quay.io/opendatahub/ds-pipelines-scheduledworkflow:pr-30
MLMD Server: quay.io/opendatahub/mlmd-grpc-server:latest
MLMD Envoy Proxy: registry.redhat.io/openshift-service-mesh/proxyv2-rhel8:2.3.9-2
UI: quay.io/opendatahub/ds-pipelines-frontend:pr-30

Signed-off-by: Achyut Madhusudan <amadhusu@redhat.com>
@dsp-developers
Copy link

Change to PR detected. A new PR build was completed.
A set of new images have been built to help with testing out this PR:
API Server: quay.io/opendatahub/ds-pipelines-api-server:pr-30
DSP DRIVER: quay.io/opendatahub/ds-pipelines-driver:pr-30
DSP LAUNCHER: quay.io/opendatahub/ds-pipelines-launcher:pr-30
Persistence Agent: quay.io/opendatahub/ds-pipelines-persistenceagent:pr-30
Scheduled Workflow Manager: quay.io/opendatahub/ds-pipelines-scheduledworkflow:pr-30
MLMD Server: quay.io/opendatahub/mlmd-grpc-server:latest
MLMD Envoy Proxy: registry.redhat.io/openshift-service-mesh/proxyv2-rhel8:2.3.9-2
UI: quay.io/opendatahub/ds-pipelines-frontend:pr-30

@amadhusu amadhusu requested a review from HumairAK April 16, 2024 18:42
@HumairAK
Copy link

HumairAK commented Apr 16, 2024

deployed, both versions of the dspa's provided, api server strated both when region is specified in endpoint, and when it's not

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm label Apr 16, 2024
Copy link

openshift-ci bot commented Apr 16, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: HumairAK

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot bot merged commit 95cfc15 into opendatahub-io:master Apr 16, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants