Skip to content

Commit

Permalink
Merge branch 'main' into gotta-go-fast
Browse files Browse the repository at this point in the history
  • Loading branch information
mjnagel authored Nov 9, 2024
2 parents 0abad6e + 7a1c74e commit a4c50a9
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/actions/lint-check/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ runs:
uses: Homebrew/actions/setup-homebrew@master
- name: Install UDS CLI
# renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
run: brew install defenseunicorns/tap/uds@0.18.0
run: brew install defenseunicorns/tap/uds@0.19.0
shell: bash
- name: Run Formatting Checks
run: uds run lint-check --no-progress
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/setup/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ runs:
uses: defenseunicorns/setup-uds@b987a32bac3baeb67bfb08f5e1544e2f9076ee8a # v1.0.0
with:
# renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
version: v0.18.0
version: v0.19.0

- name: Install Lula
uses: defenseunicorns/lula-action/setup@badad8c4b1570095f57e66ffd62664847698a3b9 # v0.0.1
with:
# renovate: datasource=github-tags depName=defenseunicorns/lula versioning=semver-coerced
version: v0.10.0
version: v0.11.0

- name: Iron Bank Login
if: ${{ inputs.registry1Username != '' }}
Expand Down
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.42.1
ref: v0.42.2

- 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.42.1
ref: v0.42.2

- 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.42.1
ref: v0.42.2
overrides:
zarf-registry:
docker-registry:
Expand Down
2 changes: 1 addition & 1 deletion .github/test-infra/aws/rke2/irsa.tf
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ resource "aws_secretsmanager_secret_version" "private_key" {
# Public bucket to host OIDC files
module "oidc_bucket" {
source = "terraform-aws-modules/s3-bucket/aws"
version = "4.2.1"
version = "4.2.2"

bucket = "${var.environment}-oidc-${random_string.ssm.result}"
force_destroy = var.force_destroy
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.74.0"
version = "~> 5.75.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@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
uses: github/codeql-action/upload-sarif@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
with:
sarif_file: results.sarif
6 changes: 3 additions & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@
},
"yaml.schemas": {
// renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
"https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.18.0/uds.schema.json": [
"https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.19.0/uds.schema.json": [
"uds-bundle.yaml"
],
// renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
"https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.18.0/tasks.schema.json": [
"https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.19.0/tasks.schema.json": [
"tasks.yaml",
"tasks/**/*.yaml",
"src/**/validate.yaml"
],
// renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
"https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.18.0/zarf.schema.json": [
"https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.19.0/zarf.schema.json": [
"zarf.yaml"
]
},
Expand Down
4 changes: 2 additions & 2 deletions bundles/k3d-slim-dev/uds-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ metadata:
packages:
- name: uds-k3d-dev
repository: ghcr.io/defenseunicorns/packages/uds-k3d
ref: 0.9.0
ref: 0.10.1
overrides:
uds-dev-stack:
minio:
Expand All @@ -32,7 +32,7 @@ packages:

- name: init
repository: ghcr.io/zarf-dev/packages/init
ref: v0.42.1
ref: v0.42.2

- name: core-base
path: ../../build/
Expand Down
4 changes: 2 additions & 2 deletions bundles/k3d-standard/uds-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ metadata:
packages:
- name: uds-k3d-dev
repository: ghcr.io/defenseunicorns/packages/uds-k3d
ref: 0.9.0
ref: 0.10.1
overrides:
uds-dev-stack:
minio:
Expand All @@ -32,7 +32,7 @@ packages:

- name: init
repository: ghcr.io/zarf-dev/packages/init
ref: v0.42.1
ref: v0.42.2

- name: core
path: ../../build/
Expand Down
4 changes: 2 additions & 2 deletions tasks/setup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ tasks:
actions:
- description: "Create the K3d cluster"
# renovate: datasource=github-tags depName=defenseunicorns/uds-k3d versioning=semver
cmd: "uds zarf package deploy oci://defenseunicorns/uds-k3d:0.9.0 --confirm --no-progress"
cmd: "uds zarf package deploy oci://defenseunicorns/uds-k3d:0.10.1 --confirm --no-progress"

- name: k3d-test-cluster
actions:
- task: create-k3d-cluster

- 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.42.1 --confirm --no-progress"
cmd: "uds zarf package deploy oci://ghcr.io/zarf-dev/packages/init:v0.42.2 --confirm --no-progress"

0 comments on commit a4c50a9

Please sign in to comment.