Skip to content
This repository has been archived by the owner on Feb 8, 2024. It is now read-only.

CORTX-30142: Merge cortx-control Chart into cortx Chart #252

Merged
merged 3 commits into from
May 19, 2022
Merged

CORTX-30142: Merge cortx-control Chart into cortx Chart #252

merged 3 commits into from
May 19, 2022

Conversation

keithpine
Copy link
Contributor

@keithpine keithpine commented May 18, 2022

Description

Merge the cortx-control Helm chart into the unified CORTX Helm Chart. Resources previously deployed by cortx-control are now deployed by cortx.

For now, I've simply transplanted the values from the old chart, into the new chart's values under the same cortxcontrol key. The templates were updated accordingly. In a future change, I'll be coalescing and re-vamping the YAML structure as other components are merged. Then it will make more sense as to what the final form of values.yaml should look like.

Type of change

  • Bug fix (non-breaking change that fixes an issue)
  • New feature (non-breaking change that adds new functionality)
  • Breaking change (bug fix or new feature that breaks existing functionality)
  • Third-party dependency update
  • Documentation additions or improvements
  • Code quality improvements to existing code or test additions/updates

Applicable issues

  • This change fixes an issue: CORTX-30142

How was this tested?

  • Deployed and un-deployed cluster, include data-only deployment. Results were as expected.
  • Ran utility scripts (e.g. status).
  • Ran S3 I/O.
  • Used the CSM API to login, create a new user, and get the user info. This demonstrates CSM (Control) services and Pod are working.

Additional information

While moving the values over from one chart to the other, I did some minor cleanup.

  • Removed control PVC name value, this is now based on the release name
  • Removed control configmap/ssl-configmap/machine-id name and volume mount name values, these can be static
  • The control enabled flag configmap.cortxControl.enabled, used for data-only deployments, moved to cortxcontrol.enabled.

Other changes:

  • Added template helpers to provide configmap and control names
  • Deployment app labels replaced with app.kubernetes.io/component
  • Added general cortx.labels to Deployment
  • Added component label to PVC
  • The Deployment, Pod, and Service names/hostnames along with the PVC name are based on the Helm release name
  • Replaced secret-info.txt with secretName
  • Give a name for the control https container port so the service can reference it by name
  • status-cortx-cloud.sh now verifies control resources via selectors

Checklist

  • The change is tested and works locally.
  • New or changed settings in the solution YAML are documented clearly in the README.md file.
  • All commits are signed off and are in agreement with the CORTX Community DCO and CLA policy.

If this change addresses a CORTX Jira issue:

  • The title of the PR starts with the issue ID (e.g. CORTX-XXXXX:)

View rendered charts/cortx/README.md

@cla-bot cla-bot bot added the cla-signed label May 18, 2022
@keithpine keithpine marked this pull request as ready for review May 18, 2022 05:48
@keithpine keithpine requested a review from a team as a code owner May 18, 2022 05:48
Copy link
Contributor

@walterlopatka walterlopatka left a comment

Choose a reason for hiding this comment

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

lgtm

Copy link
Contributor

@osowski osowski left a comment

Choose a reason for hiding this comment

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

lgtm

@osowski osowski merged commit d337540 into Seagate:integration May 19, 2022
@keithpine keithpine mentioned this pull request May 19, 2022
10 tasks
@keithpine keithpine deleted the CORTX-30142_control-merge branch June 10, 2022 14:47
@keithpine keithpine added this to the v0.8.0 milestone Jun 16, 2022
@walterlopatka walterlopatka modified the milestones: v0.8.0, v0.9.0 Jun 25, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants