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

Updated handling of dspa tls config #620

Merged
merged 1 commit into from
Apr 15, 2024

Conversation

VaniHaripriya
Copy link
Contributor

@VaniHaripriya VaniHaripriya commented Mar 27, 2024

The issue resolved by this Pull Request:

Resolves RHOAIENG-4384

Description of your changes:

Removed the string template for default value of DbExtraParams and created a struct to handle the tls config.

Testing instructions

  • Use dspa_simple.yaml file to deploy dspa and create a pipeline run to verify if it runs properly.
  • Use the following yaml to deploy dspa and create a pipeline run to verify if it runs properly. Before testing this please deploy an external maria-db in a different namespace in your cluster. The resources from here can be used to deploy the external DB.
apiVersion: datasciencepipelinesapplications.opendatahub.io/v1alpha1
kind: DataSciencePipelinesApplication
metadata:
  name: sample
spec:
  dspVersion: v2
  apiServer:
    deploy: true    
    enableSamplePipeline: true
  objectStorage:
    minio:
      deploy: true
      image: 'quay.io/opendatahub/minio:RELEASE.2019-08-14T20-37-41Z-license-compliance'
  database:
    customExtraParams: '{"tls":"false"}'
    externalDB:
      host: mariadb.test-mariadb.svc.cluster.local
      port: "3306"
      username: mlpipeline
      pipelineDBName: mlpipeline
      passwordSecret:
        name: ds-pipeline-db-test
        key: password
  mlpipelineUI:
    image: quay.io/opendatahub/ds-pipelines-frontend:latest

Checklist

  • The commits are squashed in a cohesive manner and have meaningful messages.
  • Testing instructions have been added in the PR body (for PRs involving changes that are not immediately obvious).
  • The developer has manually tested the changes and verified that the changes work

@dsp-developers
Copy link
Contributor

A new image has been built to help with testing out this PR: quay.io/opendatahub/data-science-pipelines-operator:pr-620
An OCP cluster where you are logged in as cluster admin is required.

To use this image run the following:

cd $(mktemp -d)
git clone git@github.com:opendatahub-io/data-science-pipelines-operator.git
cd data-science-pipelines-operator/
git fetch origin pull/620/head
git checkout -b pullrequest a35f4452b3368b3ceb1a88270fc6c6cdabc4ed20
oc new-project opendatahub
make deploy IMG="quay.io/opendatahub/data-science-pipelines-operator:pr-620"

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

@dsp-developers
Copy link
Contributor

Change to PR detected. A new PR build was completed.
A new image has been built to help with testing out this PR: quay.io/opendatahub/data-science-pipelines-operator:pr-620

Copy link
Contributor

@amadhusu amadhusu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was able to verify the first test case but the second test case with the provided yaml is failing as I believe there are more steps required which isn't mentioned in the Testing steps. I believe the pre-requisite for the second test case would be to have this said externaldb already present in the cluster maybe?

dspa_simple.yaml

Screenshot from 2024-04-06 00-47-55

second test case error

Screenshot from 2024-04-06 01-12-51

@VaniHaripriya
Copy link
Contributor Author

I was able to verify the first test case but the second test case with the provided yaml is failing as I believe there are more steps required which isn't mentioned in the Testing steps. I believe the pre-requisite for the second test case would be to have this said externaldb already present in the cluster maybe?

dspa_simple.yaml
second test case error
Screenshot from 2024-04-06 01-12-51

@amadhusu Thank you for testing. I updated the testing instructions to deploy an external DB for the second test.

@dsp-developers
Copy link
Contributor

Change to PR detected. A new PR build was completed.
A new image has been built to help with testing out this PR: quay.io/opendatahub/data-science-pipelines-operator:pr-620

@dsp-developers
Copy link
Contributor

Change to PR detected. A new PR build was completed.
A new image has been built to help with testing out this PR: quay.io/opendatahub/data-science-pipelines-operator:pr-620

controllers/dspipeline_params.go Outdated Show resolved Hide resolved
Add space

Created new func for default DBExtraParams

Remove unused func

Updated DBExtraParams
@dsp-developers
Copy link
Contributor

Change to PR detected. A new PR build was completed.
A new image has been built to help with testing out this PR: quay.io/opendatahub/data-science-pipelines-operator:pr-620

Copy link
Contributor

@amadhusu amadhusu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving after all the requested changes.

@HumairAK
Copy link
Contributor

/lgtm
/approve

Copy link
Contributor

openshift-ci bot commented Apr 15, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: amadhusu, 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

@HumairAK HumairAK merged commit d5deacd into opendatahub-io:main Apr 15, 2024
5 of 6 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.

5 participants