Merge branch 'master' into feature/cronjob_trigger

stakater · Jul 26, 2023 · 3e7cc40 · 3e7cc40
2 parents 5e7f130 + ffe6c65
commit 3e7cc40
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 23 deletions.
diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml
@@ -13,7 +13,7 @@ env:
 
 jobs:
   qa:
-    uses: stakater/.github/.github/workflows/[email protected].43
+    uses: stakater/.github/.github/workflows/[email protected].44
     with:
       MD_CONFIG: .github/md_config.json
       DOC_SRC: README.md docs

diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml
@@ -22,7 +22,7 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v3
         with:
-          persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token
+          token: ${{ secrets.STAKATER_GITHUB_TOKEN }}        
           fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
 
       # Setting up helm binary

diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@ ARG BUILDER_IMAGE
 ARG BASE_IMAGE
 
 # Build the manager binary
-FROM --platform=${BUILDPLATFORM} ${BUILDER_IMAGE:-golang:1.20.3} as builder
+FROM --platform=${BUILDPLATFORM} ${BUILDER_IMAGE:-golang:1.20.6} as builder
 
 ARG TARGETOS
 ARG TARGETARCH

diff --git a/README.md b/README.md
@@ -317,6 +317,8 @@ You can enable to scrape Reloader's Prometheus metrics by setting `serviceMonito
 | reloadOnCreate   | Enable reload on create events. Valid value are either `true` or `false`                                                                 | boolean |
 | syncAfterRestart | Enable sync after Reloader restarts for **Add** events, works only when reloadOnCreate is `true`. Valid value are either `true` or `false` | boolean |
 
+**isOpenShift** Recent versions of OpenShift (tested on 4.13.3) require the specified user to be in an uid range which is dynamically assigned by the namespace. The solution is to unset the runAsUser variable via ``deployment.securityContext.runAsUser=null`` and let OpenShift assign it at install.
+
 **ReloadOnCreate** reloadOnCreate controls how Reloader handles secrets being added to the cache for the first time. If reloadOnCreate is set to true:
 
 - Configmaps/secrets being added to the cache will cause Reloader to perform a rolling update of the associated workload.

diff --git 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: 1.0.30
-appVersion: v1.0.30
+version: 1.0.32
+appVersion: v1.0.32
 keywords:
   - Reloader
   - kubernetes

diff --git a/deployments/kubernetes/chart/reloader/values.yaml b/deployments/kubernetes/chart/reloader/values.yaml
@@ -83,10 +83,10 @@ reloader:
     labels:
       provider: stakater
       group: com.stakater.platform
-      version: v1.0.30
+      version: v1.0.32
     image:
       name: ghcr.io/stakater/reloader
-      tag: v1.0.30
+      tag: v1.0.32
       pullPolicy: IfNotPresent
     # Support for extra environment variables.
     env:

diff --git 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-1.0.30"
+    chart: "reloader-1.0.32"
     release: "reloader"
     heritage: "Helm"
     app.kubernetes.io/managed-by: "Helm"

diff --git 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-1.0.30"
+    chart: "reloader-1.0.32"
     release: "reloader"
     heritage: "Helm"
     app.kubernetes.io/managed-by: "Helm"

diff --git 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-1.0.30"
+    chart: "reloader-1.0.32"
     release: "reloader"
     heritage: "Helm"
     app.kubernetes.io/managed-by: "Helm"
     group: com.stakater.platform
     provider: stakater
-    version: v1.0.30
+    version: v1.0.32
   name: reloader-reloader
   namespace: default
 spec:
@@ -28,16 +28,16 @@ spec:
     metadata:
       labels:
         app: reloader-reloader
-        chart: "reloader-1.0.30"
+        chart: "reloader-1.0.32"
         release: "reloader"
         heritage: "Helm"
         app.kubernetes.io/managed-by: "Helm"
         group: com.stakater.platform
         provider: stakater
-        version: v1.0.30
+        version: v1.0.32
     spec:
       containers:
-      - image: "ghcr.io/stakater/reloader:v1.0.30"
+      - image: "ghcr.io/stakater/reloader:v1.0.32"
         imagePullPolicy: IfNotPresent
         name: reloader-reloader
 

diff --git 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-1.0.30"
+    chart: "reloader-1.0.32"
     release: "reloader"
     heritage: "Helm"
     app.kubernetes.io/managed-by: "Helm"

diff --git 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-1.0.30"
+    chart: "reloader-1.0.32"
     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-1.0.30"
+    chart: "reloader-1.0.32"
     release: "reloader"
     heritage: "Helm"
     app.kubernetes.io/managed-by: "Helm"
@@ -79,7 +79,7 @@ metadata:
     meta.helm.sh/release-name: "reloader"
   labels:
     app: reloader-reloader
-    chart: "reloader-1.0.30"
+    chart: "reloader-1.0.32"
     release: "reloader"
     heritage: "Helm"
     app.kubernetes.io/managed-by: "Helm"
@@ -102,13 +102,13 @@ metadata:
     meta.helm.sh/release-name: "reloader"
   labels:
     app: reloader-reloader
-    chart: "reloader-1.0.30"
+    chart: "reloader-1.0.32"
     release: "reloader"
     heritage: "Helm"
     app.kubernetes.io/managed-by: "Helm"
     group: com.stakater.platform
     provider: stakater
-    version: v1.0.30
+    version: v1.0.32
   name: reloader-reloader
   namespace: default
 spec:
@@ -122,16 +122,16 @@ spec:
     metadata:
       labels:
         app: reloader-reloader
-        chart: "reloader-1.0.30"
+        chart: "reloader-1.0.32"
         release: "reloader"
         heritage: "Helm"
         app.kubernetes.io/managed-by: "Helm"
         group: com.stakater.platform
         provider: stakater
-        version: v1.0.30
+        version: v1.0.32
     spec:
       containers:
-      - image: "ghcr.io/stakater/reloader:v1.0.30"
+      - image: "ghcr.io/stakater/reloader:v1.0.32"
         imagePullPolicy: IfNotPresent
         name: reloader-reloader