Compare commits

..

22 Commits

Author SHA1 Message Date
Daniel Holbach
72eda8a7c3 Merge pull request #724 from dholbach/prepare-1.12.1
prepare for 1.12.1 release
2023-02-07 15:36:29 +01:00
Daniel Holbach
7bb9b75e2a prepare for 1.12.1 release
Signed-off-by: Daniel Holbach <daniel@weave.works>
2023-02-07 12:56:28 +01:00
Daniel Holbach
dfb8441078 Merge pull request #723 from dholbach/drop-replace
drop unnecessary replacement for go-restful CVE
2023-02-07 12:21:27 +01:00
Daniel Holbach
0e0cf7fac1 drop unnecessary replacement for go-restful CVE
Signed-off-by: Daniel Holbach <daniel@weave.works>
2023-02-07 09:39:32 +01:00
Daniel Holbach
06af12114d Merge pull request #721 from kubereboot/dependabot/github_actions/docker/build-push-action-4
build(deps): bump docker/build-push-action from 3 to 4
2023-02-07 09:31:59 +01:00
dependabot[bot]
477f356571 build(deps): bump docker/build-push-action from 3 to 4
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3 to 4.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v3...v4)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-31 17:09:01 +00:00
Daniel Holbach
ad1e9b8401 Merge pull request #720 from kubereboot/dependabot/go_modules/github.com/containrrr/shoutrrr-0.7.1
build(deps): bump github.com/containrrr/shoutrrr from 0.7.0 to 0.7.1
2023-01-31 10:10:14 +01:00
dependabot[bot]
80628b1b79 build(deps): bump github.com/containrrr/shoutrrr from 0.7.0 to 0.7.1
Bumps [github.com/containrrr/shoutrrr](https://github.com/containrrr/shoutrrr) from 0.7.0 to 0.7.1.
- [Release notes](https://github.com/containrrr/shoutrrr/releases)
- [Changelog](https://github.com/containrrr/shoutrrr/blob/main/goreleaser.yml)
- [Commits](https://github.com/containrrr/shoutrrr/compare/v0.7.0...v0.7.1)

---
updated-dependencies:
- dependency-name: github.com/containrrr/shoutrrr
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-30 17:20:38 +00:00
Daniel Holbach
30673c0391 Merge pull request #719 from kubereboot/dependabot/go_modules/github.com/containrrr/shoutrrr-0.7.0
build(deps): bump github.com/containrrr/shoutrrr from 0.6.1 to 0.7.0
2023-01-27 09:04:24 +01:00
dependabot[bot]
35e7bf9897 build(deps): bump github.com/containrrr/shoutrrr from 0.6.1 to 0.7.0
Bumps [github.com/containrrr/shoutrrr](https://github.com/containrrr/shoutrrr) from 0.6.1 to 0.7.0.
- [Release notes](https://github.com/containrrr/shoutrrr/releases)
- [Changelog](https://github.com/containrrr/shoutrrr/blob/main/goreleaser.yml)
- [Commits](https://github.com/containrrr/shoutrrr/compare/v0.6.1...v0.7.0)

---
updated-dependencies:
- dependency-name: github.com/containrrr/shoutrrr
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-26 17:09:14 +00:00
Daniel Holbach
f8551b6714 Merge pull request #718 from kubereboot/dependabot/go_modules/github.com/spf13/viper-1.15.0
build(deps): bump github.com/spf13/viper from 1.14.0 to 1.15.0
2023-01-20 20:51:38 +01:00
dependabot[bot]
d87d585b9c build(deps): bump github.com/spf13/viper from 1.14.0 to 1.15.0
Bumps [github.com/spf13/viper](https://github.com/spf13/viper) from 1.14.0 to 1.15.0.
- [Release notes](https://github.com/spf13/viper/releases)
- [Commits](https://github.com/spf13/viper/compare/v1.14.0...v1.15.0)

---
updated-dependencies:
- dependency-name: github.com/spf13/viper
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-19 17:10:43 +00:00
Daniel Holbach
6ff57552c7 Merge pull request #717 from kubereboot/dependabot/github_actions/docker/metadata-action-4.3.0
build(deps): bump docker/metadata-action from 4.2.0 to 4.3.0
2023-01-14 07:27:15 +01:00
dependabot[bot]
36c78d94ce build(deps): bump docker/metadata-action from 4.2.0 to 4.3.0
Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 4.2.0 to 4.3.0.
- [Release notes](https://github.com/docker/metadata-action/releases)
- [Commits](05d22bf317...507c2f2dc5)

---
updated-dependencies:
- dependency-name: docker/metadata-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-13 17:07:52 +00:00
dependabot[bot]
0bc867cf11 build(deps): bump docker/metadata-action from 4.1.1 to 4.2.0 (#716)
Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 4.1.1 to 4.2.0.
- [Release notes](https://github.com/docker/metadata-action/releases)
- [Commits](57396166ad...05d22bf317)

---
updated-dependencies:
- dependency-name: docker/metadata-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-01-11 19:24:46 +01:00
dependabot[bot]
c6d9bf07e6 build(deps): bump alpine from 3.17.0 to 3.17.1 (#714)
Bumps alpine from 3.17.0 to 3.17.1.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-01-10 17:21:57 +01:00
Daniel Holbach
fb84fa8253 Merge pull request #712 from kubereboot/dependabot/github_actions/actions/stale-7
build(deps): bump actions/stale from 6 to 7
2023-01-05 20:54:12 +01:00
Daniel Holbach
05414fb9d0 Merge pull request #713 from kubereboot/dependabot/github_actions/nick-invision/retry-2.8.3
build(deps): bump nick-invision/retry from 2.8.2 to 2.8.3
2022-12-31 04:42:54 +01:00
dependabot[bot]
230fa45461 build(deps): bump nick-invision/retry from 2.8.2 to 2.8.3
Bumps [nick-invision/retry](https://github.com/nick-invision/retry) from 2.8.2 to 2.8.3.
- [Release notes](https://github.com/nick-invision/retry/releases)
- [Changelog](https://github.com/nick-fields/retry/blob/master/.releaserc.js)
- [Commits](https://github.com/nick-invision/retry/compare/v2.8.2...v2.8.3)

---
updated-dependencies:
- dependency-name: nick-invision/retry
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-30 17:09:09 +00:00
dependabot[bot]
6aca815125 build(deps): bump actions/stale from 6 to 7
Bumps [actions/stale](https://github.com/actions/stale) from 6 to 7.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v6...v7)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-21 17:17:14 +00:00
Daniel Holbach
eed2df6493 Merge pull request #711 from dholbach/update-x-net
update golang.org/x/net dep
2022-12-15 08:27:36 +01:00
Daniel Holbach
ff773d96bd update golang.org/x/net dep
Signed-off-by: Daniel Holbach <daniel@holba.ch>
2022-12-14 23:23:47 +01:00
9 changed files with 576 additions and 111 deletions

View File

@@ -36,7 +36,7 @@ jobs:
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@57396166ad8aefe6098280995947635806a0e6ea
uses: docker/metadata-action@507c2f2dc502c992ad446e3d7a5dfbe311567a96
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
@@ -60,7 +60,7 @@ jobs:
COSIGN_EXPERIMENTAL: 1
- name: Build image
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
context: .
platforms: linux/arm64, linux/amd64, linux/arm/v7, linux/arm/v6, linux/386

View File

@@ -159,7 +159,7 @@ jobs:
kubectl apply -f kured-rbac.yaml && kubectl apply -f kured-ds.yaml
- name: Ensure kured is ready
uses: nick-invision/retry@v2.8.2
uses: nick-invision/retry@v2.8.3
with:
timeout_minutes: 10
max_attempts: 10

View File

@@ -42,7 +42,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COSIGN_EXPERIMENTAL: 1
- name: Build single image for scan
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
context: .
platforms: linux/amd64
@@ -67,12 +67,12 @@ jobs:
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@57396166ad8aefe6098280995947635806a0e6ea
uses: docker/metadata-action@507c2f2dc502c992ad446e3d7a5dfbe311567a96
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
- name: Build release images
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
context: .
platforms: linux/arm64, linux/amd64, linux/arm/v7, linux/arm/v6, linux/386

View File

@@ -25,7 +25,7 @@ jobs:
steps:
# Stale by default waits for 60 days before marking PR/issues as stale, and closes them after 21 days.
# Do not expire the first issues that would allow the community to grow.
- uses: actions/stale@v6
- uses: actions/stale@v7
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: 'This issue was automatically considered stale due to lack of activity. Please update it and/or join our slack channels to promote it, before it automatically closes (in 7 days).'

View File

@@ -162,7 +162,7 @@ A test-run with `minikube` could look like this:
```console
# start minikube
minikube start --vm-driver kvm2 --kubernetes-version <k8s-release>
minikube start --driver=kvm2 --kubernetes-version <k8s-release>
# build kured image and publish to registry accessible by minikube
make image minikube-publish

View File

@@ -1,4 +1,4 @@
FROM --platform=$TARGETPLATFORM alpine:3.17.0 as bin
FROM --platform=$TARGETPLATFORM alpine:3.17.1 as bin
ARG TARGETOS
ARG TARGETARCH
@@ -19,7 +19,7 @@ RUN set -ex \
esac \
&& cp /dist/kured_${TARGETOS}_${TARGETARCH}${SUFFIX}/kured /dist/kured;
FROM --platform=$TARGETPLATFORM alpine:3.17.0
FROM --platform=$TARGETPLATFORM alpine:3.17.1
RUN apk update --no-cache && apk upgrade --no-cache && apk add --no-cache ca-certificates tzdata
COPY --from=bin /dist/kured /usr/bin/kured
ENTRYPOINT ["/usr/bin/kured"]

26
go.mod
View File

@@ -3,23 +3,20 @@ module github.com/kubereboot/kured
go 1.18
replace (
// Fix CVE-2022-1996 (for v2, Go Modules incompatible)
github.com/emicklei/go-restful => github.com/emicklei/go-restful v2.16.0+incompatible
golang.org/x/net => golang.org/x/net v0.0.0-20220906165146-f3363e06e74c
golang.org/x/net => golang.org/x/net v0.4.0
golang.org/x/text => golang.org/x/text v0.3.8
)
require (
github.com/containrrr/shoutrrr v0.6.1
github.com/containrrr/shoutrrr v0.7.1
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
github.com/google/uuid v1.1.5 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/prometheus/client_golang v1.14.0
github.com/prometheus/common v0.39.0
github.com/sirupsen/logrus v1.9.0
github.com/spf13/cobra v1.6.1
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.14.0
github.com/spf13/viper v1.15.0
github.com/stretchr/testify v1.8.1
gotest.tools/v3 v3.4.0
k8s.io/api v0.25.5
@@ -60,10 +57,10 @@ require (
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
github.com/magiconair/properties v1.8.6 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
@@ -73,18 +70,17 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/russross/blackfriday v1.5.2 // indirect
github.com/spf13/afero v1.9.2 // indirect
github.com/spf13/afero v1.9.3 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/subosito/gotenv v1.4.1 // indirect
github.com/subosito/gotenv v1.4.2 // indirect
github.com/xlab/treeprint v1.1.0 // indirect
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
golang.org/x/net v0.4.0 // indirect
@@ -92,7 +88,7 @@ require (
golang.org/x/sys v0.3.0 // indirect
golang.org/x/term v0.3.0 // indirect
golang.org/x/text v0.5.0 // indirect
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
golang.org/x/time v0.1.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect

639
go.sum

File diff suppressed because it is too large Load Diff

View File

@@ -31,7 +31,7 @@ spec:
restartPolicy: Always
containers:
- name: kured
image: ghcr.io/kubereboot/kured:1.12.0
image: ghcr.io/kubereboot/kured:1.12.1
# If you find yourself here wondering why there is no
# :latest tag on Docker Hub,see the FAQ in the README
imagePullPolicy: IfNotPresent