Skip to content

Commit

Permalink
Merge branch 'main' into reduce-nightly-ci
Browse files Browse the repository at this point in the history
  • Loading branch information
mjnagel authored Dec 14, 2024
2 parents a735d58 + 5b2e3a4 commit ed116f6
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/bundles/aks/uds-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ metadata:
packages:
- name: init
repository: ghcr.io/zarf-dev/packages/init
ref: v0.44.0
ref: v0.45.0

- name: core
path: ../../../build
Expand Down
2 changes: 1 addition & 1 deletion .github/bundles/eks/uds-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ metadata:
packages:
- name: init
repository: ghcr.io/zarf-dev/packages/init
ref: v0.44.0
ref: v0.45.0

- name: core
path: ../../../build
Expand Down
2 changes: 1 addition & 1 deletion .github/bundles/rke2/uds-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ packages:

- name: init
repository: ghcr.io/zarf-dev/packages/init
ref: v0.44.0
ref: v0.45.0
overrides:
zarf-registry:
docker-registry:
Expand Down
2 changes: 1 addition & 1 deletion .github/test-infra/aws/rke2/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ terraform {
}
required_providers {
aws = {
version = "~> 5.80.0"
version = "~> 5.81.0"
}
random = {
version = "~> 3.6.0"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: Upload to code-scanning
uses: github/codeql-action/upload-sarif@babb554ede22fd5605947329c4d04d8e7a0b8155 # v3.27.7
uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
with:
sarif_file: results.sarif
2 changes: 1 addition & 1 deletion bundles/k3d-slim-dev/uds-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ packages:

- name: init
repository: ghcr.io/zarf-dev/packages/init
ref: v0.44.0
ref: v0.45.0

- name: core-base
path: ../../build/
Expand Down
2 changes: 1 addition & 1 deletion bundles/k3d-standard/uds-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ packages:

- name: init
repository: ghcr.io/zarf-dev/packages/init
ref: v0.44.0
ref: v0.45.0

- name: core
path: ../../build/
Expand Down
2 changes: 1 addition & 1 deletion tasks/create.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@


includes:
- common: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.5.1/tasks/create.yaml
- common: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.6.0/tasks/create.yaml

variables:
- name: FLAVOR
Expand Down
2 changes: 1 addition & 1 deletion tasks/iac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ tasks:
- name: install-eksctl
actions:
- cmd: |
curl --silent --location "https://github.com/weaveworks/eksctl/releases/download/v0.198.0/eksctl_Linux_amd64.tar.gz" | tar xz -C /tmp
curl --silent --location "https://github.com/weaveworks/eksctl/releases/download/v0.199.0/eksctl_Linux_amd64.tar.gz" | tar xz -C /tmp
sudo mv /tmp/eksctl /usr/local/bin
- name: create-cluster
Expand Down
2 changes: 1 addition & 1 deletion tasks/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial

includes:
- remote: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.5.1/tasks/lint.yaml
- remote: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.6.0/tasks/lint.yaml

tasks:
- name: fix
Expand Down
2 changes: 1 addition & 1 deletion tasks/setup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ tasks:

- description: "Initialize the cluster with Zarf"
# renovate: datasource=github-tags depName=zarf-dev/zarf versioning=semver
cmd: "uds zarf package deploy oci://ghcr.io/zarf-dev/packages/init:v0.44.0 --confirm --no-progress"
cmd: "uds zarf package deploy oci://ghcr.io/zarf-dev/packages/init:v0.45.0 --confirm --no-progress"
2 changes: 1 addition & 1 deletion tasks/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ includes:
- base-layer: ../packages/base/tasks.yaml
- idam-layer: ../packages/identity-authorization/tasks.yaml
- common-setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/refs/tags/v0.13.1/tasks/setup.yaml
- compliance: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.5.1/tasks/compliance.yaml
- compliance: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.6.0/tasks/compliance.yaml

tasks:
- name: base
Expand Down

0 comments on commit ed116f6

Please sign in to comment.