Skip to content

Commit

Permalink
Merge branch 'main' into config-helm-hooks
Browse files Browse the repository at this point in the history
  • Loading branch information
igorcezar authored Oct 27, 2020
2 parents d6ca9f6 + ac0db69 commit 0739463
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
1 change: 1 addition & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:

jobs:
release:
if: github.repository == 'vmware-tanzu/helm-charts'
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand Down
9 changes: 6 additions & 3 deletions charts/velero/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# enabling restic). Required.
image:
repository: velero/velero
tag: v1.5.1
tag: v1.5.2
# Digest value example: sha256:d238835e151cec91c6a811fe3a89a66d3231d9f64d09e5f3c49552672d271f38. If used, it will
# take precedence over the image.tag.
# digest:
Expand All @@ -19,8 +19,8 @@ image:
#
# If using kube2iam or kiam, use the following annotation with your AWS_ACCOUNT_ID
# and VELERO_ROLE_NAME filled in:
# iam.amazonaws.com/role: arn:aws:iam::<AWS_ACCOUNT_ID>:role/<VELERO_ROLE_NAME>
podAnnotations: {}
# iam.amazonaws.com/role: "arn:aws:iam::<AWS_ACCOUNT_ID>:role/<VELERO_ROLE_NAME>"

# Additional pod labels for Velero deployment's template. Optional
# ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
Expand All @@ -44,6 +44,9 @@ initContainers: []
securityContext: {}
# fsGroup: 1337

# Pod priority class name to use for the Velero deployment. Optional.
priorityClassName: ""

# Tolerations to use for the Velero deployment. Optional.
tolerations: []

Expand Down Expand Up @@ -221,7 +224,7 @@ restic:
podVolumePath: /var/lib/kubelet/pods
privileged: false
# Pod priority class name to use for the Restic daemonset. Optional.
priorityClassName: {}
priorityClassName: ""
# Resource requests/limits to specify for the Restic daemonset deployment. Optional.
resources: {}
# Tolerations to use for the Restic daemonset. Optional.
Expand Down

0 comments on commit 0739463

Please sign in to comment.