From 4b9844f5c3136f4f2c410fe236cbb2846f0ced8c Mon Sep 17 00:00:00 2001 From: Maxwell Jiang Date: Tue, 31 May 2022 01:34:56 -0500 Subject: [PATCH 1/3] the specific configmap/secret name can be regexp-ly selected --- internal/pkg/handler/upgrade.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/internal/pkg/handler/upgrade.go b/internal/pkg/handler/upgrade.go index f89683ad..fa735cad 100644 --- a/internal/pkg/handler/upgrade.go +++ b/internal/pkg/handler/upgrade.go @@ -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 From 6188811b94558d6fae13dfe02a76ab2debd363e9 Mon Sep 17 00:00:00 2001 From: stakater-user Date: Sat, 18 Jun 2022 21:29:26 +0000 Subject: [PATCH 2/3] [skip-ci] Update artifacts --- deployments/kubernetes/chart/reloader/Chart.yaml | 4 ++-- .../kubernetes/chart/reloader/values.yaml | 4 ++-- .../kubernetes/manifests/clusterrole.yaml | 2 +- .../kubernetes/manifests/clusterrolebinding.yaml | 2 +- deployments/kubernetes/manifests/deployment.yaml | 10 +++++----- .../kubernetes/manifests/serviceaccount.yaml | 2 +- deployments/kubernetes/reloader.yaml | 16 ++++++++-------- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/deployments/kubernetes/chart/reloader/Chart.yaml b/deployments/kubernetes/chart/reloader/Chart.yaml index fd5914f0..d91f6a19 100644 --- a/deployments/kubernetes/chart/reloader/Chart.yaml +++ b/deployments/kubernetes/chart/reloader/Chart.yaml @@ -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.115 +appVersion: v0.0.115 keywords: - Reloader - kubernetes diff --git a/deployments/kubernetes/chart/reloader/values.yaml b/deployments/kubernetes/chart/reloader/values.yaml index 007cdbb7..8a2e3ecb 100644 --- a/deployments/kubernetes/chart/reloader/values.yaml +++ b/deployments/kubernetes/chart/reloader/values.yaml @@ -62,10 +62,10 @@ reloader: labels: provider: stakater group: com.stakater.platform - version: v0.0.114 + version: v0.0.115 image: name: stakater/reloader - tag: v0.0.114 + tag: v0.0.115 pullPolicy: IfNotPresent # Support for extra environment variables. env: diff --git a/deployments/kubernetes/manifests/clusterrole.yaml b/deployments/kubernetes/manifests/clusterrole.yaml index 093fed80..cab10118 100644 --- a/deployments/kubernetes/manifests/clusterrole.yaml +++ b/deployments/kubernetes/manifests/clusterrole.yaml @@ -9,7 +9,7 @@ metadata: meta.helm.sh/release-name: "reloader" labels: app: reloader-reloader - chart: "reloader-v0.0.114" + chart: "reloader-v0.0.115" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" diff --git a/deployments/kubernetes/manifests/clusterrolebinding.yaml b/deployments/kubernetes/manifests/clusterrolebinding.yaml index aa8e2581..348426b1 100644 --- a/deployments/kubernetes/manifests/clusterrolebinding.yaml +++ b/deployments/kubernetes/manifests/clusterrolebinding.yaml @@ -9,7 +9,7 @@ metadata: meta.helm.sh/release-name: "reloader" labels: app: reloader-reloader - chart: "reloader-v0.0.114" + chart: "reloader-v0.0.115" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" diff --git a/deployments/kubernetes/manifests/deployment.yaml b/deployments/kubernetes/manifests/deployment.yaml index 2d499c49..bc722a61 100644 --- a/deployments/kubernetes/manifests/deployment.yaml +++ b/deployments/kubernetes/manifests/deployment.yaml @@ -8,13 +8,13 @@ metadata: meta.helm.sh/release-name: "reloader" labels: app: reloader-reloader - chart: "reloader-v0.0.114" + chart: "reloader-v0.0.115" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" group: com.stakater.platform provider: stakater - version: v0.0.114 + version: v0.0.115 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.115" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" group: com.stakater.platform provider: stakater - version: v0.0.114 + version: v0.0.115 spec: containers: - - image: "stakater/reloader:v0.0.114" + - image: "stakater/reloader:v0.0.115" imagePullPolicy: IfNotPresent name: reloader-reloader diff --git a/deployments/kubernetes/manifests/serviceaccount.yaml b/deployments/kubernetes/manifests/serviceaccount.yaml index e61885e7..c2c8b289 100644 --- a/deployments/kubernetes/manifests/serviceaccount.yaml +++ b/deployments/kubernetes/manifests/serviceaccount.yaml @@ -8,7 +8,7 @@ metadata: meta.helm.sh/release-name: "reloader" labels: app: reloader-reloader - chart: "reloader-v0.0.114" + chart: "reloader-v0.0.115" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" diff --git a/deployments/kubernetes/reloader.yaml b/deployments/kubernetes/reloader.yaml index fc18edd7..10ee86b4 100644 --- a/deployments/kubernetes/reloader.yaml +++ b/deployments/kubernetes/reloader.yaml @@ -8,7 +8,7 @@ metadata: meta.helm.sh/release-name: "reloader" labels: app: reloader-reloader - chart: "reloader-v0.0.114" + chart: "reloader-v0.0.115" 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.115" 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.115" 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.115" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" group: com.stakater.platform provider: stakater - version: v0.0.114 + version: v0.0.115 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.115" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" group: com.stakater.platform provider: stakater - version: v0.0.114 + version: v0.0.115 spec: containers: - - image: "stakater/reloader:v0.0.114" + - image: "stakater/reloader:v0.0.115" imagePullPolicy: IfNotPresent name: reloader-reloader From ba7f7537fb03668b1092bcd8c4bab92ade4492ba Mon Sep 17 00:00:00 2001 From: stakater-user Date: Sat, 18 Jun 2022 21:55:13 +0000 Subject: [PATCH 3/3] [skip-ci] Update artifacts --- deployments/kubernetes/chart/reloader/Chart.yaml | 4 ++-- .../kubernetes/chart/reloader/values.yaml | 4 ++-- .../kubernetes/manifests/clusterrole.yaml | 2 +- .../kubernetes/manifests/clusterrolebinding.yaml | 2 +- deployments/kubernetes/manifests/deployment.yaml | 10 +++++----- .../kubernetes/manifests/serviceaccount.yaml | 2 +- deployments/kubernetes/reloader.yaml | 16 ++++++++-------- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/deployments/kubernetes/chart/reloader/Chart.yaml b/deployments/kubernetes/chart/reloader/Chart.yaml index d91f6a19..990c03a6 100644 --- a/deployments/kubernetes/chart/reloader/Chart.yaml +++ b/deployments/kubernetes/chart/reloader/Chart.yaml @@ -3,8 +3,8 @@ apiVersion: v1 name: reloader description: Reloader chart that runs on kubernetes -version: v0.0.115 -appVersion: v0.0.115 +version: v0.0.116 +appVersion: v0.0.116 keywords: - Reloader - kubernetes diff --git a/deployments/kubernetes/chart/reloader/values.yaml b/deployments/kubernetes/chart/reloader/values.yaml index 8a2e3ecb..e52ae123 100644 --- a/deployments/kubernetes/chart/reloader/values.yaml +++ b/deployments/kubernetes/chart/reloader/values.yaml @@ -62,10 +62,10 @@ reloader: labels: provider: stakater group: com.stakater.platform - version: v0.0.115 + version: v0.0.116 image: name: stakater/reloader - tag: v0.0.115 + tag: v0.0.116 pullPolicy: IfNotPresent # Support for extra environment variables. env: diff --git a/deployments/kubernetes/manifests/clusterrole.yaml b/deployments/kubernetes/manifests/clusterrole.yaml index cab10118..c25ebe21 100644 --- a/deployments/kubernetes/manifests/clusterrole.yaml +++ b/deployments/kubernetes/manifests/clusterrole.yaml @@ -9,7 +9,7 @@ metadata: meta.helm.sh/release-name: "reloader" labels: app: reloader-reloader - chart: "reloader-v0.0.115" + chart: "reloader-v0.0.116" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" diff --git a/deployments/kubernetes/manifests/clusterrolebinding.yaml b/deployments/kubernetes/manifests/clusterrolebinding.yaml index 348426b1..e3b5e33f 100644 --- a/deployments/kubernetes/manifests/clusterrolebinding.yaml +++ b/deployments/kubernetes/manifests/clusterrolebinding.yaml @@ -9,7 +9,7 @@ metadata: meta.helm.sh/release-name: "reloader" labels: app: reloader-reloader - chart: "reloader-v0.0.115" + chart: "reloader-v0.0.116" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" diff --git a/deployments/kubernetes/manifests/deployment.yaml b/deployments/kubernetes/manifests/deployment.yaml index bc722a61..a6715537 100644 --- a/deployments/kubernetes/manifests/deployment.yaml +++ b/deployments/kubernetes/manifests/deployment.yaml @@ -8,13 +8,13 @@ metadata: meta.helm.sh/release-name: "reloader" labels: app: reloader-reloader - chart: "reloader-v0.0.115" + chart: "reloader-v0.0.116" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" group: com.stakater.platform provider: stakater - version: v0.0.115 + version: v0.0.116 name: reloader-reloader namespace: default spec: @@ -28,16 +28,16 @@ spec: metadata: labels: app: reloader-reloader - chart: "reloader-v0.0.115" + chart: "reloader-v0.0.116" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" group: com.stakater.platform provider: stakater - version: v0.0.115 + version: v0.0.116 spec: containers: - - image: "stakater/reloader:v0.0.115" + - image: "stakater/reloader:v0.0.116" imagePullPolicy: IfNotPresent name: reloader-reloader diff --git a/deployments/kubernetes/manifests/serviceaccount.yaml b/deployments/kubernetes/manifests/serviceaccount.yaml index c2c8b289..4817ba75 100644 --- a/deployments/kubernetes/manifests/serviceaccount.yaml +++ b/deployments/kubernetes/manifests/serviceaccount.yaml @@ -8,7 +8,7 @@ metadata: meta.helm.sh/release-name: "reloader" labels: app: reloader-reloader - chart: "reloader-v0.0.115" + chart: "reloader-v0.0.116" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" diff --git a/deployments/kubernetes/reloader.yaml b/deployments/kubernetes/reloader.yaml index 10ee86b4..385d4b10 100644 --- a/deployments/kubernetes/reloader.yaml +++ b/deployments/kubernetes/reloader.yaml @@ -8,7 +8,7 @@ metadata: meta.helm.sh/release-name: "reloader" labels: app: reloader-reloader - chart: "reloader-v0.0.115" + 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.115" + 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.115" + 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.115" + chart: "reloader-v0.0.116" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" group: com.stakater.platform provider: stakater - version: v0.0.115 + version: v0.0.116 name: reloader-reloader namespace: default spec: @@ -117,16 +117,16 @@ spec: metadata: labels: app: reloader-reloader - chart: "reloader-v0.0.115" + chart: "reloader-v0.0.116" release: "reloader" heritage: "Helm" app.kubernetes.io/managed-by: "Helm" group: com.stakater.platform provider: stakater - version: v0.0.115 + version: v0.0.116 spec: containers: - - image: "stakater/reloader:v0.0.115" + - image: "stakater/reloader:v0.0.116" imagePullPolicy: IfNotPresent name: reloader-reloader