Skip to content

Commit 1cae7a0

Browse files
MuneebAijazMuneebAijaz
authoredApr 8, 2024··
Merge branch 'master' into issue-582-auto-annotation-with-resource-type-squashed
·
v1.4.0merge-758
2 parents b4fe7fb + ae5bc2c commit 1cae7a0

File tree

14 files changed

+242
-145
lines changed

14 files changed

+242
-145
lines changed
 

‎.github/workflows/pull_request.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414

1515
jobs:
1616
qa:
17-
uses: stakater/.github/.github/workflows/pull_request_doc_qa.yaml@v0.0.64
17+
uses: stakater/.github/.github/workflows/pull_request_doc_qa.yaml@v0.0.65
1818
with:
1919
MD_CONFIG: .github/md_config.json
2020
DOC_SRC: README.md docs

‎.github/workflows/push.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,9 @@ jobs:
205205
helm template reloader deployments/kubernetes/chart/reloader/ > deployments/kubernetes/reloader.yaml
206206
helm template reloader deployments/kubernetes/chart/reloader/ --output-dir deployments/kubernetes/manifests && mv deployments/kubernetes/manifests/reloader/templates/* deployments/kubernetes/manifests/ && rm -r deployments/kubernetes/manifests/reloader
207207
208+
- name: Remove labels and annotations from manifests
209+
run: make remove-labels-annotations
210+
208211
# Publish helm chart
209212
- name: Login to ghcr via helm
210213
run: |

‎.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.8/Stakater.zip
4+
Packages = https://github.com/stakater/vale-package/releases/download/v0.0.14/Stakater.zip
55
Vocab = Stakater
66

77
# Only check MarkDown files

‎Makefile

+22
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,25 @@ bump-chart:
8686
sed -i "s/^appVersion:.*/appVersion: v$(VERSION)/" deployments/kubernetes/chart/reloader/Chart.yaml
8787
sed -i "s/tag:.*/tag: v$(VERSION)/" deployments/kubernetes/chart/reloader/values.yaml
8888
sed -i "s/version:.*/version: v$(VERSION)/" deployments/kubernetes/chart/reloader/values.yaml
89+
90+
YQ_VERSION = v4.42.1
91+
YQ_BIN = $(shell pwd)/yq
92+
CURRENT_ARCH := $(shell uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/')
93+
94+
YQ_DOWNLOAD_URL = "https://github.com/mikefarah/yq/releases/download/$(YQ_VERSION)/yq_linux_$(CURRENT_ARCH)"
95+
96+
yq-install:
97+
@echo "Downloading yq $(YQ_VERSION) for linux/$(CURRENT_ARCH)"
98+
@curl -sL $(YQ_DOWNLOAD_URL) -o $(YQ_BIN)
99+
@chmod +x $(YQ_BIN)
100+
@echo "yq $(YQ_VERSION) installed at $(YQ_BIN)"
101+
102+
remove-labels-annotations: yq-install
103+
@for file in $$(find deployments/kubernetes/manifests -type f -name '*.yaml'); do \
104+
echo "Processing $$file"; \
105+
$(YQ_BIN) eval 'del(.metadata.labels, .metadata.annotations)' -i "$$file"; \
106+
done
107+
$(YQ_BIN) eval 'del(.spec.template.metadata.labels)' -i deployments/kubernetes/manifests/deployment.yaml
108+
$(YQ_BIN) eval 'del(.spec.selector.matchLabels)' -i deployments/kubernetes/manifests/deployment.yaml
109+
$(YQ_BIN) eval '.spec.selector.matchLabels.app = "reloader-reloader"' -i deployments/kubernetes/manifests/deployment.yaml
110+
$(YQ_BIN) eval '.spec.template.metadata.labels.app = "reloader-reloader"' -i deployments/kubernetes/manifests/deployment.yaml

‎README.md

+99-52
Large diffs are not rendered by default.

‎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.69
7-
appVersion: v1.0.69
6+
version: 1.0.75
7+
appVersion: v1.0.75
88
keywords:
99
- Reloader
1010
- kubernetes

‎deployments/kubernetes/chart/reloader/templates/verticalpodautoscaler.yaml

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
{{- if and (.Capabilities.APIVersions.Has "autoscaling.k8s.io/v1") (.Values.reloader.verticalPodAutoscaler.enabled) }}
2+
apiVersion: autoscaling.k8s.io/v1
3+
kind: VerticalPodAutoscaler
4+
metadata:
5+
name: {{ template "reloader-fullname" . }}
6+
namespace: {{ .Values.namespace | default .Release.Namespace }}
7+
labels:
8+
{{- include "reloader-labels.chart" . | nindent 4 }}
9+
spec:
10+
{{- with .Values.reloader.verticalPodAutoscaler.recommenders }}
11+
recommenders:
12+
{{- toYaml . | nindent 4 }}
13+
{{- end }}
14+
resourcePolicy:
15+
containerPolicies:
16+
- containerName: {{ template "reloader-fullname" . }}
17+
{{- with .Values.reloader.verticalPodAutoscaler.controlledResources }}
18+
controlledResources:
19+
{{- toYaml . | nindent 8 }}
20+
{{- end }}
21+
{{- if .Values.reloader.verticalPodAutoscaler.controlledValues }}
22+
controlledValues: {{ .Values.reloader.verticalPodAutoscaler.controlledValues }}
23+
{{- end }}
24+
{{- if .Values.reloader.verticalPodAutoscaler.maxAllowed }}
25+
maxAllowed:
26+
{{ toYaml .Values.reloader.verticalPodAutoscaler.maxAllowed | nindent 8 }}
27+
{{- end }}
28+
{{- if .Values.reloader.verticalPodAutoscaler.minAllowed }}
29+
minAllowed:
30+
{{ toYaml .Values.reloader.verticalPodAutoscaler.minAllowed | nindent 8 }}
31+
{{- end }}
32+
targetRef:
33+
apiVersion: apps/v1
34+
kind: Deployment
35+
name: {{ template "reloader-fullname" . }}
36+
{{- with .Values.reloader.verticalPodAutoscaler.updatePolicy }}
37+
updatePolicy:
38+
{{- toYaml . | nindent 4 }}
39+
{{- end }}
40+
{{- end }}

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

+36-3
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ reloader:
5555
securityContext:
5656
runAsNonRoot: true
5757
runAsUser: 65534
58+
seccompProfile:
59+
type: RuntimeDefault
5860

5961
containerSecurityContext: {}
6062
# capabilities:
@@ -87,10 +89,10 @@ reloader:
8789
labels:
8890
provider: stakater
8991
group: com.stakater.platform
90-
version: v1.0.69
92+
version: v1.0.75
9193
image:
9294
name: ghcr.io/stakater/reloader
93-
tag: v1.0.69
95+
tag: v1.0.75
9496
pullPolicy: IfNotPresent
9597
# Support for extra environment variables.
9698
env:
@@ -280,7 +282,38 @@ reloader:
280282
# matchLabels:
281283
# app.kubernetes.io/name: prometheus
282284
to: []
283-
285+
286+
# Enable vertical pod autoscaler
287+
verticalPodAutoscaler:
288+
enabled: false
289+
290+
# Recommender responsible for generating recommendation for the object.
291+
# List should be empty (then the default recommender will generate the recommendation)
292+
# or contain exactly one recommender.
293+
# recommenders:
294+
# - name: custom-recommender-performance
295+
296+
# List of resources that the vertical pod autoscaler can control. Defaults to cpu and memory
297+
controlledResources: []
298+
# Specifies which resource values should be controlled: RequestsOnly or RequestsAndLimits.
299+
# controlledValues: RequestsAndLimits
300+
301+
# Define the max allowed resources for the pod
302+
maxAllowed: {}
303+
# cpu: 200m
304+
# memory: 100Mi
305+
# Define the min allowed resources for the pod
306+
minAllowed: {}
307+
# cpu: 200m
308+
# memory: 100Mi
309+
310+
updatePolicy:
311+
# Specifies minimal number of replicas which need to be alive for VPA Updater to attempt pod eviction
312+
# minReplicas: 1
313+
# Specifies whether recommended updates are applied when a Pod is started and whether recommended updates
314+
# are applied during the life of a Pod. Possible values are "Off", "Initial", "Recreate", and "Auto".
315+
updateMode: Auto
316+
284317
volumeMounts: []
285318

286319
volumes: []

‎deployments/kubernetes/manifests/clusterrole.yaml

-10
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
11
---
22
# Source: reloader/templates/clusterrole.yaml
33
apiVersion: rbac.authorization.k8s.io/v1
4-
54
kind: ClusterRole
65
metadata:
7-
annotations:
8-
meta.helm.sh/release-namespace: "default"
9-
meta.helm.sh/release-name: "reloader"
10-
labels:
11-
app: reloader-reloader
12-
chart: "reloader-1.0.69"
13-
release: "reloader"
14-
heritage: "Helm"
15-
app.kubernetes.io/managed-by: "Helm"
166
name: reloader-reloader-role
177
rules:
188
- apiGroups:

‎deployments/kubernetes/manifests/clusterrolebinding.yaml

-10
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
11
---
22
# Source: reloader/templates/clusterrolebinding.yaml
33
apiVersion: rbac.authorization.k8s.io/v1
4-
54
kind: ClusterRoleBinding
65
metadata:
7-
annotations:
8-
meta.helm.sh/release-namespace: "default"
9-
meta.helm.sh/release-name: "reloader"
10-
labels:
11-
app: reloader-reloader
12-
chart: "reloader-1.0.69"
13-
release: "reloader"
14-
heritage: "Helm"
15-
app.kubernetes.io/managed-by: "Helm"
166
name: reloader-reloader-role-binding
177
roleRef:
188
apiGroup: rbac.authorization.k8s.io

‎deployments/kubernetes/manifests/deployment.yaml

+28-49
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,6 @@
33
apiVersion: apps/v1
44
kind: Deployment
55
metadata:
6-
annotations:
7-
meta.helm.sh/release-namespace: "default"
8-
meta.helm.sh/release-name: "reloader"
9-
labels:
10-
app: reloader-reloader
11-
chart: "reloader-1.0.69"
12-
release: "reloader"
13-
heritage: "Helm"
14-
app.kubernetes.io/managed-by: "Helm"
15-
group: com.stakater.platform
16-
provider: stakater
17-
version: v1.0.69
186
name: reloader-reloader
197
namespace: default
208
spec:
@@ -23,49 +11,40 @@ spec:
2311
selector:
2412
matchLabels:
2513
app: reloader-reloader
26-
release: "reloader"
2714
template:
2815
metadata:
2916
labels:
3017
app: reloader-reloader
31-
chart: "reloader-1.0.69"
32-
release: "reloader"
33-
heritage: "Helm"
34-
app.kubernetes.io/managed-by: "Helm"
35-
group: com.stakater.platform
36-
provider: stakater
37-
version: v1.0.69
3818
spec:
3919
containers:
40-
- image: "ghcr.io/stakater/reloader:v1.0.69"
41-
imagePullPolicy: IfNotPresent
42-
name: reloader-reloader
43-
44-
ports:
45-
- name: http
46-
containerPort: 9090
47-
livenessProbe:
48-
httpGet:
49-
path: /live
50-
port: http
51-
timeoutSeconds: 5
52-
failureThreshold: 5
53-
periodSeconds: 10
54-
successThreshold: 1
55-
initialDelaySeconds: 10
56-
readinessProbe:
57-
httpGet:
58-
path: /metrics
59-
port: http
60-
timeoutSeconds: 5
61-
failureThreshold: 5
62-
periodSeconds: 10
63-
successThreshold: 1
64-
initialDelaySeconds: 10
65-
66-
securityContext:
67-
{}
68-
securityContext:
20+
- image: "ghcr.io/stakater/reloader:v1.0.75"
21+
imagePullPolicy: IfNotPresent
22+
name: reloader-reloader
23+
ports:
24+
- name: http
25+
containerPort: 9090
26+
livenessProbe:
27+
httpGet:
28+
path: /live
29+
port: http
30+
timeoutSeconds: 5
31+
failureThreshold: 5
32+
periodSeconds: 10
33+
successThreshold: 1
34+
initialDelaySeconds: 10
35+
readinessProbe:
36+
httpGet:
37+
path: /metrics
38+
port: http
39+
timeoutSeconds: 5
40+
failureThreshold: 5
41+
periodSeconds: 10
42+
successThreshold: 1
43+
initialDelaySeconds: 10
44+
securityContext: {}
45+
securityContext:
6946
runAsNonRoot: true
7047
runAsUser: 65534
48+
seccompProfile:
49+
type: RuntimeDefault
7150
serviceAccountName: reloader-reloader

‎deployments/kubernetes/manifests/serviceaccount.yaml

-9
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,5 @@
33
apiVersion: v1
44
kind: ServiceAccount
55
metadata:
6-
annotations:
7-
meta.helm.sh/release-namespace: "default"
8-
meta.helm.sh/release-name: "reloader"
9-
labels:
10-
app: reloader-reloader
11-
chart: "reloader-1.0.69"
12-
release: "reloader"
13-
heritage: "Helm"
14-
app.kubernetes.io/managed-by: "Helm"
156
name: reloader-reloader
167
namespace: default

‎deployments/kubernetes/reloader.yaml

+10-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.69"
11+
chart: "reloader-1.0.75"
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.69"
28+
chart: "reloader-1.0.75"
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.69"
95+
chart: "reloader-1.0.75"
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.69"
118+
chart: "reloader-1.0.75"
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.69
124+
version: v1.0.75
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.69"
138+
chart: "reloader-1.0.75"
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.69
144+
version: v1.0.75
145145
spec:
146146
containers:
147-
- image: "ghcr.io/stakater/reloader:v1.0.69"
147+
- image: "ghcr.io/stakater/reloader:v1.0.75"
148148
imagePullPolicy: IfNotPresent
149149
name: reloader-reloader
150150

@@ -175,4 +175,6 @@ spec:
175175
securityContext:
176176
runAsNonRoot: true
177177
runAsUser: 65534
178+
seccompProfile:
179+
type: RuntimeDefault
178180
serviceAccountName: reloader-reloader

‎yq

9.47 MB
Binary file not shown.

0 commit comments

Comments
 (0)
Please sign in to comment.