Skip to content

Commit be40089

Browse files
committed
Bumped binary and TF provider versions
1 parent fa08c21 commit be40089

File tree

8 files changed

+708
-679
lines changed

8 files changed

+708
-679
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ env:
6464
TF_LOG: "ERROR" # TRACE, DEBUG, INFO, WARN or ERROR
6565
TF_PLAN: "tfplan"
6666
# https://github.com/hashicorp/terraform/releases
67-
TF_VERSION: "1.3.4"
67+
TF_VERSION: "1.3.7"
6868
TF_WORKING_DIR: ./terraform
6969
# azurerm provider oidc
7070
# https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/guides/service_principal_oidc

.github/workflows/destroy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ env:
6060
TF_LOG_PATH: terraform.log
6161
TF_LOG: "ERROR" # https://developer.hashicorp.com/terraform/internals/debugging
6262
# https://github.com/hashicorp/terraform/releases
63-
TF_VERSION: "1.3.4"
63+
TF_VERSION: "1.3.7"
6464
TF_WORKING_DIR: terraform
6565
# azurerm provider oidc
6666
# https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/guides/service_principal_oidc

terraform/files/scripts/argocd_config.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ARGOCD_HEALTH_CHECK_URL="https://$ARGOCD_FQDN/healthz"
1919

2020
# Install
2121
# https://github.com/argoproj/argo-cd/releases/
22-
VERSION="v2.5.2"
22+
VERSION="v2.5.9"
2323
curl -sSL -o "$ARGOCD_PATH" "https://github.com/argoproj/argo-cd/releases/download/$VERSION/argocd-linux-amd64"
2424
chmod +x "$ARGOCD_PATH"
2525

terraform/helm/argocd_default_values.yaml

Lines changed: 621 additions & 604 deletions
Large diffs are not rendered by default.

terraform/helm/velero_default_values.yaml

Lines changed: 66 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
# source: https://github.com/vmware-tanzu/helm-charts/blob/velero-2.32.1/charts/velero/values.yaml
1+
# source: https://github.com/vmware-tanzu/helm-charts/blob/velero-3.1.0/charts/velero/values.yaml
22

33
##
44
## Configuration settings that directly affect the Velero deployment YAML.
55
##
66

77
# Details of the container image to use in the Velero deployment & daemonset (if
8-
# enabling restic). Required.
8+
# enabling node-agent). Required.
99
image:
1010
repository: velero/velero
11-
tag: v1.9.2
11+
tag: v1.10.0
1212
# Digest value example: sha256:d238835e151cec91c6a811fe3a89a66d3231d9f64d09e5f3c49552672d271f38.
1313
# If used, it will take precedence over the image.tag.
1414
# digest:
@@ -55,13 +55,13 @@ dnsPolicy: ClusterFirst
5555
# If the value is a string then it is evaluated as a template.
5656
initContainers:
5757
# - name: velero-plugin-for-csi
58-
# image: velero/velero-plugin-for-csi:v0.3.1
58+
# image: velero/velero-plugin-for-csi:v0.3.2
5959
# imagePullPolicy: IfNotPresent
6060
# volumeMounts:
6161
# - mountPath: /target
6262
# name: plugins
6363
# - name: velero-plugin-for-aws
64-
# image: velero/velero-plugin-for-aws:v1.5.1
64+
# image: velero/velero-plugin-for-aws:v1.5.2
6565
# imagePullPolicy: IfNotPresent
6666
# volumeMounts:
6767
# - mountPath: /target
@@ -154,6 +154,7 @@ metrics:
154154

155155
serviceMonitor:
156156
enabled: false
157+
annotations: {}
157158
additionalLabels: {}
158159
# ServiceMonitor namespace. Default to Velero namespace.
159160
# namespace:
@@ -286,46 +287,60 @@ configuration:
286287
# here if using a non-default value. The `velero server` default values are shown in the
287288
# comments below.
288289
# --------------------
290+
# `velero server` default: restic
291+
uploaderType:
289292
# `velero server` default: 1m
290293
backupSyncPeriod:
291-
# `velero server` default: 1h
292-
resticTimeout:
293-
# `velero server` default: namespaces,persistentvolumes,persistentvolumeclaims,secrets,configmaps,serviceaccounts,limitranges,pods
294-
restoreResourcePriorities:
295-
# `velero server` default: false
296-
restoreOnlyMode:
297-
# `velero server` default: 20.0
298-
clientQPS:
294+
# `velero server` default: 4h
295+
fsBackupTimeout:
299296
# `velero server` default: 30
300297
clientBurst:
301-
# `velero server` default: empty
298+
# `velero server` default: 500
302299
clientPageSize:
300+
# `velero server` default: 20.0
301+
clientQPS:
302+
# Name of the default backup storage location. Default: default
303+
defaultBackupStorageLocation:
304+
# How long to wait by default before backups can be garbage collected. Default: 72h
305+
defaultBackupTTL:
306+
# Name of the default volume snapshot location.
307+
defaultVolumeSnapshotLocations:
303308
# `velero server` default: empty
304309
disableControllers:
305-
# `velero server` default: 1m
306-
storeValidationFrequency:
307310
# `velero server` default: 1h
308311
garbageCollectionFrequency:
309-
#
310-
311-
# additional key/value pairs to be used as environment variables such as "AWS_CLUSTER_NAME: 'yourcluster.domain.tld'"
312-
extraEnvVars: {}
313-
312+
# Set log-format for Velero pod. Default: text. Other option: json.
313+
logFormat:
314+
# Set log-level for Velero pod. Default: info. Other options: debug, warning, error, fatal, panic.
315+
logLevel:
316+
# The address to expose prometheus metrics. Default: :8085
317+
metricsAddress:
318+
# Directory containing Velero plugins. Default: /plugins
319+
pluginDir:
320+
# The address to expose the pprof profiler. Default: localhost:6060
321+
profilerAddress:
322+
# `velero server` default: false
323+
restoreOnlyMode:
324+
# `velero server` default: customresourcedefinitions,namespaces,storageclasses,volumesnapshotclass.snapshot.storage.k8s.io,volumesnapshotcontents.snapshot.storage.k8s.io,volumesnapshots.snapshot.storage.k8s.io,persistentvolumes,persistentvolumeclaims,secrets,configmaps,serviceaccounts,limitranges,pods,replicasets.apps,clusterclasses.cluster.x-k8s.io,clusters.cluster.x-k8s.io,clusterresourcesets.addons.cluster.x-k8s.io
325+
restoreResourcePriorities:
326+
# `velero server` default: 1m
327+
storeValidationFrequency:
328+
# How long to wait on persistent volumes and namespaces to terminate during a restore before timing out. Default: 10m
329+
terminatingResourceTimeout:
314330
# Comma separated list of velero feature flags. default: empty
315331
# features: EnableCSI
316332
features:
333+
# `velero server` default: velero
334+
namespace:
317335

318-
# Set log-level for Velero pod. Default: info. Other options: debug, warning, error, fatal, panic.
319-
logLevel:
320-
321-
# Set log-format for Velero pod. Default: text. Other option: json.
322-
logFormat:
336+
# additional key/value pairs to be used as environment variables such as "AWS_CLUSTER_NAME: 'yourcluster.domain.tld'"
337+
extraEnvVars: {}
323338

324-
# Set true for backup all pod volumes without having to apply annotation on the pod when used restic Default: false. Other option: false.
325-
defaultVolumesToRestic:
339+
# Set true for backup all pod volumes without having to apply annotation on the pod when used file system backup Default: false.
340+
defaultVolumesToFsBackup:
326341

327-
# How often 'restic prune' is run for restic repositories by default. Default: 168h. Optional.
328-
defaultResticPruneFrequency:
342+
# How often repository maintain is run for repositories by default.
343+
defaultRepoMaintainFrequency:
329344

330345
##
331346
## End of backup/snapshot location settings.
@@ -381,7 +396,7 @@ credentials:
381396
# additional key/value pairs to be used as environment variables such as "DIGITALOCEAN_TOKEN: <your-key>". Values will be stored in the secret.
382397
extraEnvVars: {}
383398
# Name of a pre-existing secret (if any) in the Velero namespace
384-
# that will be used to load environment variables into velero and restic.
399+
# that will be used to load environment variables into velero and node-agent.
385400
# Secret should be in format - https://kubernetes.io/docs/concepts/configuration/secret/#use-case-as-container-environment-variables
386401
extraSecretRef: ""
387402

@@ -390,15 +405,15 @@ backupsEnabled: true
390405
# Whether to create volumesnapshotlocation crd, if false => disable snapshot feature
391406
snapshotsEnabled: true
392407

393-
# Whether to deploy the restic daemonset.
394-
deployRestic: false
408+
# Whether to deploy the node-agent daemonset.
409+
deployNodeAgent: false
395410

396-
restic:
411+
nodeAgent:
397412
podVolumePath: /var/lib/kubelet/pods
398413
privileged: false
399-
# Pod priority class name to use for the Restic daemonset. Optional.
414+
# Pod priority class name to use for the node-agent daemonset. Optional.
400415
priorityClassName: ""
401-
# Resource requests/limits to specify for the Restic daemonset deployment. Optional.
416+
# Resource requests/limits to specify for the node-agent daemonset deployment. Optional.
402417
# https://velero.io/docs/v1.6/customize-installation/#customize-resource-requests-and-limits
403418
resources:
404419
requests:
@@ -408,30 +423,30 @@ restic:
408423
cpu: 1000m
409424
memory: 1024Mi
410425

411-
# Tolerations to use for the Restic daemonset. Optional.
426+
# Tolerations to use for the node-agent daemonset. Optional.
412427
tolerations: []
413428

414-
# Annotations to set for the Restic daemonset. Optional.
429+
# Annotations to set for the node-agent daemonset. Optional.
415430
annotations: {}
416431

417-
# labels to set for the Restic daemonset. Optional.
432+
# labels to set for the node-agent daemonset. Optional.
418433
labels: {}
419434

420435
# will map /scratch to emptyDir. Set to false and specify your own volume
421436
# via extraVolumes and extraVolumeMounts that maps to /scratch
422437
# if you don't want to use emptyDir.
423438
useScratchEmptyDir: true
424439

425-
# Extra volumes for the Restic daemonset. Optional.
440+
# Extra volumes for the node-agent daemonset. Optional.
426441
extraVolumes: []
427442

428-
# Extra volumeMounts for the Restic daemonset. Optional.
443+
# Extra volumeMounts for the node-agent daemonset. Optional.
429444
extraVolumeMounts: []
430445

431-
# Key/value pairs to be used as environment variables for the Restic daemonset. Optional.
446+
# Key/value pairs to be used as environment variables for the node-agent daemonset. Optional.
432447
extraEnvVars: {}
433448

434-
# Configure the dnsPolicy of the Restic daemonset
449+
# Configure the dnsPolicy of the node-agent daemonset
435450
# See: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-s-dns-policy
436451
dnsPolicy: ClusterFirst
437452

@@ -442,20 +457,20 @@ restic:
442457
runAsUser: 0
443458
# fsGroup: 1337
444459

445-
# Container Level Security Context for the 'restic' container of the restic DaemonSet. Optional.
460+
# Container Level Security Context for the 'node-agent' container of the node-agent daemonset. Optional.
446461
# See: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container
447462
containerSecurityContext: {}
448463

449-
# Container Lifecycle Hooks to use for the Restic daemonset. Optional.
464+
# Container Lifecycle Hooks to use for the node-agent daemonset. Optional.
450465
lifecycle: {}
451466

452-
# Node selector to use for the Restic daemonset. Optional.
467+
# Node selector to use for the node-agent daemonset. Optional.
453468
nodeSelector: {}
454469

455-
# Affinity to use with Restic daemonset. Optional.
470+
# Affinity to use with node-agent daemonset. Optional.
456471
affinity: {}
457472

458-
# DNS configuration to use for the Restic daemonset. Optional.
473+
# DNS configuration to use for the node-agent daemonset. Optional.
459474
dnsConfig: {}
460475

461476
# Backup schedules to create.
@@ -478,12 +493,12 @@ schedules: {}
478493
# Velero ConfigMaps.
479494
# Eg:
480495
# configMaps:
481-
# restic-restore-action-config:
496+
# fs-restore-action-config:
482497
# labels:
483498
# velero.io/plugin-config: ""
484-
# velero.io/restic: RestoreItemAction
499+
# velero.io/pod-volume-restore: RestoreItemAction
485500
# data:
486-
# image: velero/velero-restic-restore-helper:v1.9.2
501+
# image: velero/velero-restore-helper:v1.10.0
487502
configMaps: {}
488503

489504
##

terraform/helm/velero_values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
initContainers:
66
- name: velero-plugin-for-microsoft-azure
77
# https://hub.docker.com/r/velero/velero-plugin-for-microsoft-azure/tags
8-
image: velero/velero-plugin-for-microsoft-azure:v1.5.1
8+
image: velero/velero-plugin-for-microsoft-azure:v1.6.0
99
imagePullPolicy: IfNotPresent
1010
volumeMounts:
1111
- mountPath: /target

terraform/variables.tf

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# az aks get-versions --location eastus --output table
77
# az aks get-versions --location uksouth --output tsv --query "orchestrators | [?default].orchestratorVersion"
88
variable "kubernetes_version" {
9-
default = "1.23.12"
9+
default = "1.24.6"
1010
}
1111

1212
# Helm charts
@@ -21,25 +21,25 @@ variable "nginx_chart_version" {
2121
# https://hub.helm.sh/charts/jetstack/cert-manager
2222
# helm search repo jetstack/cert-manager
2323
variable "cert_manager_chart_version" {
24-
default = "v1.10.0"
24+
default = "v1.11.0"
2525
}
2626

2727
# https://github.com/vmware-tanzu/helm-charts/releases
2828
# helm search repo vmware-tanzu/velero
2929
# * also update terraform/helm/velero_default_values.yaml
3030
# * also update terraform/helm/velero_values.yaml
3131
variable "velero_chart_version" {
32-
default = "2.32.1"
32+
default = "3.1.0"
3333
}
3434

3535
# https://hub.docker.com/r/velero/velero/tags
3636
variable "velero_image_tag" {
37-
default = "v1.9.2"
37+
default = "v1.10.0"
3838
}
3939

4040
# https://hub.docker.com/r/sonatype/nexus3/tags
4141
variable "nexus_image_tag" {
42-
default = "3.43.0"
42+
default = "3.45.1"
4343
}
4444

4545
# https://github.com/adamrushuk/charts/releases
@@ -53,32 +53,32 @@ variable "nexus_chart_version" {
5353
# https://github.com/SparebankenVest/public-helm-charts/blob/master/stable/akv2k8s/Chart.yaml#L5
5454
# helm search repo spv-charts/akv2k8s
5555
variable "akv2k8s_chart_version" {
56-
default = "2.2.2"
56+
default = "2.3.2"
5757
}
5858

5959
# https://github.com/Azure/aad-pod-identity/blob/master/charts/aad-pod-identity/Chart.yaml#L4
6060
# helm search repo aad-pod-identity/aad-pod-identity
6161
variable "aad_pod_identity_chart_version" {
62-
default = "4.1.14"
62+
default = "4.1.15"
6363
}
6464

6565
# https://bitnami.com/stack/external-dns/helm
6666
# https://github.com/bitnami/charts/blob/master/bitnami/external-dns/Chart.yaml
6767
# helm search repo bitnami/external-dns
6868
# helm search repo -l bitnami/external-dns
6969
variable "external_dns_chart_version" {
70-
default = "6.11.3"
70+
default = "6.13.1"
7171
}
7272

7373
# https://github.com/kubereboot/charts/tree/main/charts/kured
7474
# helm search repo kubereboot/kured
7575
variable "kured_chart_version" {
76-
default = "4.1.0"
76+
default = "4.2.0"
7777
}
7878

79-
# https://github.com/kubereboot/kured#kubernetes--os-compatibility
79+
# https://kured.dev/docs/installation/#kubernetes--os-compatibility
8080
variable "kured_image_tag" {
81-
default = "1.11.0"
81+
default = "1.12.0"
8282
}
8383

8484

@@ -88,13 +88,13 @@ variable "kured_image_tag" {
8888
# helm search repo -l argo/argo-cd | head -n 20
8989
# * also update terraform/helm/argocd_default_values.yaml
9090
variable "argocd_chart_version" {
91-
default = "5.13.6"
91+
default = "5.19.11"
9292
}
9393

9494
# https://hub.docker.com/r/argoproj/argocd/tags
9595
# * also update cli version: terraform/files/scripts/argocd_config.sh#L22
9696
variable "argocd_image_tag" {
97-
default = "v2.5.2"
97+
default = "v2.5.9"
9898
}
9999
#endregion Versions
100100

0 commit comments

Comments
 (0)