Merge branch 'master' of github.com:stakater/Reloader into update-golang-version

This commit is contained in:
faizanahmad055
2022-06-18 23:56:53 +02:00
8 changed files with 24 additions and 22 deletions
@@ -3,8 +3,8 @@
apiVersion: v1
name: reloader
description: Reloader chart that runs on kubernetes
version: v0.0.114
appVersion: v0.0.114
version: v0.0.116
appVersion: v0.0.116
keywords:
- Reloader
- kubernetes
@@ -62,10 +62,10 @@ reloader:
labels:
provider: stakater
group: com.stakater.platform
version: v0.0.114
version: v0.0.116
image:
name: stakater/reloader
tag: v0.0.114
tag: v0.0.116
pullPolicy: IfNotPresent
# Support for extra environment variables.
env:
@@ -9,7 +9,7 @@ metadata:
meta.helm.sh/release-name: "reloader"
labels:
app: reloader-reloader
chart: "reloader-v0.0.114"
chart: "reloader-v0.0.116"
release: "reloader"
heritage: "Helm"
app.kubernetes.io/managed-by: "Helm"
@@ -9,7 +9,7 @@ metadata:
meta.helm.sh/release-name: "reloader"
labels:
app: reloader-reloader
chart: "reloader-v0.0.114"
chart: "reloader-v0.0.116"
release: "reloader"
heritage: "Helm"
app.kubernetes.io/managed-by: "Helm"
@@ -8,13 +8,13 @@ metadata:
meta.helm.sh/release-name: "reloader"
labels:
app: reloader-reloader
chart: "reloader-v0.0.114"
chart: "reloader-v0.0.116"
release: "reloader"
heritage: "Helm"
app.kubernetes.io/managed-by: "Helm"
group: com.stakater.platform
provider: stakater
version: v0.0.114
version: v0.0.116
name: reloader-reloader
namespace: default
spec:
@@ -28,16 +28,16 @@ spec:
metadata:
labels:
app: reloader-reloader
chart: "reloader-v0.0.114"
chart: "reloader-v0.0.116"
release: "reloader"
heritage: "Helm"
app.kubernetes.io/managed-by: "Helm"
group: com.stakater.platform
provider: stakater
version: v0.0.114
version: v0.0.116
spec:
containers:
- image: "stakater/reloader:v0.0.114"
- image: "stakater/reloader:v0.0.116"
imagePullPolicy: IfNotPresent
name: reloader-reloader
@@ -8,7 +8,7 @@ metadata:
meta.helm.sh/release-name: "reloader"
labels:
app: reloader-reloader
chart: "reloader-v0.0.114"
chart: "reloader-v0.0.116"
release: "reloader"
heritage: "Helm"
app.kubernetes.io/managed-by: "Helm"
+8 -8
View File
@@ -8,7 +8,7 @@ metadata:
meta.helm.sh/release-name: "reloader"
labels:
app: reloader-reloader
chart: "reloader-v0.0.114"
chart: "reloader-v0.0.116"
release: "reloader"
heritage: "Helm"
app.kubernetes.io/managed-by: "Helm"
@@ -25,7 +25,7 @@ metadata:
meta.helm.sh/release-name: "reloader"
labels:
app: reloader-reloader
chart: "reloader-v0.0.114"
chart: "reloader-v0.0.116"
release: "reloader"
heritage: "Helm"
app.kubernetes.io/managed-by: "Helm"
@@ -73,7 +73,7 @@ metadata:
meta.helm.sh/release-name: "reloader"
labels:
app: reloader-reloader
chart: "reloader-v0.0.114"
chart: "reloader-v0.0.116"
release: "reloader"
heritage: "Helm"
app.kubernetes.io/managed-by: "Helm"
@@ -97,13 +97,13 @@ metadata:
meta.helm.sh/release-name: "reloader"
labels:
app: reloader-reloader
chart: "reloader-v0.0.114"
chart: "reloader-v0.0.116"
release: "reloader"
heritage: "Helm"
app.kubernetes.io/managed-by: "Helm"
group: com.stakater.platform
provider: stakater
version: v0.0.114
version: v0.0.116
name: reloader-reloader
namespace: default
spec:
@@ -117,16 +117,16 @@ spec:
metadata:
labels:
app: reloader-reloader
chart: "reloader-v0.0.114"
chart: "reloader-v0.0.116"
release: "reloader"
heritage: "Helm"
app.kubernetes.io/managed-by: "Helm"
group: com.stakater.platform
provider: stakater
version: v0.0.114
version: v0.0.116
spec:
containers:
- image: "stakater/reloader:v0.0.114"
- image: "stakater/reloader:v0.0.116"
imagePullPolicy: IfNotPresent
name: reloader-reloader
+4 -2
View File
@@ -13,6 +13,7 @@ import (
"github.com/stakater/Reloader/internal/pkg/util"
"github.com/stakater/Reloader/pkg/kube"
v1 "k8s.io/api/core/v1"
"regexp"
"strconv"
"strings"
)
@@ -154,8 +155,9 @@ func PerformRollingUpgrade(clients kube.Clients, config util.Config, upgradeFunc
if result != constants.Updated && annotationValue != "" {
values := strings.Split(annotationValue, ",")
for _, value := range values {
value = strings.Trim(value, " ")
if value == config.ResourceName {
value = strings.TrimSpace(value)
re := regexp.MustCompile("^" + value + "$")
if re.Match([]byte(config.ResourceName)) {
result = invokeReloadStrategy(upgradeFuncs, i, config, false)
if result == constants.Updated {
break