Skip to content

Commit 6fb8cb4

Browse files
authoredMay 30, 2022
Depencency updates (zarf-dev#495)
1 parent b0602d6 commit 6fb8cb4

File tree

8 files changed

+652
-468
lines changed

8 files changed

+652
-468
lines changed
 

‎go.mod

+127-105
Large diffs are not rendered by default.

‎go.sum

+504-341
Large diffs are not rendered by default.

‎packages/distros/k3s/zarf.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ components:
2424
- "systemctl enable --now k3s"
2525
files:
2626
# Include the actual K3s binary
27-
- source: https://github.com/k3s-io/k3s/releases/download/v1.21.6+k3s1/k3s
28-
shasum: 89eb5f3d12524d0a9d5b56ba3e2707b106e1731dd0e6d2e7b898ac585f4959df
27+
- source: https://github.com/k3s-io/k3s/releases/download/v1.23.6+k3s1/k3s
28+
shasum: a60e039130faf2f0d349a79738e185616fd8e74ab9e0e356ce8127216fd8f9c4
2929
target: /usr/sbin/k3s
3030
executable: true
3131
# K3s magic provides these tools when symlinking
@@ -34,8 +34,8 @@ components:
3434
- /usr/sbin/ctr
3535
- /usr/sbin/crictl
3636
# Transfer the K3s images for containerd to pick them up
37-
- source: https://github.com/k3s-io/k3s/releases/download/v1.21.6+k3s1/k3s-airgap-images-amd64.tar.zst
38-
shasum: 772ae839f8c7718e2022d103076df53452d4f09d2a22afdf4b5796cf0cbce62c
37+
- source: https://github.com/k3s-io/k3s/releases/download/v1.23.6+k3s1/k3s-airgap-images-amd64.tar.zst
38+
shasum: c6b720bc0048d38a187236bc799ed7390422fb278ae7e8b119f81f4795ea33e5
3939
target: /var/lib/rancher/k3s/agent/images/k3s.tar.zst
4040
# K3s removal script
4141
- source: assets/zarf-clean-k3s.sh

‎packages/gitea/gitea-values.yaml

+6-7
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ gitea:
55
username: "zarf-git-user"
66
password: "###ZARF_GIT_AUTH_PUSH###"
77
email: "zarf@localhost"
8-
cache:
9-
builtIn:
10-
enabled: false
118
config:
129
APP_NAME: "Zarf Gitops Service"
1310
server:
@@ -24,14 +21,16 @@ gitea:
2421
repository:
2522
ENABLE_PUSH_CREATE_USER: true
2623
FORCE_PRIVATE: true
27-
database:
28-
builtIn:
29-
postgresql:
30-
enabled: false
3124
resources:
3225
requests:
3326
cpu: "200m"
3427
memory: "512Mi"
3528
limits:
3629
cpu: "1"
3730
memory: "2Gi"
31+
32+
memcached:
33+
enabled: false
34+
35+
postgresql:
36+
enabled: false

‎packages/gitea/zarf.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ components:
66
- name: git-server
77
description: "Add Gitea for serving gitops-based clusters in an airgap"
88
images:
9-
- gitea/gitea:1.13.7
9+
- gitea/gitea:1.16.8
1010
charts:
1111
- name: gitea
1212
url: https://dl.gitea.io/charts
13-
version: 2.2.5
13+
version: 5.0.8
1414
namespace: zarf
1515
valuesFiles:
1616
- gitea-values.yaml

‎packages/logging-pgl/zarf.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ components:
66
- name: logging
77
description: "Add Promtail, Grafana and Loki (PGL) to this cluster for log monitoring."
88
images:
9-
- grafana/grafana:8.1.6
10-
- grafana/loki:2.4.1
11-
- grafana/promtail:2.1.0
12-
- quay.io/kiwigrid/k8s-sidecar:1.12.3
9+
- docker.io/grafana/promtail:2.4.2
10+
- grafana/grafana:8.3.5
11+
- grafana/loki:2.5.0
12+
- quay.io/kiwigrid/k8s-sidecar:1.15.6
1313
charts:
1414
- name: loki-stack
1515
url: https://grafana.github.io/helm-charts
16-
version: 2.5.1
16+
version: 2.6.4
1717
namespace: zarf
1818
valuesFiles:
1919
- pgl-values.yaml

‎packages/zarf-agent/zarf.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ components:
77
- name: zarf-agent
88
required: true
99
images:
10-
- "defenseunicorns/zarf-agent:v0.19.0"
10+
- "defenseunicorns/zarf-agent:v0.19.1"
1111
variables:
12-
tag: "v0.19.0"
12+
tag: "v0.19.1"
1313
manifests:
1414
- name: zarf-agent
1515
namespace: zarf

‎src/internal/sbom/catalog.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616
"github.com/google/go-containerregistry/pkg/name"
1717
v1 "github.com/google/go-containerregistry/pkg/v1"
1818
"github.com/google/go-containerregistry/pkg/v1/tarball"
19-
"github.com/testifysec/witness/pkg/attestation"
20-
"github.com/testifysec/witness/pkg/attestation/syft"
19+
"github.com/testifysec/go-witness/attestation"
20+
"github.com/testifysec/go-witness/attestation/syft"
2121
)
2222

2323
//go:embed viewer/*

0 commit comments

Comments
 (0)