Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kured for openSUSE:Factory checked
in at 2022-09-12 19:08:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kured (Old)
and /work/SRC/openSUSE:Factory/.kured.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kured"
Mon Sep 12 19:08:55 2022 rev:21 rq:1002907 version:1.10.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/kured/kured.changes 2022-07-06
15:42:08.850530307 +0200
+++ /work/SRC/openSUSE:Factory/.kured.new.2083/kured.changes 2022-09-12
19:08:56.890654375 +0200
@@ -1,0 +2,21 @@
+Wed Sep 07 12:27:17 UTC 2022 - ka...@b1-systems.de
+
+- refresh patch kured-imagePullPolicy.patch
+- Update to version 1.10.2:
+ * chore: prepare release 1.10.2
+ * build(deps): bump helm/chart-testing-action from 2.2.1 to 2.3.0 (#618)
+ * build(deps): bump alpine from 3.16.1 to 3.16.2 in /cmd/kured (#617)
+ * build(deps): bump github.com/prometheus/client_golang (#616)
+ * build(deps): bump nick-invision/retry from 2.8.0 to 2.8.1 (#615)
+ * build(deps): bump nick-invision/retry from 2.7.1 to 2.8.0 (#613)
+ * build(deps): bump nick-invision/retry from 2.7.0 to 2.7.1
+ * build(deps): bump github.com/sirupsen/logrus from 1.8.1 to 1.9.0 (#600)
+ * fix: helm chart, use standard labels/best practice (#605)
+ * update command line flags in README (#607)
+ * build(deps): bump github.com/prometheus/common from 0.35.0 to 0.37.0 (#599)
+ * build(deps): bump alpine from 3.16.0 to 3.16.1 in /cmd/kured
+ * build(deps): bump github.com/stretchr/testify from 1.7.5 to 1.8.0
+ * build(deps): bump github.com/containrrr/shoutrrr from 0.6.0 to 0.6.1
+ * ci: address Azure/container-scan regression (#606)
+
+-------------------------------------------------------------------
Old:
----
kured-1.10.1.tar.gz
New:
----
kured-1.10.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kured.spec ++++++
--- /var/tmp/diff_new_pack.AivFMI/_old 2022-09-12 19:08:57.658656533 +0200
+++ /var/tmp/diff_new_pack.AivFMI/_new 2022-09-12 19:08:57.662656544 +0200
@@ -22,7 +22,7 @@
# Project upstream commit.
%define commit 685f328
Name: kured
-Version: 1.10.1
+Version: 1.10.2
Release: 0
Summary: Kubernetes daemonset to perform safe automatic node reboots
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.AivFMI/_old 2022-09-12 19:08:57.694656634 +0200
+++ /var/tmp/diff_new_pack.AivFMI/_new 2022-09-12 19:08:57.698656646 +0200
@@ -6,7 +6,7 @@
<param name="filename">kured</param>
<param name="changesgenerate">enable</param>
<param name="versionformat">@PARENT_TAG@</param>
- <param name="revision">1.10.1</param>
+ <param name="revision">1.10.2</param>
</service>
<service name="set_version" mode="disabled"/>
<service name="recompress" mode="disabled">
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.AivFMI/_old 2022-09-12 19:08:57.718656702 +0200
+++ /var/tmp/diff_new_pack.AivFMI/_new 2022-09-12 19:08:57.722656713 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/weaveworks/kured.git</param>
- <param
name="changesrevision">67c50b27ab8674280255d180e307f6fa70c65ccf</param></service></servicedata>
+ <param
name="changesrevision">9377948f62d723ce2445ccb3949a61c4335bff48</param></service></servicedata>
(No newline at EOF)
++++++ kured-1.10.1.tar.gz -> kured-1.10.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kured-1.10.1/.github/workflows/on-pr-charts.yaml
new/kured-1.10.2/.github/workflows/on-pr-charts.yaml
--- old/kured-1.10.1/.github/workflows/on-pr-charts.yaml 2022-07-01
17:44:33.000000000 +0200
+++ new/kured-1.10.2/.github/workflows/on-pr-charts.yaml 2022-08-20
11:11:06.000000000 +0200
@@ -32,7 +32,7 @@
# Helm is already present in github actions, so do not re-install it
- name: Setup chart testing
- uses: helm/chart-testing-action@v2.2.1
+ uses: helm/chart-testing-action@v2.3.0
- name: Create default kind cluster
uses: helm/kind-action@v1.3.0
@@ -69,7 +69,7 @@
kubectl describe ds kured
- name: Test if successful deploy
- uses: nick-invision/retry@v2.7.0
+ uses: nick-invision/retry@v2.8.1
with:
timeout_minutes: 10
max_attempts: 10
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kured-1.10.1/.github/workflows/on-pr.yaml
new/kured-1.10.2/.github/workflows/on-pr.yaml
--- old/kured-1.10.1/.github/workflows/on-pr.yaml 2022-07-01
17:44:33.000000000 +0200
+++ new/kured-1.10.2/.github/workflows/on-pr.yaml 2022-08-20
11:11:06.000000000 +0200
@@ -90,6 +90,9 @@
go-version: "${{ steps.awk_gomod.outputs.version }}.x"
- run: make DH_ORG="${{ github.repository_owner }}" VERSION="${{
github.sha }}" image
- uses: Azure/container-scan@v0
+ env:
+ # See https://github.com/goodwithtech/dockle/issues/188
+ DOCKLE_HOST: "unix:///var/run/docker.sock"
with:
image-name: docker.io/${{ github.repository_owner }}/kured:${{
github.sha }}
@@ -153,7 +156,7 @@
kubectl apply -f kured-rbac.yaml && kubectl apply -f kured-ds.yaml
- name: Ensure kured is ready
- uses: nick-invision/retry@v2.7.0
+ uses: nick-invision/retry@v2.8.1
with:
timeout_minutes: 10
max_attempts: 10
@@ -226,7 +229,7 @@
kubectl describe ds kured
- name: Ensure kured is ready
- uses: nick-invision/retry@v2.7.0
+ uses: nick-invision/retry@v2.8.1
with:
timeout_minutes: 10
max_attempts: 10
@@ -235,7 +238,7 @@
command: "kubectl get ds kured | grep -E 'kured.*1.*1.*1.*1.*1' "
- name: Get metrics (healthy)
- uses: nick-invision/retry@v2.7.0
+ uses: nick-invision/retry@v2.8.1
with:
timeout_minutes: 2
max_attempts: 12
@@ -247,7 +250,7 @@
./tests/kind/create-reboot-sentinels.sh
- name: Get metrics (need reboot)
- uses: nick-invision/retry@v2.7.0
+ uses: nick-invision/retry@v2.8.1
with:
timeout_minutes: 15
max_attempts: 10
@@ -317,7 +320,7 @@
# kubectl describe ds kured
#
# - name: Ensure kured is ready
- # uses: nick-invision/retry@v2.7.0
+ # uses: nick-invision/retry@v2.8.1
# with:
# timeout_minutes: 10
# max_attempts: 10
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kured-1.10.1/.github/workflows/on-tag.yaml
new/kured-1.10.2/.github/workflows/on-tag.yaml
--- old/kured-1.10.1/.github/workflows/on-tag.yaml 2022-07-01
17:44:33.000000000 +0200
+++ new/kured-1.10.2/.github/workflows/on-tag.yaml 2022-08-20
11:11:06.000000000 +0200
@@ -28,6 +28,9 @@
- run: |
make DH_ORG="${{ github.repository_owner }}" VERSION="${{
steps.tags.outputs.version }}" image
- uses: Azure/container-scan@v0
+ env:
+ # See https://github.com/goodwithtech/dockle/issues/188
+ DOCKLE_HOST: "unix:///var/run/docker.sock"
with:
image-name: docker.io/${{ github.repository_owner }}/kured:${{
steps.tags.outputs.version }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kured-1.10.1/.github/workflows/periodics-daily.yaml
new/kured-1.10.2/.github/workflows/periodics-daily.yaml
--- old/kured-1.10.1/.github/workflows/periodics-daily.yaml 2022-07-01
17:44:33.000000000 +0200
+++ new/kured-1.10.2/.github/workflows/periodics-daily.yaml 2022-08-20
11:11:06.000000000 +0200
@@ -64,6 +64,9 @@
go-version: "${{ steps.awk_gomod.outputs.version }}.x"
- run: make DH_ORG="${{ github.repository_owner }}" VERSION="${{
github.sha }}" image
- uses: Azure/container-scan@v0
+ env:
+ # See https://github.com/goodwithtech/dockle/issues/188
+ DOCKLE_HOST: "unix:///var/run/docker.sock"
with:
image-name: docker.io/${{ github.repository_owner }}/kured:${{
github.sha }}
@@ -119,7 +122,7 @@
kubectl describe ds kured
- name: Ensure kured is ready
- uses: nick-invision/retry@v2.7.0
+ uses: nick-invision/retry@v2.8.1
with:
timeout_minutes: 10
max_attempts: 10
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kured-1.10.1/README.md new/kured-1.10.2/README.md
--- old/kured-1.10.1/README.md 2022-07-01 17:44:33.000000000 +0200
+++ new/kured-1.10.2/README.md 2022-08-20 11:11:06.000000000 +0200
@@ -88,39 +88,48 @@
The following arguments can be passed to kured via the daemonset pod template:
```console
+Kubernetes Reboot Daemon
+
+Usage:
+ kured [flags]
+
Flags:
--alert-filter-regexp regexp.Regexp alert names to ignore when
checking for active alerts
- --alert-firing-only bool only consider firing alerts when
checking for active alerts
+ --alert-firing-only only consider firing alerts when
checking for active alerts
+ --annotate-nodes if set, the annotations
'weave.works/kured-reboot-in-progress' and
'weave.works/kured-most-recent-reboot-needed' will be given to nodes undergoing
kured reboots
--blocking-pod-selector stringArray label selector identifying pods
whose presence should prevent reboots
- --drain-grace-period int time in seconds given to each pod
to terminate gracefully, if negative, the default value specified in the pod
will be used (default: -1)
- --skip-wait-for-delete-timeout int when seconds is greater than zero,
skip waiting for the pods whose deletion timestamp is older than N seconds
while draining a node (default: 0)
+ --drain-grace-period int time in seconds given to each pod
to terminate gracefully, if negative, the default value specified in the pod
will be used (default -1)
+ --drain-timeout duration timeout after which the drain is
aborted (default: 0, infinite time)
--ds-name string name of daemonset on which to
place lock (default "kured")
--ds-namespace string namespace containing daemonset on
which to place lock (default "kube-system")
--end-time string schedule reboot only before this
time of day (default "23:59:59")
- --force-reboot bool force a reboot even if the drain
is still running (default: false)
- --drain-timeout duration timeout after which the drain is
aborted (default: 0, infinite time)
+ --force-reboot force a reboot even if the drain
fails or times out
-h, --help help for kured
--lock-annotation string annotation in which to record
locking node (default "weave.works/kured-node-lock")
- --lock-release-delay duration hold lock after reboot by this
duration (default: 0, disabled)
+ --lock-release-delay duration delay lock release for this
duration (default: 0, disabled)
--lock-ttl duration expire lock annotation after this
duration (default: 0, disabled)
- --message-template-uncordon string message template used to notify
about a node being successfully uncordoned (default "Node %s rebooted &
uncordoned successfully!")
+ --log-format string use text or json log format
(default "text")
--message-template-drain string message template used to notify
about a node being drained (default "Draining node %s")
--message-template-reboot string message template used to notify
about a node being rebooted (default "Rebooting node %s")
- --notify-url url for reboot notifications
(cannot use with --slack-hook-url flags)
- --period duration reboot check period (default
1h0m0s)
+ --message-template-uncordon string message template used to notify
about a node being successfully uncordoned (default "Node %s rebooted &
uncordoned successfully!")
+ --node-id string node name kured runs on, should be
passed down from spec.nodeName via KURED_NODE_ID environment variable
+ --notify-url string notify URL for reboot
notifications (cannot use with --slack-hook-url flags)
+ --period duration sentinel check period (default
1h0m0s)
+ --post-reboot-node-labels strings labels to add to nodes after
uncordoning
+ --pre-reboot-node-labels strings labels to add to nodes before
cordoning
--prefer-no-schedule-taint string Taint name applied during pending
node reboot (to prevent receiving additional pods from other rebooting nodes).
Disabled by default. Set e.g. to "weave.works/kured-node-reboot" to enable
tainting.
--prometheus-url string Prometheus instance to probe for
active alerts
- --reboot-command string command to run when a reboot is
required by the sentinel (default "/sbin/systemctl reboot")
+ --reboot-command string command to run when a reboot is
required (default "/bin/systemctl reboot")
--reboot-days strings schedule reboot on these days
(default [su,mo,tu,we,th,fr,sa])
- --reboot-delay duration add a delay after drain finishes
but before the reboot command is issued (default 0, no time)
- --reboot-sentinel string path to file whose existence
signals need to reboot (default "/var/run/reboot-required")
- --reboot-sentinel-command string command for which a successful run
signals need to reboot (default ""). If non-empty, sentinel file will be
ignored.
- --slack-channel string slack channel for reboot
notfications
- --slack-hook-url string slack hook URL for reboot
notfications [deprecated in favor of --notify-url]
- --slack-username string slack username for reboot
notfications (default "kured")
+ --reboot-delay duration delay reboot for this duration
(default: 0, disabled)
+ --reboot-sentinel string path to file whose existence
triggers the reboot command (default "/var/run/reboot-required")
+ --reboot-sentinel-command string command for which a zero return
code will trigger a reboot command
+ --skip-wait-for-delete-timeout int when seconds is greater than zero,
skip waiting for the pods whose deletion timestamp is older than N seconds
while draining a node
+ --slack-channel string slack channel for reboot
notifications
+ --slack-hook-url string slack hook URL for reboot
notifications [deprecated in favor of --notify-url]
+ --slack-username string slack username for reboot
notifications (default "kured")
--start-time string schedule reboot only after this
time of day (default "0:00")
--time-zone string use this timezone for schedule
inputs (default "UTC")
- --log-format string log format specified as text or
json, defaults to "text"
```
### Reboot Sentinel File & Period
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kured-1.10.1/charts/kured/Chart.yaml
new/kured-1.10.2/charts/kured/Chart.yaml
--- old/kured-1.10.1/charts/kured/Chart.yaml 2022-07-01 17:44:33.000000000
+0200
+++ new/kured-1.10.2/charts/kured/Chart.yaml 2022-08-20 11:11:06.000000000
+0200
@@ -1,8 +1,8 @@
apiVersion: v1
-appVersion: "1.10.1"
+appVersion: "1.10.2"
description: A Helm chart for kured
name: kured
-version: 2.17.0
+version: 3.0.1
home: https://github.com/weaveworks/kured
maintainers:
- name: ckotzbauer
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kured-1.10.1/charts/kured/README.md
new/kured-1.10.2/charts/kured/README.md
--- old/kured-1.10.1/charts/kured/README.md 2022-07-01 17:44:33.000000000
+0200
+++ new/kured-1.10.2/charts/kured/README.md 2022-08-20 11:11:06.000000000
+0200
@@ -21,8 +21,31 @@
The command removes all the Kubernetes components associated with the chart
and deletes the release.
+## Upgrade Notes
+
+### From 2.x to 3.x
+
+The Helm chart labels have been realigned to conform with the [standard
labels](https://helm.sh/docs/chart_best_practices/labels/#standard-labels) in
the current Helm Chart Best Practices guide, so this upgrade will fail unless
the DaemonSet is deleted and recreated. The only way that Helm supports delete
and recreate is by uninstalling, so please uninstall the Kured Helm chart
before installing again with `v3.x`.
+
+If you use any GitOps tool, please check and understand how to do a reinstall
beforehand.
+
+Supposing users want to enable metrics and use a `ServiceMonitor` with the
`kube-prometheus-stack` chart's default `prometheus` instance. Starting with a
chart that has values:
+
+```
+metrics:
+ create: true
+ labels:
+ release: kube-prometheus-stack
+```
+
+A "ServiceMonitor" needs a "release" label to be discovered by the
Prometheus-Operator with the default configuration of `kube-prometheus-stack`
and this chart (in the prior `v2.x` chart) already sets a `release` label
hardcoded. This is changed by applying the best-practise labels in the chart
`v3.x`. Now the user can decide which `release` label-value should be used.
+
+With this update, it's more readily possible to make use of the Kured chart
with `kube-prometheus-stack`'s default `ServiceMonitor` selector configuration.
## Migrate from stable Helm-Chart
+
+### From 1.x to 2.x
+
The following changes have been made compared to the stable chart:
- **[BREAKING CHANGE]** The `autolock` feature was removed. Use
`configuration.startTime` and `configuration.endTime` instead.
- Role inconsistencies have been fixed (allowed verbs for modifying the
`DaemonSet`, apiGroup of `PodSecurityPolicy`)
@@ -36,7 +59,7 @@
| Config | Description
| Default |
| ------ | -----------
| ------- |
| `image.repository` | Image repository
| `weaveworks/kured` |
-| `image.tag` | Image tag
| `1.10.1` |
+| `image.tag` | Image tag
| `1.10.2` |
| `image.pullPolicy` | Image pull policy
| `IfNotPresent` |
| `image.pullSecrets` | Image pull secrets
| `[]` |
| `updateStrategy` | Daemonset update strategy
| `RollingUpdate` |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kured-1.10.1/charts/kured/templates/_helpers.tpl
new/kured-1.10.2/charts/kured/templates/_helpers.tpl
--- old/kured-1.10.1/charts/kured/templates/_helpers.tpl 2022-07-01
17:44:33.000000000 +0200
+++ new/kured-1.10.2/charts/kured/templates/_helpers.tpl 2022-08-20
11:11:06.000000000 +0200
@@ -57,16 +57,16 @@
Returns a set of labels applied to each resource.
*/}}
{{- define "kured.labels" -}}
-app: {{ template "kured.name" . }}
-chart: {{ template "kured.chart" . }}
-release: {{ .Release.Name }}
-heritage: {{ .Release.Service }}
+app.kubernetes.io/name: {{ template "kured.name" . }}
+helm.sh/chart: {{ template "kured.chart" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end -}}
{{/*
Returns a set of matchLabels applied.
*/}}
{{- define "kured.matchLabels" -}}
-app: {{ template "kured.name" . }}
-release: {{ .Release.Name }}
+app.kubernetes.io/name: {{ template "kured.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
{{- end -}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kured-1.10.1/cmd/kured/Dockerfile
new/kured-1.10.2/cmd/kured/Dockerfile
--- old/kured-1.10.1/cmd/kured/Dockerfile 2022-07-01 17:44:33.000000000
+0200
+++ new/kured-1.10.2/cmd/kured/Dockerfile 2022-08-20 11:11:06.000000000
+0200
@@ -1,4 +1,4 @@
-FROM alpine:3.16.0
+FROM alpine:3.16.2
RUN apk update --no-cache && apk upgrade --no-cache && apk add --no-cache
ca-certificates tzdata
COPY ./kured /usr/bin/kured
ENTRYPOINT ["/usr/bin/kured"]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kured-1.10.1/cmd/kured/Dockerfile.multi
new/kured-1.10.2/cmd/kured/Dockerfile.multi
--- old/kured-1.10.1/cmd/kured/Dockerfile.multi 2022-07-01 17:44:33.000000000
+0200
+++ new/kured-1.10.2/cmd/kured/Dockerfile.multi 2022-08-20 11:11:06.000000000
+0200
@@ -14,7 +14,7 @@
COPY . .
RUN make kured-multi
-FROM --platform=$TARGETPLATFORM alpine:3.16.0 as bin
+FROM --platform=$TARGETPLATFORM alpine:3.16.2 as bin
RUN apk update --no-cache && apk upgrade --no-cache && apk add --no-cache
ca-certificates tzdata
COPY --from=build /src/cmd/kured/kured /usr/bin/kured
ENTRYPOINT ["/usr/bin/kured"]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kured-1.10.1/cmd/kured/main.go
new/kured-1.10.2/cmd/kured/main.go
--- old/kured-1.10.1/cmd/kured/main.go 2022-07-01 17:44:33.000000000 +0200
+++ new/kured-1.10.2/cmd/kured/main.go 2022-08-20 11:11:06.000000000 +0200
@@ -123,11 +123,11 @@
rootCmd.PersistentFlags().StringVar(&nodeID, "node-id", "",
"node name kured runs on, should be passed down from
spec.nodeName via KURED_NODE_ID environment variable")
rootCmd.PersistentFlags().BoolVar(&forceReboot, "force-reboot", false,
- "force a reboot even if the drain fails or times out (default:
false)")
+ "force a reboot even if the drain fails or times out")
rootCmd.PersistentFlags().IntVar(&drainGracePeriod,
"drain-grace-period", -1,
- "time in seconds given to each pod to terminate gracefully, if
negative, the default value specified in the pod will be used (default: -1)")
+ "time in seconds given to each pod to terminate gracefully, if
negative, the default value specified in the pod will be used")
rootCmd.PersistentFlags().IntVar(&skipWaitForDeleteTimeoutSeconds,
"skip-wait-for-delete-timeout", 0,
- "when seconds is greater than zero, skip waiting for the pods
whose deletion timestamp is older than N seconds while draining a node
(default: 0)")
+ "when seconds is greater than zero, skip waiting for the pods
whose deletion timestamp is older than N seconds while draining a node")
rootCmd.PersistentFlags().DurationVar(&drainTimeout, "drain-timeout", 0,
"timeout after which the drain is aborted (default: 0, infinite
time)")
rootCmd.PersistentFlags().DurationVar(&rebootDelay, "reboot-delay", 0,
@@ -149,7 +149,7 @@
rootCmd.PersistentFlags().Var(®expValue{&alertFilter},
"alert-filter-regexp",
"alert names to ignore when checking for active alerts")
rootCmd.PersistentFlags().BoolVar(&alertFiringOnly,
"alert-firing-only", false,
- "only consider firing alerts when checking for active alerts
(default: false)")
+ "only consider firing alerts when checking for active alerts")
rootCmd.PersistentFlags().StringVar(&rebootSentinelFile,
"reboot-sentinel", "/var/run/reboot-required",
"path to file whose existence triggers the reboot command")
rootCmd.PersistentFlags().StringVar(&preferNoScheduleTaintName,
"prefer-no-schedule-taint", "",
@@ -160,13 +160,13 @@
"command to run when a reboot is required")
rootCmd.PersistentFlags().StringVar(&slackHookURL, "slack-hook-url", "",
- "slack hook URL for notifications")
+ "slack hook URL for reboot notifications [deprecated in favor
of --notify-url]")
rootCmd.PersistentFlags().StringVar(&slackUsername, "slack-username",
"kured",
- "slack username for notifications")
+ "slack username for reboot notifications")
rootCmd.PersistentFlags().StringVar(&slackChannel, "slack-channel", "",
- "slack channel for reboot notfications")
+ "slack channel for reboot notifications")
rootCmd.PersistentFlags().StringVar(¬ifyURL, "notify-url", "",
- "notify URL for reboot notfications")
+ "notify URL for reboot notifications (cannot use with
--slack-hook-url flags)")
rootCmd.PersistentFlags().StringVar(&messageTemplateUncordon,
"message-template-uncordon", "Node %s rebooted & uncordoned successfully!",
"message template used to notify about a node being
successfully uncordoned")
rootCmd.PersistentFlags().StringVar(&messageTemplateDrain,
"message-template-drain", "Draining node %s",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kured-1.10.1/go.mod new/kured-1.10.2/go.mod
--- old/kured-1.10.1/go.mod 2022-07-01 17:44:33.000000000 +0200
+++ new/kured-1.10.2/go.mod 2022-08-20 11:11:06.000000000 +0200
@@ -3,16 +3,16 @@
go 1.17
require (
- github.com/containrrr/shoutrrr v0.6.0
+ github.com/containrrr/shoutrrr v0.6.1
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
github.com/google/uuid v1.1.5 // indirect
- github.com/prometheus/client_golang v1.12.2
- github.com/prometheus/common v0.35.0
- github.com/sirupsen/logrus v1.8.1
+ github.com/prometheus/client_golang v1.13.0
+ github.com/prometheus/common v0.37.0
+ github.com/sirupsen/logrus v1.9.0
github.com/spf13/cobra v1.5.0
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.12.0
- github.com/stretchr/testify v1.7.5
+ github.com/stretchr/testify v1.8.0
gotest.tools/v3 v3.3.0
k8s.io/api v0.23.6
k8s.io/apimachinery v0.23.6
@@ -69,7 +69,7 @@
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
- github.com/prometheus/procfs v0.7.3 // indirect
+ github.com/prometheus/procfs v0.8.0 // indirect
github.com/russross/blackfriday v1.5.2 // indirect
github.com/spf13/afero v1.8.2 // indirect
github.com/spf13/cast v1.5.0 // indirect
@@ -79,12 +79,12 @@
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
- golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
+ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
google.golang.org/appengine v1.6.7 // indirect
- google.golang.org/protobuf v1.28.0 // indirect
+ google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.66.4 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kured-1.10.1/go.sum new/kured-1.10.2/go.sum
--- old/kured-1.10.1/go.sum 2022-07-01 17:44:33.000000000 +0200
+++ new/kured-1.10.2/go.sum 2022-08-20 11:11:06.000000000 +0200
@@ -121,8 +121,8 @@
github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod
h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod
h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod
h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/containrrr/shoutrrr v0.6.0
h1:74cijCwvx+xVKd5jMH2uPO3hRW+pOiKwl0JyDp4m8gU=
-github.com/containrrr/shoutrrr v0.6.0/go.mod
h1:ye9jGX5YzMnJ76waaNVWlJ4luhMEyt1EWU5unYTQSb0=
+github.com/containrrr/shoutrrr v0.6.1
h1:6ih7jA6mo3t6C97MZbd3SxL/kRizOE3bI9CpBQZ6wzg=
+github.com/containrrr/shoutrrr v0.6.1/go.mod
h1:ye9jGX5YzMnJ76waaNVWlJ4luhMEyt1EWU5unYTQSb0=
github.com/coreos/bbolt v1.3.2/go.mod
h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
github.com/coreos/etcd v3.3.10+incompatible/go.mod
h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
github.com/coreos/etcd v3.3.13+incompatible/go.mod
h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
@@ -512,8 +512,8 @@
github.com/prometheus/client_golang v1.11.0/go.mod
h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
github.com/prometheus/client_golang v1.11.1/go.mod
h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
github.com/prometheus/client_golang v1.12.1/go.mod
h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
-github.com/prometheus/client_golang v1.12.2
h1:51L9cDoUHVrXx4zWYlcLQIZ+d+VXHgqnYKkIuq4g/34=
-github.com/prometheus/client_golang v1.12.2/go.mod
h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
+github.com/prometheus/client_golang v1.13.0
h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU=
+github.com/prometheus/client_golang v1.13.0/go.mod
h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ=
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod
h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod
h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod
h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
@@ -527,16 +527,17 @@
github.com/prometheus/common v0.26.0/go.mod
h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
github.com/prometheus/common v0.28.0/go.mod
h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
github.com/prometheus/common v0.32.1/go.mod
h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
-github.com/prometheus/common v0.35.0
h1:Eyr+Pw2VymWejHqCugNaQXkAi6KayVNxaHeu6khmFBE=
-github.com/prometheus/common v0.35.0/go.mod
h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA=
+github.com/prometheus/common v0.37.0
h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE=
+github.com/prometheus/common v0.37.0/go.mod
h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA=
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod
h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod
h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/prometheus/procfs v0.0.2/go.mod
h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/prometheus/procfs v0.0.8/go.mod
h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
github.com/prometheus/procfs v0.1.3/go.mod
h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
github.com/prometheus/procfs v0.6.0/go.mod
h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/prometheus/procfs v0.7.3
h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU=
github.com/prometheus/procfs v0.7.3/go.mod
h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
+github.com/prometheus/procfs v0.8.0
h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo=
+github.com/prometheus/procfs v0.8.0/go.mod
h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
github.com/prometheus/tsdb v0.7.1/go.mod
h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod
h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
github.com/rogpeppe/fastuuid v1.2.0/go.mod
h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
@@ -556,8 +557,8 @@
github.com/sirupsen/logrus v1.2.0/go.mod
h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
github.com/sirupsen/logrus v1.4.2/go.mod
h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
github.com/sirupsen/logrus v1.6.0/go.mod
h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
-github.com/sirupsen/logrus v1.8.1
h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
-github.com/sirupsen/logrus v1.8.1/go.mod
h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/sirupsen/logrus v1.9.0
h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
+github.com/sirupsen/logrus v1.9.0/go.mod
h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod
h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
github.com/smartystreets/goconvey v1.6.4/go.mod
h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
github.com/soheilhy/cmux v0.1.4/go.mod
h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
@@ -601,8 +602,8 @@
github.com/stretchr/testify v1.6.1/go.mod
h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.0/go.mod
h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.1/go.mod
h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.5
h1:s5PTfem8p8EbKQOctVV53k6jCJt3UX4IEJzwh+C324Q=
-github.com/stretchr/testify v1.7.5/go.mod
h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.0
h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
+github.com/stretchr/testify v1.8.0/go.mod
h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/subosito/gotenv v1.2.0/go.mod
h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
github.com/subosito/gotenv v1.3.0
h1:mjC+YW8QpAdXibNi+vNWgzmgBH4+5l5dCXv8cNysBLI=
github.com/subosito/gotenv v1.3.0/go.mod
h1:YzJjq/33h7nrwdY+iHMhEOEEbW0ovIz0tB6t6PwAXzs=
@@ -796,6 +797,7 @@
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220513210516-0976fa681c29/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod
h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod
h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod
h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -886,8 +888,9 @@
golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a
h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8
h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod
h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod
h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
@@ -1148,8 +1151,9 @@
google.golang.org/protobuf v1.26.0-rc.1/go.mod
h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod
h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.27.1/go.mod
h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.0
h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
google.golang.org/protobuf v1.28.0/go.mod
h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.28.1
h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
+google.golang.org/protobuf v1.28.1/go.mod
h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod
h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod
h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod
h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kured-1.10.1/kured-ds.yaml
new/kured-1.10.2/kured-ds.yaml
--- old/kured-1.10.1/kured-ds.yaml 2022-07-01 17:44:33.000000000 +0200
+++ new/kured-1.10.2/kured-ds.yaml 2022-08-20 11:11:06.000000000 +0200
@@ -31,7 +31,7 @@
restartPolicy: Always
containers:
- name: kured
- image: docker.io/weaveworks/kured:1.10.1
+ image: docker.io/weaveworks/kured:1.10.2
# If you find yourself here wondering why there is no
# :latest tag on Docker Hub,see the FAQ in the README
imagePullPolicy: IfNotPresent
++++++ kured-imagePullPolicy.patch ++++++
--- /var/tmp/diff_new_pack.AivFMI/_old 2022-09-12 19:08:57.794656916 +0200
+++ /var/tmp/diff_new_pack.AivFMI/_new 2022-09-12 19:08:57.798656927 +0200
@@ -1,6 +1,6 @@
-From 02dac25422b9b8f594dc4426bfaa8604f37ec74d Mon Sep 17 00:00:00 2001
+From dfe3df27f265e7e6bc903ffca5181818cdecea6e Mon Sep 17 00:00:00 2001
From: Johannes Kastl <ka...@b1-systems.de>
-Date: Fri, 7 Jan 2022 13:40:30 +0100
+Date: Wed, 7 Sep 2022 14:43:08 +0200
Subject: [PATCH] kured-ds.yaml: set imagePullPolicy to Always
Signed-off-by: Johannes Kastl <ka...@b1-systems.de>
@@ -9,11 +9,11 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kured-ds.yaml b/kured-ds.yaml
-index 15869c4..b226865 100644
+index d3bd85e..6afce93 100644
--- a/kured-ds.yaml
+++ b/kured-ds.yaml
-@@ -34,7 +34,7 @@
- image: docker.io/weaveworks/kured:1.10.1
+@@ -34,7 +34,7 @@ spec:
+ image: docker.io/weaveworks/kured:1.10.2
# If you find yourself here wondering why there is no
# :latest tag on Docker Hub,see the FAQ in the README
- imagePullPolicy: IfNotPresent
@@ -21,4 +21,7 @@
securityContext:
privileged: true # Give permission to nsenter /proc/1/ns/mnt
env:
+--
+2.37.2
+
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/kured/vendor.tar.gz
/work/SRC/openSUSE:Factory/.kured.new.2083/vendor.tar.gz differ: char 5, line 1
