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

stable/velero: Update Velero to v1.2.0 #18492

Merged
merged 4 commits into from
Dec 9, 2019

Conversation

carlisia
Copy link
Contributor

@carlisia carlisia commented Oct 31, 2019

Signed-off-by: Carlisia [email protected]

Is this a new chart

NOTE: We're experiencing a high volume of PRs to this repo and reviews will be delayed. Please host your own chart repository and submit your repository to the Helm Hub instead of this repo to make them discoverable to the community. Here is how to submit new chart repositories to the Helm Hub.

What this PR does / why we need it:

Which issue this PR fixes

(optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged)

  • fixes #

Special notes for your reviewer:

Checklist

[Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.]

  • DCO signed
  • Chart Version bumped
  • Variables are documented in the README.md
  • Title of the PR starts with chart name (e.g. [stable/mychartname])

@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 31, 2019
@k8s-ci-robot k8s-ci-robot requested a review from nrb October 31, 2019 18:46
@helm-bot helm-bot added the Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). label Oct 31, 2019
@helm-bot helm-bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 31, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @carlisia. Thanks for your PR.

I'm waiting for a helm member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Oct 31, 2019
@carlisia carlisia changed the title Update Velero to v1.2.0 stable/velero: Update Velero to v1.2.0 Oct 31, 2019
Copy link
Member

@prydonius prydonius left a comment

Choose a reason for hiding this comment

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

This is great, thanks @carlisia. If we can remove the Velero version change, we can just do a patch bump on the chart here

stable/velero/values.yaml Outdated Show resolved Hide resolved
@prydonius
Copy link
Member

Ah the plugin docs is relevant to 1.2.0, so we should hold this and use this PR to release 1.2.0. #17585 can then rebase once this is merged.

/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 31, 2019
@carlisia carlisia force-pushed the c-velero-1.2.0-beta branch from 26db60a to 8b376c5 Compare October 31, 2019 19:14
@carlisia carlisia marked this pull request as ready for review November 7, 2019 19:13
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 7, 2019
Copy link
Contributor

@skriss skriss left a comment

Choose a reason for hiding this comment

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

Looks great! couple minor things

stable/velero/README.md Outdated Show resolved Hide resolved
stable/velero/README.md Outdated Show resolved Hide resolved

### Configuration
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this information added elsewhere? There's the CLI command example, but it lacks the description/required fields from this table, which I find useful.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We had talked about this in the past in the context of the velero install command. What we had decided was to have the CLI itself be the source of documentation, instead of trying to keep such documentation up to date in multiple places. At least this is my recollection, and also doesn't mean we can't change it.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah, that's true of velero install, though the Helm chart is a bit different. For example, all of these options can (an normally, should) be in a values.yaml file versus just being on the command line. Also, when they're on the command line, they're not their own flags, but rather key/value pairs given to set.

There's also options like credentials.existingSecret that aren't in velero install that have some interactions with other values. That's not immediately clear from just the command line instructions here.

Finally, there's also Helm standards that mention documenting what's possible in a values.yaml file.

I think I'd propose having both the CLI example that was added as well as the table here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Gotcha. But these values are all documented in values.yaml. Do they need to be duplicated in the readme too?

Copy link
Contributor

Choose a reason for hiding this comment

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

No, I don't think they need to duplicated - in the values.yaml is fine. I'll mark this as resolved.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think the convention is to actually have them documented. Personally I find dot notation way better searchable than YAML notation. Example:

configuration.backupStorageLocation.config.storageAccount
vs

configuration:
  # a lot of documentation
  # a lot of documentation
  # a lot of documentation
  # a lot of documentation
  # a lot of documentation
  backupStorageLocation:
    # a lot of documentation
    # a lot of documentation
    # a lot of documentation
    # a lot of documentation
    # a lot of documentation
    config:
      # a lot of documentation
      # a lot of documentation
      # a lot of documentation
      # a lot of documentation
      # a lot of documentation
      storageAccount

Copy link
Contributor

Choose a reason for hiding this comment

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

That's a good point. While it's well taken, I think in order to get Helm users onto v1.2, we should defer this discussion to a separate PR and focus this one on any changes necessary to get 1.2 installable at this stage.

@billimek
Copy link
Collaborator

billimek commented Nov 7, 2019

Should we include a facility within velero to allow for the helm chart to install the necessary plugin(s) which now require the --plugins argument to be passed to the velero container?

See v1.2.0 release notes

@prydonius
Copy link
Member

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 7, 2019
@prydonius
Copy link
Member

@billimek the docs have been updated to reflect that in this PR: https://github.com/helm/charts/pull/18492/files#diff-600a674d7d9abb8a92992fae1f8bc6d5R54. I do think we can make this UX a little nicer by making it simpler to specify plugin images, but maybe something we can address in a follow up PR?

@thabach
Copy link

thabach commented Nov 9, 2019

I commented on Google groups in regards to the (old, the 1.1.0) Helm chart yesterday, see here https://groups.google.com/forum/#!topic/projectvelero/pUm3CyrIusA

A fix for the first issue should be straightforward and I would love to supply a pull but where-to ? The second issue I am not sure if you guys feel like that should be steered by the Helm chart, as customisation can be done via a ConfigMap according to https://velero.io/docs/master/restic/ , it would certainly make things simpler.

Heya

great work and congrats to the new 1.2 release !

I happen to run into two issues with the Helm chart https://github.com/helm/charts/tree/master/stable/velero for velero v1.1.0 (the latest available).

  • the restic.podVolumePath configuration is not taken into account at all, but the default gets always applied
  • while the image.repository setting is taken into account in assembling the velero image path, but not in addressing the velero-restic-restore-helper init-container (which prevents me from doing a restore in the first place within our corporate image caching setup)

Maybe that could be fixed for the soon to be released v1.2.0 helm chart, I would certainly highly appreciate.

Kind regards, Christian.

@nrb
Copy link
Contributor

nrb commented Nov 12, 2019

@thabach Thanks for reporting those problems. Could you file those as separate issues in this repo and assign them to me, so we can get them addressed? I don't know that we'll include them in this PR, but we may do a follow-up point release.

@thabach
Copy link

thabach commented Nov 13, 2019

@thabach Thanks for reporting those problems. Could you file those as separate issues in this repo and assign them to me, so we can get them addressed? I don't know that we'll include them in this PR, but we may do a follow-up point release.

@nrb just realised that I was sitting on an old restic-daemonset.yaml-template and the first bullet was already resolved some time ago - sorry for the false alarm. For the second problem I will report a separate issue (done here #18844).

@prydonius
Copy link
Member

@carlisia are you able to rebase this and fix conflicts?

@carlisia
Copy link
Contributor Author

carlisia commented Dec 2, 2019

Getting this rebased now..

@carlisia carlisia force-pushed the c-velero-1.2.0-beta branch from 81be461 to 614db71 Compare December 2, 2019 20:02
@carlisia
Copy link
Contributor Author

carlisia commented Dec 2, 2019

@prydonius / @nrb PTAL.

@davidkarlsen
Copy link
Member

/ok-to-test

helm upgrade <RELEASE NAME> --set initContainers.backupStorageLocation.name=aws,initContainers.volumeSnapshotLocation.name=aws stable/velero
```

## Upgrading
Copy link
Contributor

Choose a reason for hiding this comment

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

Let's add an "Upgrading to v1.2.0" subsection here. I think we can also remove the "Upgrading to v0.11.0" section, and I'd be fine dropping the "Upgrading to v1.0.0" section as well.

@skriss
Copy link
Contributor

skriss commented Dec 3, 2019

otherwise, LGTM!

@prydonius
Copy link
Member

@carlisia looks like this is good to go once the conflicts are resolved!

description: A Helm chart for velero
name: velero
version: 2.5.0
version: 2.6.0
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
version: 2.6.0
version: 2.7.0

# - name: plugins
# mountPath: /target
# - mountPath: /target
# name: plugin
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
# name: plugin
# name: plugins

# - name:
# image:
# - name: velero-plugin-for-aws
# image: velero/velero-plugin-for-aws:v1.0.0-beta.1
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
# image: velero/velero-plugin-for-aws:v1.0.0-beta.1
# image: velero/velero-plugin-for-aws:v1.0.0

Copy link

Choose a reason for hiding this comment

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

where do I need to specify the plugins inside of the helm chart. Is there a reference to the values file? Actualy im having an issue upgrading.
#19427

Copy link
Contributor

Choose a reason for hiding this comment

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

You have to specify it in the initContainers field in the values file like is exemplified here. Hope this was the answer you were looking for.

Copy link

Choose a reason for hiding this comment

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

I could solve the problem by using init containers:

initContainers:
  - name: velero-plugin-for-microsoft-azure
    image: velero/velero-plugin-for-microsoft-azure:v1.0.0
    volumeMounts:
      - name: plugins
        mountPath: /target

Choose a reason for hiding this comment

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

@JoaoBraveCoding yes, thats it. I think I didn´t see your message on Friday, but today. Thank you!

priorityClassName: {}

# Init containers to add to the Velero deployment's pod spec. Optional.
# Init containers to add to the Velero deployment's pod spec. At least one plugin provider image is required.
Copy link

Choose a reason for hiding this comment

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

this would be very helpful, otherwise i wont know where to add the plugins to the chart

@skriss
Copy link
Contributor

skriss commented Dec 6, 2019

@carlisia let's try to get this rebased and merged soon so we get updated and don't continue to hit merge conflicts!

Carlisia added 4 commits December 9, 2019 07:53
Signed-off-by: Carlisia <[email protected]>
Signed-off-by: Carlisia <[email protected]>
Signed-off-by: Carlisia <[email protected]>
Signed-off-by: Carlisia <[email protected]>
@carlisia carlisia force-pushed the c-velero-1.2.0-beta branch from 6957095 to 2446b15 Compare December 9, 2019 16:04
@nrb
Copy link
Contributor

nrb commented Dec 9, 2019

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Dec 9, 2019
@nrb
Copy link
Contributor

nrb commented Dec 9, 2019

/lgtm
/approved

@k8s-ci-robot k8s-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 9, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: carlisia, nrb

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 9, 2019
@k8s-ci-robot k8s-ci-robot merged commit 06a9968 into helm:master Dec 9, 2019
@carlisia carlisia deleted the c-velero-1.2.0-beta branch December 9, 2019 20:27
dargolith pushed a commit to dargolith/charts that referenced this pull request Jan 10, 2020
* Update Velero to v1.2.0

Signed-off-by: Carlisia <[email protected]>

* Bump release version

Signed-off-by: Carlisia <[email protected]>

* Fix docs

Signed-off-by: Carlisia <[email protected]>

* Code reviews

Signed-off-by: Carlisia <[email protected]>
arturrez pushed a commit to arturrez/stable-charts that referenced this pull request Jan 28, 2020
* Update Velero to v1.2.0

Signed-off-by: Carlisia <[email protected]>

* Bump release version

Signed-off-by: Carlisia <[email protected]>

* Fix docs

Signed-off-by: Carlisia <[email protected]>

* Code reviews

Signed-off-by: Carlisia <[email protected]>
Signed-off-by: Artur <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). lgtm Indicates that a PR is ready to be merged. ok-to-test size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.