[skip-ci] Update artifacts

Merge pull request #311 from stakater/update-golang-version
Update golang version
2026-04-27 20:36:35 +00:00 · 2022-06-20 07:26:00 +00:00 · 2022-06-20 09:06:43 +02:00 · 2022-06-18 23:56:53 +02:00 · 2022-06-18 21:55:13 +00:00 · 2022-06-18 23:33:52 +02:00
17 changed files with 40 additions and 55 deletions
--- a/.github/workflows/pull_request.yaml
+++ b/.github/workflows/pull_request.yaml
@@ -7,7 +7,7 @@ on:

 env:
  DOCKER_FILE_PATH: Dockerfile
-  GOLANG_VERSION: 1.17.7
+  GOLANG_VERSION: 1.18.2
  KUBERNETES_VERSION: "1.18.0"
  KIND_VERSION: "0.10.0"

@@ -48,23 +48,9 @@ jobs:
        cd deployments/kubernetes/chart/reloader
        helm lint

-    - name: Dockerfile Lint
-      uses: hadolint/hadolint-action@v1.6.0
-      with:
-        dockerfile: ${{env.DOCKER_FILE_PATH}}
-        failure-threshold: warning
-
    - name: Link check
      uses: gaurav-nelson/github-action-markdown-link-check@v1

-    - name: Spell check
-      uses: errata-ai/vale-action@v1.5.0
-      with:
-        styles: https://github.com/errata-ai/write-good/releases/latest/download/write-good.zip
-        files: docs
-      env:
-        GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-
    - name: Install kubectl
      run: |
        curl -LO "https://storage.googleapis.com/kubernetes-release/release/v${KUBERNETES_VERSION}/bin/linux/amd64/kubectl"
--- a/.github/workflows/push.yaml
+++ b/.github/workflows/push.yaml
@@ -7,7 +7,7 @@ on:

 env:
  DOCKER_FILE_PATH: Dockerfile
-  GOLANG_VERSION: 1.17.7
+  GOLANG_VERSION: 1.18.2
  KUBERNETES_VERSION: "1.18.0"
  KIND_VERSION: "0.10.0"
  HELM_REGISTRY_URL: "https://stakater.github.io/stakater-charts"
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -6,7 +6,7 @@ on:
      - "v*"

 env:
-  GOLANG_VERSION: 1.17.7
+  GOLANG_VERSION: 1.18.2

 jobs:
  build:
--- a/.vale.ini
+++ b/.vale.ini
@@ -1,7 +0,0 @@
-StylesPath = spellingstyles
-MinAlertLevel = warning
-
-# Only check MarkDown files
-[*.md]
-
-BasedOnStyles = Vale
--- a/2
+++ b/2
@@ -2,7 +2,7 @@ ARG BUILDER_IMAGE
 ARG BASE_IMAGE

 # Build the manager binary
-FROM --platform=${BUILDPLATFORM} ${BUILDER_IMAGE:-golang:1.17.7} as builder
+FROM --platform=${BUILDPLATFORM} ${BUILDER_IMAGE:-golang:1.18.2} as builder

 ARG TARGETOS
 ARG TARGETARCH
--- a/README.md
+++ b/README.md
@@ -6,8 +6,6 @@
 [![GitHub tag](https://img.shields.io/github/tag/stakater/reloader.svg?style=flat-square)](https://github.com/stakater/reloader/releases/latest)
 [![Docker Pulls](https://img.shields.io/docker/pulls/stakater/reloader.svg?style=flat-square)](https://hub.docker.com/r/stakater/reloader/)
 [![Docker Stars](https://img.shields.io/docker/stars/stakater/reloader.svg?style=flat-square)](https://hub.docker.com/r/stakater/reloader/)
-[![MicroBadger Size](https://img.shields.io/microbadger/image-size/stakater/reloader.svg?style=flat-square)](https://microbadger.com/images/stakater/reloader)
-[![MicroBadger Layers](https://img.shields.io/microbadger/layers/stakater/reloader.svg?style=flat-square)](https://microbadger.com/images/stakater/reloader)
 [![license](https://img.shields.io/github/license/stakater/reloader.svg?style=flat-square)](LICENSE)
 [![Get started with Stakater](https://stakater.github.io/README/stakater-github-banner.png)](http://stakater.com/?utm_source=Reloader&utm_medium=github)

@@ -33,7 +31,8 @@ metadata:
  annotations:
    reloader.stakater.com/auto: "true"
 spec:
-  template: metadata:
+  template:
+    metadata:
 ```

 This will discover deploymentconfigs/deployments/daemonsets/statefulset/rollouts automatically where `foo-configmap` or `foo-secret` is being used either via environment variable or from volume mount. And it will perform rolling upgrade on related pods when `foo-configmap` or `foo-secret`are updated.
@@ -88,7 +87,8 @@ metadata:
  annotations:
    configmap.reloader.stakater.com/reload: "foo-configmap"
 spec:
-  template: metadata:
+  template:
+    metadata:
 ```

 Use comma separated list to define multiple configmaps.
--- 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.111
-appVersion: v0.0.111
+version: v0.0.117
+appVersion: v0.0.117
 keywords:
  - Reloader
  - kubernetes
--- a/deployments/kubernetes/chart/reloader/templates/service.yaml
+++ b/deployments/kubernetes/chart/reloader/templates/service.yaml
@@ -13,6 +13,7 @@ metadata:
 {{ toYaml .Values.reloader.service.labels | indent 4 }}
 {{- end }}
  name: {{ template "reloader-fullname" . }}
+  namespace: {{ .Release.Namespace }}
 spec:
  selector:
 {{- if .Values.reloader.deployment.labels }}
--- 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.111
+      version: v0.0.117
    image:
      name: stakater/reloader
-      tag: v0.0.111
+      tag: v0.0.117
      pullPolicy: IfNotPresent
    # Support for extra environment variables.
    env:
--- 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.111"
+    chart: "reloader-v0.0.117"
    release: "reloader"
    heritage: "Helm"
    app.kubernetes.io/managed-by: "Helm"
--- 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.111"
+    chart: "reloader-v0.0.117"
    release: "reloader"
    heritage: "Helm"
    app.kubernetes.io/managed-by: "Helm"
--- 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.111"
+    chart: "reloader-v0.0.117"
    release: "reloader"
    heritage: "Helm"
    app.kubernetes.io/managed-by: "Helm"
    group: com.stakater.platform
    provider: stakater
-    version: v0.0.111
+    version: v0.0.117
  name: reloader-reloader
  namespace: default
 spec:
@@ -28,16 +28,16 @@ spec:
    metadata:
      labels:
        app: reloader-reloader
-        chart: "reloader-v0.0.111"
+        chart: "reloader-v0.0.117"
        release: "reloader"
        heritage: "Helm"
        app.kubernetes.io/managed-by: "Helm"
        group: com.stakater.platform
        provider: stakater
-        version: v0.0.111
+        version: v0.0.117
    spec:
      containers:
-      - image: "stakater/reloader:v0.0.111"
+      - image: "stakater/reloader:v0.0.117"
        imagePullPolicy: IfNotPresent
        name: reloader-reloader

--- 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.111"
+    chart: "reloader-v0.0.117"
    release: "reloader"
    heritage: "Helm"
    app.kubernetes.io/managed-by: "Helm"
--- 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.111"
+    chart: "reloader-v0.0.117"
    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.111"
+    chart: "reloader-v0.0.117"
    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.111"
+    chart: "reloader-v0.0.117"
    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.111"
+    chart: "reloader-v0.0.117"
    release: "reloader"
    heritage: "Helm"
    app.kubernetes.io/managed-by: "Helm"
    group: com.stakater.platform
    provider: stakater
-    version: v0.0.111
+    version: v0.0.117
  name: reloader-reloader
  namespace: default
 spec:
@@ -117,16 +117,16 @@ spec:
    metadata:
      labels:
        app: reloader-reloader
-        chart: "reloader-v0.0.111"
+        chart: "reloader-v0.0.117"
        release: "reloader"
        heritage: "Helm"
        app.kubernetes.io/managed-by: "Helm"
        group: com.stakater.platform
        provider: stakater
-        version: v0.0.111
+        version: v0.0.117
    spec:
      containers:
-      - image: "stakater/reloader:v0.0.111"
+      - image: "stakater/reloader:v0.0.117"
        imagePullPolicy: IfNotPresent
        name: reloader-reloader

--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/stakater/Reloader

-go 1.17
+go 1.18

 require (
 	github.com/argoproj/argo-rollouts v1.0.2
@@ -47,10 +47,11 @@ require (
 	github.com/prometheus/common v0.21.0 // indirect
 	github.com/prometheus/procfs v0.6.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 // indirect
+	golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f // indirect
 	golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb // indirect
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
 	golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 // indirect
+	golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 // indirect
 	golang.org/x/text v0.3.4 // indirect
 	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
 	google.golang.org/appengine v1.6.6 // indirect
--- a/go.sum
+++ b/go.sum
@@ -186,7 +186,6 @@ github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QH
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@@ -1079,8 +1078,9 @@ golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 h1:pLI5jrR7OSLijeIDcmRxNmw2api+jEfxLoykJVice/E=
 golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f h1:aZp0e2vLN4MToVqnjNEYEtrEA8RH8U8FN1CU7JgqsPU=
+golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -1256,6 +1256,8 @@ golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 h1:46ULzRKLh1CwgRq2dC5SlBzEqqNCi8rreOZnNrbqcIY=
 golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 h1:/ZHdbVpdR/jk3g30/d4yUL0JU9kksj8+F/bnQUVLGDM=
+golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
--- 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
Author	SHA1	Message	Date
stakater-user	0b7ca82218	[skip-ci] Update artifacts	2022-06-20 07:26:00 +00:00
Faizan Ahmad	88fe843285	Merge pull request #311 from stakater/update-golang-version Update golang version	2022-06-20 09:06:43 +02:00
faizanahmad055	cf31fed9d3	Merge branch 'master' of github.com:stakater/Reloader into update-golang-version	2022-06-18 23:56:53 +02:00
stakater-user	ba7f7537fb	[skip-ci] Update artifacts	2022-06-18 21:55:13 +00:00
Faizan Ahmad	499ecf9da5	Merge pull request #314 from maxwell-jiang/reloader-update2 the specific configmap/secret name can be regexp-ly selected	2022-06-18 23:33:52 +02:00
stakater-user	6188811b94	[skip-ci] Update artifacts	2022-06-18 21:29:26 +00:00
faizanahmad055	0f2395309f	Fix readme Signed-off-by: faizanahmad055 <faizan.ahmad55@outlook.com>	2022-06-18 23:17:38 +02:00
faizanahmad055	41d4fa56ca	Merge branch 'master' of github.com:stakater/Reloader into update-golang-version	2022-06-18 23:13:35 +02:00
Faizan Ahmad	bf21677357	Merge pull request #316 from scottd018/fix-cve-crypto-golang-version fix: Fixes #315, upgraded version of crypto package to non-vulnerable…	2022-06-18 22:54:47 +02:00
stakater-user	c58d0965d5	[skip-ci] Update artifacts	2022-06-09 16:35:12 +00:00
Faizan Ahmad	ec1f7a68de	Merge pull request #318 from daconstenla/patch-1 Set the namespace for the service	2022-06-09 18:11:53 +02:00
David Constenla	68a353d097	Set the namespace for the service like for the other resources	2022-06-09 08:11:06 +02:00
Dustin Scott	c82886c921	fix: Fixes #315 , upgraded version of crypto package to non-vulnerable version As per CVE at https://nvd.nist.gov/vuln/detail/CVE-2020-29652, upgraded to the acceptable version. It should be noted that this PR was originally in place to cover an upgrade to go version 1.17.9, however a PR was discovered at https://github.com/stakater/Reloader/pull/311 which can be merged independently of this one. Once this commit is merged as well as https://github.com/stakater/Reloader/pull/311, the fix for #315 is complete. Signed-off-by: Dustin Scott <sdustin@vmware.com>	2022-06-01 11:52:16 -05:00
Maxwell Jiang	4b9844f5c3	the specific configmap/secret name can be regexp-ly selected	2022-05-31 01:34:56 -05:00
stakater-user	1e4016587c	[skip-ci] Update artifacts	2022-05-27 10:08:24 +00:00
faizanahmad055	198e5631d4	Merge branch 'master' of github.com:stakater/Reloader into update-golang-version	2022-05-27 11:46:17 +02:00
Faizan Ahmad	f21ad29188	Merge pull request #312 from stakater/remove-spell-checker Remove spell-checker	2022-05-27 11:45:22 +02:00
faizanahmad055	cd7ec500a7	Remove deadlink Signed-off-by: faizanahmad055 <faizan.ahmad55@outlook.com>	2022-05-27 11:36:07 +02:00
faizanahmad055	030e51351a	Remove spell-checker Signed-off-by: faizanahmad055 <faizan.ahmad55@outlook.com>	2022-05-27 11:18:24 +02:00
faizanahmad055	8703c150e0	Remove deadlink Signed-off-by: faizanahmad055 <faizan.ahmad55@outlook.com>	2022-05-27 10:37:43 +02:00
faizanahmad055	1d7192180f	Merge branch 'master' of github.com:stakater/Reloader into update-golang-version	2022-05-26 18:24:38 +02:00
stakater-user	9d1733200a	[skip-ci] Update artifacts	2022-05-26 15:33:56 +00:00
Faizan Ahmad	841db3c829	Merge pull request #310 from stakater/remove-docker-lint Remove docker linting from Pull request	2022-05-26 17:11:18 +02:00
faizanahmad055	d29c99ffef	Remove docker linting from Pull request Signed-off-by: faizanahmad055 <faizan.ahmad55@outlook.com>	2022-05-26 14:57:51 +02:00
faizanahmad055	3b572568be	Update golang version to 1.18.2 Signed-off-by: faizanahmad055 <faizan.ahmad55@outlook.com>	2022-05-26 14:50:23 +02:00