Skip to content

Commit

Permalink
Depencency updates (#495)
Browse files Browse the repository at this point in the history
  • Loading branch information
jeff-mccoy authored May 30, 2022
1 parent b0602d6 commit 6fb8cb4
Show file tree
Hide file tree
Showing 8 changed files with 652 additions and 468 deletions.
232 changes: 127 additions & 105 deletions go.mod

Large diffs are not rendered by default.

845 changes: 504 additions & 341 deletions go.sum

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions packages/distros/k3s/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ components:
- "systemctl enable --now k3s"
files:
# Include the actual K3s binary
- source: https://github.com/k3s-io/k3s/releases/download/v1.21.6+k3s1/k3s
shasum: 89eb5f3d12524d0a9d5b56ba3e2707b106e1731dd0e6d2e7b898ac585f4959df
- source: https://github.com/k3s-io/k3s/releases/download/v1.23.6+k3s1/k3s
shasum: a60e039130faf2f0d349a79738e185616fd8e74ab9e0e356ce8127216fd8f9c4
target: /usr/sbin/k3s
executable: true
# K3s magic provides these tools when symlinking
Expand All @@ -34,8 +34,8 @@ components:
- /usr/sbin/ctr
- /usr/sbin/crictl
# Transfer the K3s images for containerd to pick them up
- source: https://github.com/k3s-io/k3s/releases/download/v1.21.6+k3s1/k3s-airgap-images-amd64.tar.zst
shasum: 772ae839f8c7718e2022d103076df53452d4f09d2a22afdf4b5796cf0cbce62c
- source: https://github.com/k3s-io/k3s/releases/download/v1.23.6+k3s1/k3s-airgap-images-amd64.tar.zst
shasum: c6b720bc0048d38a187236bc799ed7390422fb278ae7e8b119f81f4795ea33e5
target: /var/lib/rancher/k3s/agent/images/k3s.tar.zst
# K3s removal script
- source: assets/zarf-clean-k3s.sh
Expand Down
13 changes: 6 additions & 7 deletions packages/gitea/gitea-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ gitea:
username: "zarf-git-user"
password: "###ZARF_GIT_AUTH_PUSH###"
email: "zarf@localhost"
cache:
builtIn:
enabled: false
config:
APP_NAME: "Zarf Gitops Service"
server:
Expand All @@ -24,14 +21,16 @@ gitea:
repository:
ENABLE_PUSH_CREATE_USER: true
FORCE_PRIVATE: true
database:
builtIn:
postgresql:
enabled: false
resources:
requests:
cpu: "200m"
memory: "512Mi"
limits:
cpu: "1"
memory: "2Gi"

memcached:
enabled: false

postgresql:
enabled: false
4 changes: 2 additions & 2 deletions packages/gitea/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ components:
- name: git-server
description: "Add Gitea for serving gitops-based clusters in an airgap"
images:
- gitea/gitea:1.13.7
- gitea/gitea:1.16.8
charts:
- name: gitea
url: https://dl.gitea.io/charts
version: 2.2.5
version: 5.0.8
namespace: zarf
valuesFiles:
- gitea-values.yaml
Expand Down
10 changes: 5 additions & 5 deletions packages/logging-pgl/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ components:
- name: logging
description: "Add Promtail, Grafana and Loki (PGL) to this cluster for log monitoring."
images:
- grafana/grafana:8.1.6
- grafana/loki:2.4.1
- grafana/promtail:2.1.0
- quay.io/kiwigrid/k8s-sidecar:1.12.3
- docker.io/grafana/promtail:2.4.2
- grafana/grafana:8.3.5
- grafana/loki:2.5.0
- quay.io/kiwigrid/k8s-sidecar:1.15.6
charts:
- name: loki-stack
url: https://grafana.github.io/helm-charts
version: 2.5.1
version: 2.6.4
namespace: zarf
valuesFiles:
- pgl-values.yaml
4 changes: 2 additions & 2 deletions packages/zarf-agent/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ components:
- name: zarf-agent
required: true
images:
- "defenseunicorns/zarf-agent:v0.19.0"
- "defenseunicorns/zarf-agent:v0.19.1"
variables:
tag: "v0.19.0"
tag: "v0.19.1"
manifests:
- name: zarf-agent
namespace: zarf
Expand Down
4 changes: 2 additions & 2 deletions src/internal/sbom/catalog.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"github.com/google/go-containerregistry/pkg/name"
v1 "github.com/google/go-containerregistry/pkg/v1"
"github.com/google/go-containerregistry/pkg/v1/tarball"
"github.com/testifysec/witness/pkg/attestation"
"github.com/testifysec/witness/pkg/attestation/syft"
"github.com/testifysec/go-witness/attestation"
"github.com/testifysec/go-witness/attestation/syft"
)

//go:embed viewer/*
Expand Down

0 comments on commit 6fb8cb4

Please sign in to comment.