Skip to content

Commit ed32099

Browse files
imuni4funimuni4fun
committed
addressed helm linting errors
1 parent 84e2797 commit ed32099

File tree

11 files changed

+45
-43
lines changed

11 files changed

+45
-43
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ go.work.sum
2525
pkg
2626

2727
# binary
28-
oneShotMetricsServer
28+
./oneShotMetricsServer

‎charts/oneShotMetricsServer/Chart.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
apiVersion: v2
22
name: oneShotMetricsServer
3-
description: A Helm chart for Kubernetes
3+
description: A Helm chart for oneShotMetricsServer deployment to Kubernetes
44
type: application
55
version: "0.0.1"
66
appVersion: "0.1.13"
7+
icon: https://github.com/imuni4fun/oneShotMetricsServer/blob/main/logo.png
8+
maintainers:
9+
- name: Jason Keller

‎charts/oneShotMetricsServer/templates/cronjob.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: batch/v1
22
kind: CronJob
33
metadata:
44
labels:
5-
app.kubernetes.io/name: {{ .Values.serviceName | required }}
6-
namespace: {{ .Values.serviceNamespace | required }}
5+
app.kubernetes.io/name: {{ .Values.serviceName | required "serviceName is required" }}
6+
namespace: {{ .Values.serviceNamespace | required "serviceNamespace is required" }}
77
name: test-event
88
spec:
99
schedule: "* * * * *"
@@ -14,17 +14,17 @@ spec:
1414
spec:
1515
template:
1616
metadata:
17-
namespace: {{ .Values.serviceNamespace | required }}
17+
namespace: {{ .Values.serviceNamespace | required "serviceNamespace is required" }}
1818
labels:
19-
app.kubernetes.io/name: {{ .Values.serviceName | required }}
19+
app.kubernetes.io/name: {{ .Values.serviceName | required "serviceName is required" }}
2020
spec:
2121
containers:
2222
- name: runner
23-
image: "{{ .Values.test-event.image | required }}:{{ .Values.test-event.tag | required }}"
23+
image: "{{ .Values.testEvent.image | required "testEvent.image is required" }}:{{ .Values.testEvent.tag | required "testEvent.tag is required" }}"
2424
imagePullPolicy: IfNotPresent
2525
command:
2626
- /bin/sh
2727
- -c
28-
- curl "http://{{ .Values.serviceName | required }}.{{ .Values.serviceNamespace | required }}.svc.cluster.local:{{ .Values.service.port | required }}/event?type=test&message=cron_test" -X POST
28+
- curl "http://{{ .Values.serviceName | required "serviceName is required" }}.{{ .Values.serviceNamespace | required "serviceNamespace is required" }}.svc.cluster.local:{{ .Values.service.port | required "service.port is required" }}/event?type=test&message=cron_test" -X POST
2929
restartPolicy: Never
3030

‎charts/oneShotMetricsServer/templates/deployment.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@ apiVersion: apps/v1
22
kind: Deployment
33
metadata:
44
labels:
5-
app.kubernetes.io/name: {{ .Values.serviceName | required }}
6-
namespace: {{ .Values.serviceNamespace | required }}
7-
name: {{ .Values.serviceName | required }}
5+
app.kubernetes.io/name: {{ .Values.serviceName | required "serviceName is required" }}
6+
namespace: {{ .Values.serviceNamespace | required "serviceNamespace is required" }}
7+
name: {{ .Values.serviceName | required "serviceName is required" }}
88
spec:
99
replicas: 1
1010
revisionHistoryLimit: 1
1111
selector:
1212
matchLabels:
13-
app.kubernetes.io/name: {{ .Values.serviceName | required }}
13+
app.kubernetes.io/name: {{ .Values.serviceName | required "serviceName is required" }}
1414
template:
1515
metadata:
1616
labels:
17-
app.kubernetes.io/name: {{ .Values.serviceName | required }}
17+
app.kubernetes.io/name: {{ .Values.serviceName | required "serviceName is required" }}
1818
spec:
1919
containers:
20-
- image: "{{ .Values.server.image | required }}:{{ .Values.server.tag | required }}"
20+
- image: "{{ .Values.server.image | required "server.image is required" }}:{{ .Values.server.tag | required "server.tag is required" }}"
2121
env:
2222
- name: LOG_LEVEL
23-
value: {{ .Values.server.logLevel | required }}
23+
value: {{ .Values.server.logLevel | required "server.logLevel is required" }}
2424
imagePullPolicy: IfNotPresent
2525
name: web-server
2626
livenessProbe:
@@ -32,8 +32,8 @@ spec:
3232
periodSeconds: 60
3333
timeoutSeconds: 10
3434
ports:
35-
- containerPort: {{ .Values.server.port | required }}
35+
- containerPort: {{ .Values.server.port | required "server.port is required" }}
3636
name: metrics
3737
protocol: TCP
3838
resources:
39-
{{- toYaml .Values.server.resources | required | nindent 10 }}
39+
{{- toYaml .Values.server.resources | required "server.resources is required" | nindent 10 }}

‎charts/oneShotMetricsServer/templates/namespace.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ apiVersion: v1
22
kind: Namespace
33
metadata:
44
labels:
5-
app.kubernetes.io/name: {{ .Values.serviceName | required }}
6-
name: {{ .Values.serviceNamespace | required }}
5+
app.kubernetes.io/name: {{ .Values.serviceName | required "serviceName is required" }}
6+
name: {{ .Values.serviceNamespace | required "serviceNamespace is required" }}

‎charts/oneShotMetricsServer/templates/networkpolicy.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@ apiVersion: networking.k8s.io/v1
33
kind: NetworkPolicy
44
metadata:
55
labels:
6-
app.kubernetes.io/name: {{ .Values.serviceName | required }}
7-
name: "allow-{{ .Values.serviceName | required }}-ingress"
8-
namespace: {{ .Values.serviceNamespace | required }}
6+
app.kubernetes.io/name: {{ .Values.serviceName | required "serviceName is required" }}
7+
name: "allow-{{ .Values.serviceName | required "serviceName is required" }}-ingress"
8+
namespace: {{ .Values.serviceNamespace | required "serviceNamespace is required" }}
99
spec:
1010
ingress:
1111
- from:
12-
{{ .Values.netpol.from | required | nindent 4 }}
12+
- namespaceSelector:
13+
matchLabels:
14+
name: {{ .Values.serviceNamespace | required "serviceNamespace is required" }}
1315
podSelector:
1416
matchLabels:
15-
app.kubernetes.io/name: {{ .Values.serviceName | required }}
17+
app.kubernetes.io/name: {{ .Values.serviceName | required "serviceName is required" }}
1618
policyTypes:
1719
- Ingress
1820
{{ end }}

‎charts/oneShotMetricsServer/templates/service.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ apiVersion: v1
22
kind: Service
33
metadata:
44
labels:
5-
app.kubernetes.io/name: {{ .Values.serviceName | required }}
6-
namespace: {{ .Values.serviceNamespace | required }}
7-
name: {{ .Values.serviceName | required }}
5+
app.kubernetes.io/name: {{ .Values.serviceName | required "serviceName is required" }}
6+
namespace: {{ .Values.serviceNamespace | required "serviceNamespace is required" }}
7+
name: {{ .Values.serviceName | required "serviceName is required" }}
88
spec:
99
ports:
10-
- port: {{ .Values.service.port | required }}
10+
- port: {{ .Values.service.port | required "service.port is required" }}
1111
targetPort: metrics
1212
protocol: TCP
1313
name: metrics
1414
selector:
15-
app.kubernetes.io/name: {{ .Values.serviceName | required }}
15+
app.kubernetes.io/name: {{ .Values.serviceName | required "serviceName is required" }}

‎charts/oneShotMetricsServer/templates/servicemonitor.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ apiVersion: monitoring.coreos.com/v1
22
kind: ServiceMonitor
33
metadata:
44
labels:
5-
app.kubernetes.io/name: {{ .Values.serviceName | required }}
6-
name: {{ .Values.serviceName | required }}
5+
app.kubernetes.io/name: {{ .Values.serviceName | required "serviceName is required" }}
6+
name: {{ .Values.serviceName | required "serviceName is required" }}
77
spec:
88
namespaceSelector:
99
matchNames:
10-
- {{ .Values.serviceNamespace | required }}
10+
- {{ .Values.serviceNamespace | required "serviceNamespace is required" }}
1111
endpoints:
1212
- interval: 30s
1313
path: /metrics
1414
port: metrics
1515
scrapeTimeout: 10s
1616
selector:
1717
matchLabels:
18-
app.kubernetes.io/name: {{ .Values.serviceName | required }}
18+
app.kubernetes.io/name: {{ .Values.serviceName | required "serviceName is required" }}

‎charts/oneShotMetricsServer/templates/tests/test-connection.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ metadata:
44
annotations:
55
"helm.sh/hook": test
66
labels:
7-
app.kubernetes.io/name: {{ .Values.serviceName | required }}
8-
namespace: {{ .Values.serviceNamespace | required }}
7+
app.kubernetes.io/name: {{ .Values.serviceName | required "serviceName is required" }}
8+
namespace: {{ .Values.serviceNamespace | required "serviceNamespace is required" }}
99
name: test-connection
1010
spec:
1111
containers:
1212
- name: runner
13-
image: "{{ .Values.test-event.image | required }}:{{ .Values.test-event.tag | required }}"
13+
image: "{{ .Values.testEvent.image | required "testEvent.image is required" }}:{{ .Values.testEvent.tag | required "testEvent.tag is required" }}"
1414
imagePullPolicy: IfNotPresent
1515
command:
1616
- /bin/sh
1717
- -c
18-
- curl "http://{{ .Values.serviceName | required }}.{{ .Values.serviceNamespace | required }}.svc.cluster.local:{{ .Values.service.port | required }}/event?type=test&message=helm_test" -X POST
18+
- curl "http://{{ .Values.serviceName | required "serviceName is required" }}.{{ .Values.serviceNamespace | required "serviceNamespace is required" }}.svc.cluster.local:{{ .Values.service.port | required "service.port is required" }}/event?type=test&message=helm_test" -X POST
1919
restartPolicy: Never

‎charts/oneShotMetricsServer/values.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# all these values are required
2-
serviceName: oneShotMetricsServer
3-
serviceNamespace: oneShotMetricsServer
2+
serviceName: oneshotmetricsserver
3+
serviceNamespace: oneshotmetricsserver
44

5-
test-event:
5+
testEvent:
66
image: docker.io/alpine/curl
77
tag: 8.10.0
88

@@ -25,7 +25,4 @@ service:
2525
netpol:
2626
generate: true
2727
from:
28-
- namespaceSelector:
29-
matchLabels:
30-
name: {{ .Values.serviceNamespace | required }}
3128

‎logo.png

326 KB
Loading

0 commit comments

Comments
 (0)