From 245ea2441a9cf2daf6d0133d6cb76f738ed13e64 Mon Sep 17 00:00:00 2001 From: johnliu25 Date: Tue, 23 Apr 2024 15:58:43 -0700 Subject: [PATCH] feat: Bump velero to 6.0.0 (#2068) * chore: Update velero 5.2.2 => 6.0.0 * chore: Move velero/5.2.2 => 6.0.0 * build: Updated licenses.d2iq.yaml * feat(velero): Missing bumps --------- Co-authored-by: d2iq-mergebot Co-authored-by: Grace Do --- licenses.d2iq.yaml | 2 +- services/velero/{5.2.2 => 6.0.0}/defaults/cm.yaml | 2 +- services/velero/{5.2.2 => 6.0.0}/defaults/kustomization.yaml | 0 .../{5.2.2 => 6.0.0}/grafana-dashboards/kustomization.yaml | 0 .../velero/{5.2.2 => 6.0.0}/grafana-dashboards/velero.json | 0 services/velero/{5.2.2 => 6.0.0}/helmrelease/helmrelease.yaml | 4 ++-- services/velero/{5.2.2 => 6.0.0}/kustomization.yaml | 0 .../post-install/deployment_update-backupstoragelocation.yaml | 0 .../velero/{5.2.2 => 6.0.0}/post-install/kustomization.yaml | 0 .../velero/{5.2.2 => 6.0.0}/pre-install/kustomization.yaml | 0 .../velero/{5.2.2 => 6.0.0}/pre-install/pre-install-job.yaml | 0 .../{5.2.2 => 6.0.0}/v4-hooks-adoption/v4-hooks-adoption.yaml | 2 +- services/velero/{5.2.2 => 6.0.0}/velero-post-install.yaml | 2 +- services/velero/{5.2.2 => 6.0.0}/velero-pre-install.yaml | 2 +- .../velero/{5.2.2 => 6.0.0}/velero-v4-hooks-adoption.yaml | 2 +- services/velero/{5.2.2 => 6.0.0}/velero.yaml | 2 +- 16 files changed, 9 insertions(+), 9 deletions(-) rename services/velero/{5.2.2 => 6.0.0}/defaults/cm.yaml (98%) rename services/velero/{5.2.2 => 6.0.0}/defaults/kustomization.yaml (100%) rename services/velero/{5.2.2 => 6.0.0}/grafana-dashboards/kustomization.yaml (100%) rename services/velero/{5.2.2 => 6.0.0}/grafana-dashboards/velero.json (100%) rename services/velero/{5.2.2 => 6.0.0}/helmrelease/helmrelease.yaml (95%) rename services/velero/{5.2.2 => 6.0.0}/kustomization.yaml (100%) rename services/velero/{5.2.2 => 6.0.0}/post-install/deployment_update-backupstoragelocation.yaml (100%) rename services/velero/{5.2.2 => 6.0.0}/post-install/kustomization.yaml (100%) rename services/velero/{5.2.2 => 6.0.0}/pre-install/kustomization.yaml (100%) rename services/velero/{5.2.2 => 6.0.0}/pre-install/pre-install-job.yaml (100%) rename services/velero/{5.2.2 => 6.0.0}/v4-hooks-adoption/v4-hooks-adoption.yaml (99%) rename services/velero/{5.2.2 => 6.0.0}/velero-post-install.yaml (91%) rename services/velero/{5.2.2 => 6.0.0}/velero-pre-install.yaml (92%) rename services/velero/{5.2.2 => 6.0.0}/velero-v4-hooks-adoption.yaml (92%) rename services/velero/{5.2.2 => 6.0.0}/velero.yaml (91%) diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml index 0b595283b..e088695c5 100644 --- a/licenses.d2iq.yaml +++ b/licenses.d2iq.yaml @@ -310,7 +310,7 @@ resources: - license_path: LICENSE ref: ${image_tag} url: https://github.com/vmware-tanzu/velero-plugin-for-aws - - container_image: docker.io/velero/velero:v1.12.3 + - container_image: docker.io/velero/velero:v1.13.0 sources: - license_path: LICENSE ref: ${image_tag} diff --git a/services/velero/5.2.2/defaults/cm.yaml b/services/velero/6.0.0/defaults/cm.yaml similarity index 98% rename from services/velero/5.2.2/defaults/cm.yaml rename to services/velero/6.0.0/defaults/cm.yaml index 952729d59..cf56afd03 100644 --- a/services/velero/5.2.2/defaults/cm.yaml +++ b/services/velero/6.0.0/defaults/cm.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: velero-5.2.2-d2iq-defaults + name: velero-6.0.0-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | diff --git a/services/velero/5.2.2/defaults/kustomization.yaml b/services/velero/6.0.0/defaults/kustomization.yaml similarity index 100% rename from services/velero/5.2.2/defaults/kustomization.yaml rename to services/velero/6.0.0/defaults/kustomization.yaml diff --git a/services/velero/5.2.2/grafana-dashboards/kustomization.yaml b/services/velero/6.0.0/grafana-dashboards/kustomization.yaml similarity index 100% rename from services/velero/5.2.2/grafana-dashboards/kustomization.yaml rename to services/velero/6.0.0/grafana-dashboards/kustomization.yaml diff --git a/services/velero/5.2.2/grafana-dashboards/velero.json b/services/velero/6.0.0/grafana-dashboards/velero.json similarity index 100% rename from services/velero/5.2.2/grafana-dashboards/velero.json rename to services/velero/6.0.0/grafana-dashboards/velero.json diff --git a/services/velero/5.2.2/helmrelease/helmrelease.yaml b/services/velero/6.0.0/helmrelease/helmrelease.yaml similarity index 95% rename from services/velero/5.2.2/helmrelease/helmrelease.yaml rename to services/velero/6.0.0/helmrelease/helmrelease.yaml index 6f3a0790a..f7a55ed2e 100644 --- a/services/velero/5.2.2/helmrelease/helmrelease.yaml +++ b/services/velero/6.0.0/helmrelease/helmrelease.yaml @@ -13,7 +13,7 @@ spec: kind: HelmRepository name: vmware-tanzu.github.io namespace: kommander-flux - version: 5.2.2 + version: 6.0.0 interval: 15s install: crds: CreateReplace @@ -24,7 +24,7 @@ spec: releaseName: velero valuesFrom: - kind: ConfigMap - name: velero-5.2.2-d2iq-defaults + name: velero-6.0.0-d2iq-defaults targetNamespace: ${releaseNamespace} --- # This ingress is needed to make Traefik configure an additional route diff --git a/services/velero/5.2.2/kustomization.yaml b/services/velero/6.0.0/kustomization.yaml similarity index 100% rename from services/velero/5.2.2/kustomization.yaml rename to services/velero/6.0.0/kustomization.yaml diff --git a/services/velero/5.2.2/post-install/deployment_update-backupstoragelocation.yaml b/services/velero/6.0.0/post-install/deployment_update-backupstoragelocation.yaml similarity index 100% rename from services/velero/5.2.2/post-install/deployment_update-backupstoragelocation.yaml rename to services/velero/6.0.0/post-install/deployment_update-backupstoragelocation.yaml diff --git a/services/velero/5.2.2/post-install/kustomization.yaml b/services/velero/6.0.0/post-install/kustomization.yaml similarity index 100% rename from services/velero/5.2.2/post-install/kustomization.yaml rename to services/velero/6.0.0/post-install/kustomization.yaml diff --git a/services/velero/5.2.2/pre-install/kustomization.yaml b/services/velero/6.0.0/pre-install/kustomization.yaml similarity index 100% rename from services/velero/5.2.2/pre-install/kustomization.yaml rename to services/velero/6.0.0/pre-install/kustomization.yaml diff --git a/services/velero/5.2.2/pre-install/pre-install-job.yaml b/services/velero/6.0.0/pre-install/pre-install-job.yaml similarity index 100% rename from services/velero/5.2.2/pre-install/pre-install-job.yaml rename to services/velero/6.0.0/pre-install/pre-install-job.yaml diff --git a/services/velero/5.2.2/v4-hooks-adoption/v4-hooks-adoption.yaml b/services/velero/6.0.0/v4-hooks-adoption/v4-hooks-adoption.yaml similarity index 99% rename from services/velero/5.2.2/v4-hooks-adoption/v4-hooks-adoption.yaml rename to services/velero/6.0.0/v4-hooks-adoption/v4-hooks-adoption.yaml index fd352b6bb..9726454e4 100644 --- a/services/velero/5.2.2/v4-hooks-adoption/v4-hooks-adoption.yaml +++ b/services/velero/6.0.0/v4-hooks-adoption/v4-hooks-adoption.yaml @@ -12,7 +12,7 @@ metadata: rules: - apiGroups: ["helm.toolkit.fluxcd.io"] resources: ["helmreleases"] - verbs: ["get", "list", "watch",] + verbs: ["get", "list", "watch"] - apiGroups: ["velero.io"] resources: ["backupstoragelocations", "schedules", "volumesnapshotlocations"] verbs: ["get", "list", "patch"] diff --git a/services/velero/5.2.2/velero-post-install.yaml b/services/velero/6.0.0/velero-post-install.yaml similarity index 91% rename from services/velero/5.2.2/velero-post-install.yaml rename to services/velero/6.0.0/velero-post-install.yaml index 922af35ad..c7f86713e 100644 --- a/services/velero/5.2.2/velero-post-install.yaml +++ b/services/velero/6.0.0/velero-post-install.yaml @@ -12,7 +12,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/velero/5.2.2/post-install + path: ./services/velero/6.0.0/post-install sourceRef: kind: GitRepository name: management diff --git a/services/velero/5.2.2/velero-pre-install.yaml b/services/velero/6.0.0/velero-pre-install.yaml similarity index 92% rename from services/velero/5.2.2/velero-pre-install.yaml rename to services/velero/6.0.0/velero-pre-install.yaml index 6fbab0a80..a23b33bf0 100644 --- a/services/velero/5.2.2/velero-pre-install.yaml +++ b/services/velero/6.0.0/velero-pre-install.yaml @@ -9,7 +9,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/velero/5.2.2/pre-install + path: ./services/velero/6.0.0/pre-install sourceRef: kind: GitRepository name: management diff --git a/services/velero/5.2.2/velero-v4-hooks-adoption.yaml b/services/velero/6.0.0/velero-v4-hooks-adoption.yaml similarity index 92% rename from services/velero/5.2.2/velero-v4-hooks-adoption.yaml rename to services/velero/6.0.0/velero-v4-hooks-adoption.yaml index c923c8d1b..1fae81561 100644 --- a/services/velero/5.2.2/velero-v4-hooks-adoption.yaml +++ b/services/velero/6.0.0/velero-v4-hooks-adoption.yaml @@ -12,7 +12,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/velero/5.2.2/v4-hooks-adoption + path: ./services/velero/6.0.0/v4-hooks-adoption sourceRef: kind: GitRepository name: management diff --git a/services/velero/5.2.2/velero.yaml b/services/velero/6.0.0/velero.yaml similarity index 91% rename from services/velero/5.2.2/velero.yaml rename to services/velero/6.0.0/velero.yaml index 5f848e127..2ce97b039 100644 --- a/services/velero/5.2.2/velero.yaml +++ b/services/velero/6.0.0/velero.yaml @@ -12,7 +12,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/velero/5.2.2/helmrelease + path: ./services/velero/6.0.0/helmrelease sourceRef: kind: GitRepository name: management