Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/install-tools/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ runs:
- run: "curl -sSfL https://raw.githubusercontent.com/anchore/grype/main/install.sh | sh -s -- -b /usr/local/bin"
shell: bash

- uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
- uses: docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e # v4.3.0
6 changes: 3 additions & 3 deletions .github/actions/mise/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ description: Install the repository-pinned development tools
runs:
using: composite
steps:
- uses: jdx/mise-action@7e36c90d9ab29c415a2384db3006f3ec8a8cc654 # v4.2.4
- uses: jdx/mise-action@3c2e0cf82a5b2e5249f0d3635a4d83d0ae861518 # v4.2.5
with:
# renovate: datasource=github-releases depName=jdx/mise versioning=semver
version: 2026.8.2
version: 2026.8.14
install: true
cache: true

Expand All @@ -23,7 +23,7 @@ runs:
echo "version=$(go env GOVERSION)" >> "$GITHUB_OUTPUT"

- name: Cache Go dependencies and build artifacts
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
with:
path: |
${{ steps.go-cache.outputs.mod }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/scan-codeql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
run: uds run build-cli-linux-amd

- name: Initialize CodeQL
uses: github/codeql-action/init@d1ba80a13dd99fba24a470575428917156a28b43 # v4.37.5
uses: github/codeql-action/init@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4.37.8
env:
CODEQL_EXTRACTOR_GO_BUILD_TRACING: on
with:
Expand All @@ -62,6 +62,6 @@ jobs:


- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@d1ba80a13dd99fba24a470575428917156a28b43 # v4.37.5
uses: github/codeql-action/analyze@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4.37.8
with:
category: "/language:${{matrix.language}}"
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@d1ba80a13dd99fba24a470575428917156a28b43 # v4.37.5
uses: github/codeql-action/upload-sarif@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4.37.8
with:
sarif_file: results.sarif
6 changes: 3 additions & 3 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ jobs:
uses: ./.github/actions/setup-uds-e2e

- name: Login to GHCR
uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand Down Expand Up @@ -408,7 +408,7 @@ jobs:
create-cluster: "false"

- name: Login to GHCR
uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand Down Expand Up @@ -444,7 +444,7 @@ jobs:
create-cluster: "false"

- name: Login to GHCR
uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand Down
4 changes: 2 additions & 2 deletions mise.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

[tools]
go = "1.27.0"
hk = "1.54.0"
hk = "1.56.1"
jq = "1.8.2"
golangci-lint = "2.13.1"
"github:goreleaser/goreleaser" = "2.17.1"
Expand All @@ -13,7 +13,7 @@ node = "24.19.0"
# renovate: datasource=github-tags depName=google/addlicense versioning=semver
"aqua:google/addlicense" = "1.2.0"
# renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
"aqua:defenseunicorns/uds-cli" = "0.35.0"
"aqua:defenseunicorns/uds-cli" = "0.36.0"

[env]
MISE_USE_VERSIONS_HOST_TRACK = "0"
9 changes: 9 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,15 @@
],
"datasourceTemplate": "docker",
"versioningTemplate": "regex:^v?(?<major>\\d+)(\\.(?<minor>\\d+))?(\\.(?<patch>\\d+))?(-uds\\.(?<build>\\d+))?(-(?<compatibility>\\w+)?)?(.*?)?$"
},
{
"customType": "regex",
"description": "Matches inline Renovate comments for UDS Core version pins.",
"managerFilePatterns": ["/(^|/)(tests|docs|tasks|\\.github)/.*$/"],
"matchStrings": [
"// renovate: datasource=(?<datasource>docker|github-tags) depName=(?<depName>defenseunicorns/uds-core|ghcr\\.io/defenseunicorns/packages/uds/core)(?: extractVersion=(?<extractVersion>\\S+))? versioning=(?<versioning>\\S+)\\s+(?:version\\s+=|assert\\.Contains\\(t, bundleDefinition,)\\s+\"(?<currentValue>[^\"]+)\""
],
"extractVersionTemplate": "{{#if extractVersion}}{{{extractVersion}}}{{/if}}"
}
]
}
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:
- common: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.27.1/tasks/lint.yaml
- common: https://raw.githubusercontent.com/defenseunicorns/uds-common/v1.28.0/tasks/lint.yaml

tasks:
- name: license
Expand Down
2 changes: 1 addition & 1 deletion testdata/legacy/packages/gitrepo/refs/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ spec:
spec:
containers:
- name: nginx
image: docker.io/library/nginx:1.31.3
image: docker.io/library/nginx:1.31.4
ports:
- containerPort: 80
2 changes: 1 addition & 1 deletion testdata/legacy/packages/gitrepo/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ components:
namespace: nginx
condition: available
images:
- docker.io/library/nginx:1.31.3
- docker.io/library/nginx:1.31.4
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ spec:
spec:
containers:
- name: nginx
image: nginx:1.31.3
image: nginx:1.31.4
ports:
- containerPort: 80
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ components:
files:
- refs/deployment.yaml
images:
- nginx:1.31.3
- nginx:1.31.4
2 changes: 1 addition & 1 deletion testdata/legacy/packages/nginx/refs/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ spec:
spec:
containers:
- name: nginx
image: nginx:1.31.3
image: nginx:1.31.4
ports:
- containerPort: 80
2 changes: 1 addition & 1 deletion testdata/legacy/packages/nginx/refs/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ components:
namespace: nginx
condition: available
images:
- nginx:1.31.3 # use shorthand for nginx!
- nginx:1.31.4 # use shorthand for nginx!
2 changes: 1 addition & 1 deletion testdata/legacy/packages/nginx/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ components:
namespace: nginx
condition: available
images:
- nginx:1.31.3 # use shorthand for nginx!
- nginx:1.31.4 # use shorthand for nginx!
3 changes: 2 additions & 1 deletion tests/integration/cmd/bundle/create_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -242,5 +242,6 @@ func TestCreate_UDSCoreStandardBundle(t *testing.T) {
for _, component := range []string{"istio-passthrough-gateway", "istio-egress-gateway", "envoy-gateway", "envoy-default-gateway"} {
assert.Contains(t, bundleDefinition, component, "standard should preserve upstream optional components")
}
assert.Contains(t, bundleDefinition, "1.9.0-upstream", "standard should target the released core package tag")
// renovate: datasource=docker depName=ghcr.io/defenseunicorns/packages/uds/core versioning=docker
assert.Contains(t, bundleDefinition, "1.11.1-upstream", "standard should target the released core package tag")
}
2 changes: 1 addition & 1 deletion tests/test_data/bundles/spec-compliant/bundle.uds.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ metadata {
locals {
repo = "ghcr.io/defenseunicorns/packages/uds"
// renovate: datasource=docker depName=ghcr.io/defenseunicorns/packages/uds/core versioning=docker
version = "1.9.0-upstream"
version = "1.11.1-upstream"

pkgs = {
base = "core-base"
Expand Down
4 changes: 2 additions & 2 deletions tests/test_data/bundles/uds-core/standard/bundle.uds.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ metadata {
name = "k3d-core-demo"
description = "A UDS bundle for deploying the standard UDS Core package on a development cluster"
// renovate: datasource=github-tags depName=defenseunicorns/uds-core extractVersion=^v?(?<version>.*)$ versioning=semver
version = "1.9.0"
version = "1.11.1"
}

locals {
uds_repo = "ghcr.io/defenseunicorns/packages/uds"
k3d_repo = "ghcr.io/defenseunicorns/packages"
// renovate: datasource=docker depName=ghcr.io/defenseunicorns/packages/uds/core versioning=docker
core_version = "1.9.0-upstream"
core_version = "1.11.1-upstream"
// renovate: datasource=docker depName=ghcr.io/defenseunicorns/packages/uds-k3d versioning=docker
k3d_version = "0.20.2-airgap"
// renovate: datasource=docker depName=ghcr.io/zarf-dev/packages/init versioning=docker
Expand Down
Loading