Skip to content

Commit

Permalink
Merge pull request #133 from annismckenzie/upgrade-containerd-and-dep…
Browse files Browse the repository at this point in the history
…endencies

Upgrade containerd to v1.5.7 because of a CVE + upgrade dependencies
annismckenzie authored Oct 20, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents bb2437a + 9299702 commit d97245e
Showing 7 changed files with 59 additions and 60 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-push-image.yml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ jobs:
steps:
-
name: Checkout
uses: actions/checkout@v2.3.4
uses: actions/checkout@v2.3.5
-
name: Prepare
id: prep
4 changes: 2 additions & 2 deletions .github/workflows/go-tests.yml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ jobs:
with:
go-version: ${{ matrix.go-version }}
- name: Checkout code
uses: actions/checkout@v2.3.4
uses: actions/checkout@v2.3.5
- name: Download envtest dependencies
uses: teddyking/dependency-action@v2.0.0
with:
@@ -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
@@ -12,7 +12,7 @@ jobs:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2.3.4
- uses: actions/checkout@v2.3.5
- name: golangci-lint
uses: golangci/golangci-lint-action@v2.5.2
with:
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
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
15 changes: 8 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
@@ -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.

0 comments on commit d97245e

Please sign in to comment.