Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade containerd to v1.5.7 because of a CVE + upgrade dependencies #133

Merged
merged 1 commit into from
Oct 20, 2021
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/workflows/build-push-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
steps:
-
name: Checkout
uses: actions/[email protected].4
uses: actions/[email protected].5
-
name: Prepare
id: prep
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/go-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
with:
go-version: ${{ matrix.go-version }}
- name: Checkout code
uses: actions/[email protected].4
uses: actions/[email protected].5
- name: Download envtest dependencies
uses: teddyking/[email protected]
with:
Expand All @@ -39,6 +39,6 @@ jobs:
env:
KUBEBUILDER_ASSETS: /home/runner/work/_temp/_github_home/kubebuilder/bin
- name: Send coverage
uses: shogo82148/actions-goveralls@v1.4.7
uses: shogo82148/actions-goveralls@v1.5.0
with:
path-to-profile: profile.cov
2 changes: 1 addition & 1 deletion .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected].4
- uses: actions/[email protected].5
- name: golangci-lint
uses: golangci/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1-experimental

FROM --platform=${BUILDPLATFORM} golang:1.17.0-alpine AS base
FROM --platform=${BUILDPLATFORM} golang:1.17.2-alpine AS base

WORKDIR /workspace
ENV CGO_ENABLED=0
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1-experimental

FROM --platform=${BUILDPLATFORM} golang:1.17.0-alpine AS base
FROM --platform=${BUILDPLATFORM} golang:1.17.2-alpine AS base

WORKDIR /workspace
ENV CGO_ENABLED=0
Expand Down
15 changes: 8 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,20 @@ module github.com/annismckenzie/k3os-config-operator
go 1.16

require (
github.com/containerd/containerd v1.5.7 // indirect
github.com/go-logr/logr v0.4.0
github.com/jessevdk/go-flags v1.5.0
github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.16.0
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
k8s.io/api v0.22.1
k8s.io/apimachinery v0.22.1
k8s.io/client-go v0.22.1
sigs.k8s.io/cluster-api v0.4.0 // indirect; uses master, added to use testing helpers
sigs.k8s.io/cluster-api/test v0.4.2
sigs.k8s.io/controller-runtime v0.10.0
k8s.io/api v0.22.2
k8s.io/apimachinery v0.22.2
k8s.io/client-go v0.22.2
sigs.k8s.io/cluster-api v0.4.4 // indirect; uses master, added to use testing helpers
sigs.k8s.io/cluster-api/test v0.4.4
sigs.k8s.io/controller-runtime v0.10.2
)

replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v0.4.2
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v0.4.4

// replace sigs.k8s.io/controller-runtime => ../../../sigs.k8s.io/controller-runtime
92 changes: 45 additions & 47 deletions go.sum

Large diffs are not rendered by default.