Skip to content

Commit

Permalink
Merge branch 'main' into vector-add
Browse files Browse the repository at this point in the history
  • Loading branch information
mjnagel committed Sep 23, 2024
2 parents df6378c + d07670b commit 9851933
Show file tree
Hide file tree
Showing 14 changed files with 32 additions and 27 deletions.
4 changes: 2 additions & 2 deletions .github/actions/lint-check/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ runs:
using: composite
steps:
- name: Use Node.js latest
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
with:
node-version: 20
- name: Set up Homebrew
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.15.0
run: brew install defenseunicorns/tap/uds@0.16.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 @@ -19,7 +19,7 @@ runs:
using: "composite"
steps:
- name: Use Node.js latest
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
with:
node-version: 20

Expand All @@ -34,7 +34,7 @@ runs:
- name: Install UDS CLI
shell: bash
# renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
run: brew install defenseunicorns/tap/uds@0.15.0
run: brew install defenseunicorns/tap/uds@0.16.0

- name: Install Lula
uses: defenseunicorns/lula-action/setup@badad8c4b1570095f57e66ffd62664847698a3b9 # v0.0.1
Expand Down
2 changes: 1 addition & 1 deletion .github/bundles/uds-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
packages:
- name: init
repository: ghcr.io/zarf-dev/packages/init
ref: v0.39.0
ref: v0.40.1

- name: core
path: ../../build/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/commitlint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
fetch-depth: 0

- name: Setup Node.js
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4

- name: Install commitlint
run: |
Expand Down
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.15.0/uds.schema.json": [
"https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.16.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.15.0/tasks.schema.json": [
"https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.16.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.15.0/zarf.schema.json": [
"https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.16.0/zarf.schema.json": [
"zarf.yaml"
]
},
Expand Down
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 @@ -29,7 +29,7 @@ packages:

- name: init
repository: ghcr.io/zarf-dev/packages/init
ref: v0.39.0
ref: v0.40.1

- name: core-slim-dev
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 @@ -29,7 +29,7 @@ packages:

- name: init
repository: ghcr.io/zarf-dev/packages/init
ref: v0.39.0
ref: v0.40.1

- name: core
path: ../../build/
Expand Down
7 changes: 6 additions & 1 deletion renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@
"groupName": "grafana",
"commitMessageTopic": "grafana"
},
{
"matchFileNames": ["src/runtime/**"],
"groupName": "runtime",
"commitMessageTopic": "runtime"
},
{
"matchPackageNames": ["zarf-dev/zarf", "ghcr.io/zarf-dev/packages/init"],
"groupName": "zarf",
Expand All @@ -89,7 +94,7 @@
},
{
"matchFileNames": [".github/workflows/**", ".github/actions/**"],
"excludePackageNames": ["zarf-dev/zarf", "defenseunicorns/uds-cli"],
"matchPackageNames": ["*", "!zarf-dev/zarf", "!defenseunicorns/uds-cli", "!defenseunicorns/lula", "!k3d-io/k3d"],
"groupName": "githubactions",
"commitMessageTopic": "githubactions",
"pinDigests": true
Expand Down
4 changes: 2 additions & 2 deletions src/prometheus-stack/tasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ tasks:
# - name: gen-crds
# actions:
# - description: Generate servicemonitor types
# cmd: "npx kubernetes-fluent-client crd https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.76.2/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml src/pepr/operator/crd/generated/prometheus"
# cmd: "npx kubernetes-fluent-client crd https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.77.0/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml src/pepr/operator/crd/generated/prometheus"
# - description: Generate podmonitor types
# cmd: "npx kubernetes-fluent-client crd https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.76.2/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml src/pepr/operator/crd/generated/prometheus"
# cmd: "npx kubernetes-fluent-client crd https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.77.0/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml src/pepr/operator/crd/generated/prometheus"
# - description: Pepr Format
# cmd: "npx pepr format"
4 changes: 2 additions & 2 deletions src/prometheus-stack/values/registry1-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ prometheusOperator:
image:
registry: registry1.dso.mil
repository: ironbank/opensource/prometheus-operator/prometheus-operator
tag: v0.76.2
tag: v0.77.0
prometheusConfigReloader:
image:
registry: registry1.dso.mil
repository: ironbank/opensource/prometheus-operator/prometheus-config-reloader
tag: v0.76.2
tag: v0.77.0
4 changes: 2 additions & 2 deletions src/prometheus-stack/values/unicorn-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ prometheusOperator:
image:
registry: cgr.dev
repository: du-uds-defenseunicorns/prometheus-operator-fips
tag: 0.76.2
tag: 0.77.0
prometheusConfigReloader:
image:
registry: cgr.dev
repository: du-uds-defenseunicorns/prometheus-config-reloader-fips
tag: 0.76.2
tag: 0.77.0
4 changes: 2 additions & 2 deletions src/prometheus-stack/values/upstream-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ prometheusOperator:
image:
registry: quay.io
repository: prometheus-operator/prometheus-operator
tag: v0.76.2
tag: v0.77.0
prometheusConfigReloader:
image:
registry: quay.io
repository: prometheus-operator/prometheus-config-reloader
tag: v0.76.2
tag: v0.77.0
12 changes: 6 additions & 6 deletions src/prometheus-stack/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ components:
- "values/upstream-values.yaml"
images:
- "quay.io/prometheus/node-exporter:v1.8.2"
- "quay.io/prometheus-operator/prometheus-operator:v0.76.2"
- "quay.io/prometheus-operator/prometheus-operator:v0.77.0"
- "registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.13.0"
- "quay.io/prometheus/alertmanager:v0.27.0"
- "quay.io/prometheus-operator/prometheus-config-reloader:v0.76.2"
- "quay.io/prometheus-operator/prometheus-config-reloader:v0.77.0"
- "quay.io/prometheus/prometheus:v2.54.1"
- "registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.4.3"

Expand All @@ -48,10 +48,10 @@ components:
- "values/registry1-values.yaml"
images:
- "registry1.dso.mil/ironbank/opensource/prometheus/node-exporter:v1.8.2"
- "registry1.dso.mil/ironbank/opensource/prometheus-operator/prometheus-operator:v0.76.2"
- "registry1.dso.mil/ironbank/opensource/prometheus-operator/prometheus-operator:v0.77.0"
- "registry1.dso.mil/ironbank/opensource/kubernetes/kube-state-metrics:v2.13.0"
- "registry1.dso.mil/ironbank/opensource/prometheus/alertmanager:v0.27.0"
- "registry1.dso.mil/ironbank/opensource/prometheus-operator/prometheus-config-reloader:v0.76.2"
- "registry1.dso.mil/ironbank/opensource/prometheus-operator/prometheus-config-reloader:v0.77.0"
- "registry1.dso.mil/ironbank/opensource/prometheus/prometheus:v2.54.1"
- "registry1.dso.mil/ironbank/opensource/ingress-nginx/kube-webhook-certgen:v1.4.3"

Expand All @@ -68,9 +68,9 @@ components:
- "values/unicorn-values.yaml"
images:
- "cgr.dev/du-uds-defenseunicorns/prometheus-node-exporter-fips:1.8.2"
- "cgr.dev/du-uds-defenseunicorns/prometheus-operator-fips:0.76.2"
- "cgr.dev/du-uds-defenseunicorns/prometheus-operator-fips:0.77.0"
- "cgr.dev/du-uds-defenseunicorns/kube-state-metrics-fips:2.13.0"
- "cgr.dev/du-uds-defenseunicorns/prometheus-alertmanager-fips:0.27.0"
- "cgr.dev/du-uds-defenseunicorns/prometheus-config-reloader-fips:0.76.2"
- "cgr.dev/du-uds-defenseunicorns/prometheus-config-reloader-fips:0.77.0"
- "cgr.dev/du-uds-defenseunicorns/prometheus-fips:2.54.1"
- "cgr.dev/du-uds-defenseunicorns/kube-webhook-certgen-fips:1.11.2"
2 changes: 1 addition & 1 deletion tasks/setup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,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.39.0 --confirm --no-progress"
cmd: "uds zarf package deploy oci://ghcr.io/zarf-dev/packages/init:v0.40.1 --confirm --no-progress"

0 comments on commit 9851933

Please sign in to comment.