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

csi: add default version to images if it is missing #11577

Merged
merged 1 commit into from
Jan 24, 2023

Conversation

Rakshith-R
Copy link
Member

Rook will now append internal default versions to custom csi image variables passed down if version is missing in them.
This will enable users using their private registries to just pass different image names while rook takes care of adding default versions to them.

Resolves: #10529

Signed-off-by: Rakshith R rar@redhat.com

Checklist:

  • Commit Message Formatting: Commit titles and messages follow guidelines in the developer guide).
  • Skip Tests for Docs: If this is only a documentation change, add the label skip-ci on the PR.
  • Reviewed the developer guide on Submitting a Pull Request
  • Pending release notes updated with breaking and/or notable changes for the next minor release.
  • Documentation has been updated, if necessary.
  • Unit tests have been added, if necessary.
  • Integration tests have been added, if necessary.

Comment on lines 259 to 262
func getImage(
data map[string]string,
settingName string,
defaultImage string) string {
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
func getImage(
data map[string]string,
settingName string,
defaultImage string) string {
func getImage(data map[string]string,configKey,defaultImage string) string {

Copy link
Member

@travisn travisn left a comment

Choose a reason for hiding this comment

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

just a small doc suggestion, thanks!

@@ -27,6 +27,12 @@ ROOK_CSI_SNAPSHOTTER_IMAGE: "registry.k8s.io/sig-storage/csi-snapshotter:v6.2.1"
ROOK_CSIADDONS_IMAGE: "quay.io/csiaddons/k8s-sidecar:v0.5.0"
```

!!! note
Copy link
Member

Choose a reason for hiding this comment

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

Instead of a note how about a header so it's obvious this feature is for using a private repo?

Suggested change
!!! note
### **Use private repo**

Rook will now append internal default versions to custom
csi image variables passed down if version is missing in
them.
This will enable users using their private registries to
just pass different image names while rook takes care
of adding default versions to them.

Resolves: rook#10529

Signed-off-by: Rakshith R <rar@redhat.com>
@travisn travisn merged commit 4f5cc53 into rook:master Jan 24, 2023
mergify bot added a commit that referenced this pull request Jan 24, 2023
csi: add default version to images if it is missing (backport #11577)
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.

Separate image name and tags for helm chart
3 participants