Skip to content

Commit 48e2db4

Browse files
fdberlkingfdberlking
authoredFeb 7, 2024
Merge branch 'master' into issue/587
·
v1.4.0merge-758
2 parents dbe44e1 + 35cae84 commit 48e2db4

File tree

6 files changed

+39
-42
lines changed

6 files changed

+39
-42
lines changed
 

‎.vale.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
StylesPath = styles
22
MinAlertLevel = warning
33

4-
Packages = https://github.com/stakater/vale-package/releases/download/v0.0.6/Stakater.zip
4+
Packages = https://github.com/stakater/vale-package/releases/download/v0.0.7/Stakater.zip
55
Vocab = Stakater
66

77
# Only check MarkDown files

‎README.md

+25-28
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ By default, Reloader gets deployed in `default` namespace and watches changes `s
189189
Reloader can be configured to ignore the resources `secrets` and `configmaps` by passing the following arguments (`spec.template.spec.containers.args`) to its container :
190190

191191
| Argument | Description |
192-
| -------------------------------- | -------------------- |
192+
|----------------------------------|----------------------|
193193
| --resources-to-ignore=configMaps | To ignore configMaps |
194194
| --resources-to-ignore=secrets | To ignore secrets |
195195

@@ -199,7 +199,7 @@ Reloader can be configured to only watch secrets/configmaps with one or more lab
199199

200200
**Note:** The old `:` delimited key value mappings are deprecated and if provided will be translated to `key=value`. Likewise, if a wildcard value is provided (e.g. `key:*`) it will be translated to the standalone `key` which checks for key existence.
201201

202-
These selectors can be combined together, for example with:
202+
These selectors can be combined, for example with:
203203

204204
```yaml
205205
--resource-label-selector=reloader=enabled,key-exists,another-label in (value1,value2,value3)
@@ -211,20 +211,17 @@ Only configmaps or secrets labeled like the following will be watched:
211211
kind: ConfigMap
212212
apiVersion: v1
213213
metadata:
214-
...
215214
labels:
216215
reloader: enabled
217216
key-exists: yes
218217
another-label: value1
219-
220-
...
221218
```
222219

223220
Reloader can be configured to only watch namespaces labeled with one or more labels using the `--namespace-selector` parameter. Supported operators are `!, in, notin, ==, =, !=`, if no operator is found the 'exists' operator is inferred (i.e. key only). Additional examples of these selectors can be found in the [Kubernetes Docs](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#label-selectors).
224221

225222
**Note:** The old `:` delimited key value mappings are deprecated and if provided will be translated to `key=value`. Likewise, if a wildcard value is provided (e.g. `key:*`) it will be translated to the standalone `key` which checks for key existence.
226223

227-
These selectors can be combined together, for example with:
224+
These selectors can be combined, for example with:
228225

229226
```yaml
230227
--namespace-selector=reloader=enabled,test=true
@@ -236,11 +233,9 @@ Only namespaces labeled as below would be watched and eligible for reloads:
236233
kind: Namespace
237234
apiVersion: v1
238235
metadata:
239-
...
240236
labels:
241237
reloader: enabled
242238
test: true
243-
...
244239
```
245240

246241
### Vanilla Kustomize
@@ -261,7 +256,7 @@ You can write your own `kustomization.yaml` using ours as a 'base' and write pat
261256
apiVersion: kustomize.config.k8s.io/v1beta1
262257
kind: Kustomization
263258
264-
bases:
259+
resources:
265260
- https://github.com/stakater/Reloader/deployments/kubernetes
266261
267262
namespace: reloader
@@ -287,24 +282,24 @@ helm install stakater/reloader --set reloader.watchGlobally=false --namespace te
287282

288283
Reloader can be configured to ignore the resources `secrets` and `configmaps` by using the following parameters of `values.yaml` file:
289284

290-
| Parameter | Description | Type |
291-
| ---------------- | -------------------------------------------------------------- | ------- |
292-
| ignoreSecrets | To ignore secrets. Valid value are either `true` or `false` | boolean |
293-
| ignoreConfigMaps | To ignore configMaps. Valid value are either `true` or `false` | boolean |
285+
| Parameter | Description | Type | Default |
286+
|------------------|----------------------------------------------------------------|---------|---------|
287+
| ignoreSecrets | To ignore secrets. Valid value are either `true` or `false` | boolean | false |
288+
| ignoreConfigMaps | To ignore configMaps. Valid value are either `true` or `false` | boolean | false |
294289

295290
**Note:** At one time only one of these resource can be ignored, trying to do it will cause error in helm template compilation.
296291

297292
Reloader can be configured to only watch namespaces labeled with one or more labels using the `namespaceSelector` parameter
298293

299-
| Parameter | Description | Type |
300-
| ---------------- | ---------------------------------------------------------------------------------- | ------- |
301-
| namespaceSelector | list of comma separated label selectors, if multiple are provided they are combined with the AND operator | string |
294+
| Parameter | Description | Type | Default |
295+
|-------------------|-----------------------------------------------------------------------------------------------------------|--------|---------|
296+
| namespaceSelector | list of comma separated label selectors, if multiple are provided they are combined with the AND operator | string | "" |
302297

303298
Reloader can be configured to only watch configmaps/secrets labeled with one or more labels using the `resourceLabelSelector` parameter
304299

305-
| Parameter | Description | Type |
306-
| ---------------------- | ---------------------------------------------------------------------------------- | ------- |
307-
| resourceLabelSelector | list of comma separated label selectors, if multiple are provided they are combined with the AND operator | string |
300+
| Parameter | Description | Type | Default |
301+
|-----------------------|-----------------------------------------------------------------------------------------------------------|--------|---------|
302+
| resourceLabelSelector | list of comma separated label selectors, if multiple are provided they are combined with the AND operator | string | "" |
308303

309304
**Note:** Both `namespaceSelector` & `resourceLabelSelector` can be used together. If they are then both conditions must be met for the configmap or secret to be eligible to trigger reload events. (e.g. If a configMap matches `resourceLabelSelector` but `namespaceSelector` does not match the namespace the configmap is in, it will be ignored).
310305

@@ -314,25 +309,27 @@ You can enable to scrape Reloader's Prometheus metrics by setting `serviceMonito
314309

315310
**Note:** Reloading of OpenShift (DeploymentConfig) and/or Argo `Rollouts` has to be enabled explicitly because it might not be always possible to use it on a cluster with restricted permissions. This can be done by changing the following parameters:
316311

317-
| Parameter | Description | Type |
318-
|------------------|------------------------------------------------------------------------------------------------------------------------------------------| ------- |
319-
| isOpenshift | Enable OpenShift DeploymentConfigs. Valid value are either `true` or `false` | boolean |
320-
| isArgoRollouts | Enable Argo `Rollouts`. Valid value are either `true` or `false` | boolean |
321-
| reloadOnCreate | Enable reload on create events. Valid value are either `true` or `false` | boolean |
322-
| syncAfterRestart | Enable sync after Reloader restarts for **Add** events, works only when reloadOnCreate is `true`. Valid value are either `true` or `false` | boolean |
312+
| Parameter | Description | Type | Default |
313+
|------------------|--------------------------------------------------------------------------------------------------------------------------------------------|---------|---------|
314+
| isOpenshift | Enable OpenShift DeploymentConfigs. Valid value are either `true` or `false` | boolean | false |
315+
| isArgoRollouts | Enable Argo `Rollouts`. Valid value are either `true` or `false` | boolean | false |
316+
| reloadOnCreate | Enable reload on create events. Valid value are either `true` or `false` | boolean | false |
317+
| syncAfterRestart | Enable sync after Reloader restarts for **Add** events, works only when reloadOnCreate is `true`. Valid value are either `true` or `false` | boolean | false |
323318

324319
**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.
325320

326-
**ReloadOnCreate** reloadOnCreate controls how Reloader handles secrets being added to the cache for the first time. If reloadOnCreate is set to true:
321+
**reloadOnCreate** controls how Reloader handles secrets being added to the cache for the first time. If reloadOnCreate is set to true:
327322

328323
- Configmaps/secrets being added to the cache will cause Reloader to perform a rolling update of the associated workload.
329324
- When applications are deployed for the first time, Reloader will perform a rolling update of the associated workload.
330325
- If you are running Reloader in HA mode all workloads will have a rolling update performed when a new leader is elected.
331326

332-
If ReloadOnCreate is set to false:
327+
If reloadOnCreate is set to false:
333328

334329
- Updates to configMaps/Secrets that occur while there is no leader will not be picked up by the new leader until a subsequent update of the configmap/secret occurs. In the worst case the window in which there can be no leader is 15s as this is the LeaseDuration.
335330

331+
**Note:** By default, **reloadOnCreate** and **syncAfterRestart** are both set to false. Both need to be enabled explicitly.
332+
336333
## Help
337334

338335
### Documentation
@@ -360,7 +357,7 @@ Please use the [issue tracker](https://github.com/stakater/Reloader/issues) to r
360357

361358
1. Deploy Reloader.
362359
1. Run `okteto up` to activate your development container.
363-
1. `make build`.
360+
1. `make build`
364361
1. `./Reloader`
365362

366363
PRs are welcome. In general, we follow the "fork-and-pull" Git workflow.

‎deployments/kubernetes/chart/reloader/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
apiVersion: v1
44
name: reloader
55
description: Reloader chart that runs on kubernetes
6-
version: 1.0.65
7-
appVersion: v1.0.65
6+
version: 1.0.67
7+
appVersion: v1.0.67
88
keywords:
99
- Reloader
1010
- kubernetes

‎deployments/kubernetes/chart/reloader/values.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ reloader:
8787
labels:
8888
provider: stakater
8989
group: com.stakater.platform
90-
version: v1.0.65
90+
version: v1.0.67
9191
image:
9292
name: ghcr.io/stakater/reloader
93-
tag: v1.0.65
93+
tag: v1.0.67
9494
pullPolicy: IfNotPresent
9595
# Support for extra environment variables.
9696
env:

‎deployments/kubernetes/manifests/deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
template:
1616
spec:
1717
containers:
18-
- image: "ghcr.io/stakater/reloader:v1.0.65"
18+
- image: "ghcr.io/stakater/reloader:v1.0.67"
1919
imagePullPolicy: IfNotPresent
2020
name: reloader-reloader
2121

‎deployments/kubernetes/reloader.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
meta.helm.sh/release-name: "reloader"
99
labels:
1010
app: reloader-reloader
11-
chart: "reloader-1.0.65"
11+
chart: "reloader-1.0.67"
1212
release: "reloader"
1313
heritage: "Helm"
1414
app.kubernetes.io/managed-by: "Helm"
@@ -25,7 +25,7 @@ metadata:
2525
meta.helm.sh/release-name: "reloader"
2626
labels:
2727
app: reloader-reloader
28-
chart: "reloader-1.0.65"
28+
chart: "reloader-1.0.67"
2929
release: "reloader"
3030
heritage: "Helm"
3131
app.kubernetes.io/managed-by: "Helm"
@@ -92,7 +92,7 @@ metadata:
9292
meta.helm.sh/release-name: "reloader"
9393
labels:
9494
app: reloader-reloader
95-
chart: "reloader-1.0.65"
95+
chart: "reloader-1.0.67"
9696
release: "reloader"
9797
heritage: "Helm"
9898
app.kubernetes.io/managed-by: "Helm"
@@ -115,13 +115,13 @@ metadata:
115115
meta.helm.sh/release-name: "reloader"
116116
labels:
117117
app: reloader-reloader
118-
chart: "reloader-1.0.65"
118+
chart: "reloader-1.0.67"
119119
release: "reloader"
120120
heritage: "Helm"
121121
app.kubernetes.io/managed-by: "Helm"
122122
group: com.stakater.platform
123123
provider: stakater
124-
version: v1.0.65
124+
version: v1.0.67
125125
name: reloader-reloader
126126
namespace: default
127127
spec:
@@ -135,16 +135,16 @@ spec:
135135
metadata:
136136
labels:
137137
app: reloader-reloader
138-
chart: "reloader-1.0.65"
138+
chart: "reloader-1.0.67"
139139
release: "reloader"
140140
heritage: "Helm"
141141
app.kubernetes.io/managed-by: "Helm"
142142
group: com.stakater.platform
143143
provider: stakater
144-
version: v1.0.65
144+
version: v1.0.67
145145
spec:
146146
containers:
147-
- image: "ghcr.io/stakater/reloader:v1.0.65"
147+
- image: "ghcr.io/stakater/reloader:v1.0.67"
148148
imagePullPolicy: IfNotPresent
149149
name: reloader-reloader
150150

0 commit comments

Comments
 (0)
Please sign in to comment.