Skip to content

Commit

Permalink
Merge branch 'main' into docs/irsa-config
Browse files Browse the repository at this point in the history
  • Loading branch information
noahpb authored Jan 17, 2025
2 parents 38f4126 + 00e89ff commit 81b6fb2
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/grafana/common/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ components:
- ../chart/values.yaml
- name: grafana
url: https://grafana.github.io/helm-charts/
version: 8.8.3
version: 8.8.4
namespace: grafana
valuesFiles:
- ../values/values.yaml
Expand Down
2 changes: 1 addition & 1 deletion src/velero/common/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ components:
- name: velero
namespace: velero
url: https://vmware-tanzu.github.io/helm-charts
version: 8.2.0
version: 8.3.0
repoName: velero
releaseName: velero
valuesFiles:
Expand Down
2 changes: 1 addition & 1 deletion src/velero/values/registry1-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

image:
repository: registry1.dso.mil/ironbank/opensource/velero/velero
tag: v1.15.1
tag: v1.15.2

kubectl:
image:
Expand Down
4 changes: 2 additions & 2 deletions src/velero/values/unicorn-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@

image:
repository: cgr.dev/du-uds-defenseunicorns/velero-fips
tag: 1.15.1-dev
tag: 1.15.2-dev

kubectl:
image:
repository: cgr.dev/du-uds-defenseunicorns/kubectl-fips
tag: 1.32.0-dev
tag: 1.32.1-dev

initContainers:
- name: velero-plugin-for-aws
Expand Down
4 changes: 2 additions & 2 deletions src/velero/values/upstream-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@

image:
repository: velero/velero
tag: v1.15.1
tag: v1.15.2

kubectl:
image:
repository: docker.io/bitnami/kubectl
tag: 1.32.0
tag: 1.32.1

initContainers:
- name: velero-plugin-for-aws
Expand Down
10 changes: 5 additions & 5 deletions src/velero/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ components:
valuesFiles:
- values/upstream-values.yaml
images:
- velero/velero:v1.15.1
- velero/velero:v1.15.2
- velero/velero-plugin-for-aws:v1.11.1
- docker.io/bitnami/kubectl:1.32.0
- docker.io/bitnami/kubectl:1.32.1
- velero/velero-plugin-for-microsoft-azure:v1.11.1

- name: velero
Expand All @@ -35,7 +35,7 @@ components:
valuesFiles:
- values/registry1-values.yaml
images:
- registry1.dso.mil/ironbank/opensource/velero/velero:v1.15.1
- registry1.dso.mil/ironbank/opensource/velero/velero:v1.15.2
- registry1.dso.mil/ironbank/opensource/velero/velero-plugin-for-aws:v1.11.1
- registry1.dso.mil/ironbank/big-bang/base:2.1.0
- registry1.dso.mil/ironbank/opensource/velero/velero-plugin-for-microsoft-azure:v1.11.1
Expand All @@ -51,7 +51,7 @@ components:
valuesFiles:
- values/unicorn-values.yaml
images:
- cgr.dev/du-uds-defenseunicorns/velero-fips:1.15.1-dev
- cgr.dev/du-uds-defenseunicorns/velero-fips:1.15.2-dev
- cgr.dev/du-uds-defenseunicorns/velero-plugin-for-aws-fips:1.11.1
- cgr.dev/du-uds-defenseunicorns/kubectl-fips:1.32.0-dev
- cgr.dev/du-uds-defenseunicorns/kubectl-fips:1.32.1-dev
- velero/velero-plugin-for-microsoft-azure:v1.11.1

0 comments on commit 81b6fb2

Please sign in to comment.