diff --git a/deployments/kubernetes/chart/reloader/Chart.yaml b/deployments/kubernetes/chart/reloader/Chart.yaml index fd5914f0..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.114 -appVersion: v0.0.114 +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 007cdbb7..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.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: diff --git a/deployments/kubernetes/manifests/clusterrole.yaml b/deployments/kubernetes/manifests/clusterrole.yaml index 093fed80..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.114" + 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 aa8e2581..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.114" + 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 2d499c49..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.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 diff --git a/deployments/kubernetes/manifests/serviceaccount.yaml b/deployments/kubernetes/manifests/serviceaccount.yaml index e61885e7..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.114" + 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 fc18edd7..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.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 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