Skip to content

Commit

Permalink
Merge pull request #787 from netgroup-polito/mio/manifests
Browse files Browse the repository at this point in the history
  • Loading branch information
kingmakerbot authored May 9, 2022
2 parents 32d92f7 + 3e4ed12 commit 844a60d
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 7 deletions.
39 changes: 35 additions & 4 deletions infrastructure/backup/velero-helm-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.7.1
tag: v1.8.1
# Digest value example: sha256:d238835e151cec91c6a811fe3a89a66d3231d9f64d09e5f3c49552672d271f38.
# If used, it will take precedence over the image.tag.
# digest:
Expand Down Expand Up @@ -59,7 +59,7 @@ initContainers:
# - mountPath: /target
# name: plugins
- name: velero-plugin-for-aws
image: velero/velero-plugin-for-aws:v1.3.0
image: velero/velero-plugin-for-aws:v1.4.1
imagePullPolicy: IfNotPresent
volumeMounts:
- mountPath: /target
Expand Down Expand Up @@ -98,6 +98,32 @@ extraVolumes: []
# Extra volumeMounts for the Velero deployment. Optional.
extraVolumeMounts: []

# Extra K8s manifests to deploy
extraObjects: []
# - apiVersion: secrets-store.csi.x-k8s.io/v1
# kind: SecretProviderClass
# metadata:
# name: velero-secrets-store
# spec:
# provider: aws
# parameters:
# objects: |
# - objectName: "velero"
# objectType: "secretsmanager"
# jmesPath:
# - path: "access_key"
# objectAlias: "access_key"
# - path: "secret_key"
# objectAlias: "secret_key"
# secretObjects:
# - data:
# - key: access_key
# objectName: client-id
# - key: client-secret
# objectName: client-secret
# secretName: velero-secrets-store
# type: Opaque

# Settings for Velero's prometheus metrics. Enabled by default.
metrics:
enabled: true
Expand Down Expand Up @@ -129,6 +155,9 @@ kubectl:
# digest:
# kubectl image tag. If used, it will take precedence over the cluster Kubernetes version.
# tag: 1.16.15
# Container Level Security Context for the 'kubectl' container of the crd jobs. Optional.
# See: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container
containerSecurityContext: {}
# Resource requests/limits to specify for the upgrade/cleanup job. Optional
resources: {}
# Annotations to set for the upgrade/cleanup job. Optional.
Expand Down Expand Up @@ -263,6 +292,8 @@ rbac:
create: true
# Whether to create the cluster role binding to give administrator permissions to Velero
clusterAdministrator: true
# Name of the ClusterRole.
clusterAdministratorName: cluster-admin

# Information about the Kubernetes service account Velero uses.
serviceAccount:
Expand Down Expand Up @@ -376,7 +407,7 @@ restic:
# annotations:
# myenv: foo
# schedule: "0 0 * * *"
# useOwnerReferencesInBackup: true
# useOwnerReferencesInBackup: false
# template:
# ttl: "240h"
# includedNamespaces:
Expand All @@ -397,7 +428,7 @@ schedules:
# velero.io/plugin-config: ""
# velero.io/restic: RestoreItemAction
# data:
# image: velero/velero-restic-restore-helper:v1.7.1
# image: velero/velero-restic-restore-helper:v1.8.1
configMaps: {}

##
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ controller:
worker-processes: "10"
worker-shutdown-timeout: 3600s
custom-http-errors: 400,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,416,417,418,421,422,423,424,425,426,428,429,431,451,500,501,502,503,504,505,506,507,508,510,511

enable-underscores-in-headers: "true"
large-client-header-buffers: "16 16k"

## Annotations to be added to the controller config configuration configmap
##
Expand Down Expand Up @@ -829,10 +830,10 @@ defaultBackend:
resources: # {}
limits:
cpu: 500m
memory: 20Mi
memory: 50Mi
requests:
cpu: 50m
memory: 20Mi
memory: 50Mi

extraVolumeMounts: []
## Additional volumeMounts to the default backend container.
Expand Down

0 comments on commit 844a60d

Please sign in to comment.