Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync values file and template. Add error handling #29

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Sync values file and template. Add error handling #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
78f8a16
fix: add missing values from the charts
5nafu Mar 15, 2024
788c727
fix: move daemonset and deployment specific values to top level
5nafu Mar 15, 2024
e58712b
feat: add jsonschema file for proper errors when using wrong values.
5nafu Mar 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions charts/docker-hub-rate-limit-exporter-chart/templates/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ spec:
selector:
matchLabels:
{{- include "docker-hub-rate-limit-exporter.selectorLabels" . | nindent 6 }}
{{- if .Values.daemonset.updateStrategy }}
{{- if .Values.updateStrategy }}
updateStrategy:
{{ toYaml .Values.daemonset.updateStrategy | indent 4 }}
{{ toYaml .Values.updateStrategy | indent 4 }}
{{- end }}
template:
metadata:
Expand All @@ -20,8 +20,8 @@ spec:
annotations:
checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
{{- if .Values.daemonset.podAnnotations }}
{{- toYaml .Values.daemonset.podAnnotations | nindent 8 }}
{{- if .Values.podAnnotations }}
{{- toYaml .Values.podAnnotations | nindent 8 }}
{{- end }}
spec:
{{- if .Values.imagePullSecrets }}
Expand Down Expand Up @@ -81,17 +81,17 @@ spec:
configMapKeyRef:
name: {{ include "docker-hub-rate-limit-exporter.fullname" . }}-configmap
key: exporter-port
{{- if .Values.daemonset.nodeSelector }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.daemonset.nodeSelector | indent 8 }}
{{ toYaml .Values.nodeSelector | indent 8 }}
{{- end }}
{{- if .Values.daemonset.affinity }}
{{- if .Values.affinity }}
affinity:
{{ toYaml .Values.daemonset.affinity | indent 8 }}
{{ toYaml .Values.affinity | indent 8 }}
{{- end }}
{{- if .Values.daemonset.tolerations }}
{{- if .Values.tolerations }}
tolerations:
{{ toYaml .Values.daemonset.tolerations | indent 8 }}
{{ toYaml .Values.tolerations | indent 8 }}
{{- end }}
hostNetwork: {{ .Values.hostNetwork }}
hostPID: {{ .Values.hostPID }}
Expand Down
18 changes: 9 additions & 9 deletions charts/docker-hub-rate-limit-exporter-chart/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
{{- include "docker-hub-rate-limit-exporter.labels" . | nindent 4 }}
spec:
replicas: {{ hasKey .Values.deployment "replicaCount" | ternary .Values.deployment.replicaCount 1 }}
replicas: {{ hasKey .Values "replicaCount" | ternary .Values.replicaCount 1 }}
selector:
matchLabels:
{{- include "docker-hub-rate-limit-exporter.selectorLabels" . | nindent 6 }}
Expand All @@ -18,8 +18,8 @@ spec:
annotations:
checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
{{- if .Values.deployment.podAnnotations }}
{{- toYaml .Values.deployment.podAnnotations | nindent 8 }}
{{- if .Values.podAnnotations }}
{{- toYaml .Values.podAnnotations | nindent 8 }}
{{- end }}
spec:
{{- if .Values.imagePullSecrets }}
Expand Down Expand Up @@ -79,17 +79,17 @@ spec:
configMapKeyRef:
name: {{ include "docker-hub-rate-limit-exporter.fullname" . }}-configmap
key: exporter-port
{{- if .Values.deployment.nodeSelector }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.deployment.nodeSelector | indent 8 }}
{{ toYaml .Values.nodeSelector | indent 8 }}
{{- end }}
{{- if .Values.deployment.affinity }}
{{- if .Values.affinity }}
affinity:
{{ toYaml .Values.deployment.affinity | indent 8 }}
{{ toYaml .Values.affinity | indent 8 }}
{{- end }}
{{- if .Values.deployment.tolerations }}
{{- if .Values.tolerations }}
tolerations:
{{ toYaml .Values.deployment.tolerations | indent 8 }}
{{ toYaml .Values.tolerations | indent 8 }}
{{- end }}

{{- end }}
246 changes: 246 additions & 0 deletions charts/docker-hub-rate-limit-exporter-chart/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,246 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"properties": {
"affinity": {
"properties": {},
"type": "object"
},
"config": {
"properties": {
"dockerhub": {
"properties": {
"password": {
"type": "string"
},
"username": {
"type": "string"
}
},
"type": "object"
},
"verbosity": {
"type": "integer"
}
},
"type": "object"
},
"daemonset": {
"properties": {
"enabled": {
"type": "boolean"
}
},
"type": "object",
"additionalProperties": false
},
"deployment": {
"properties": {
"enabled": {
"type": "boolean"
}
},
"type": "object",
"additionalProperties": false
},
"fullnameOverride": {
"type": "string"
},
"hostNetwork": {
"type": "boolean"
},
"hostPID": {
"type": "boolean"
},
"image": {
"properties": {
"pullPolicy": {
"type": "string"
},
"repository": {
"type": "string"
},
"tag": {
"type": "string"
}
},
"type": "object"
},
"imagePullSecrets": {
"type": "array",
"items": {
"type": "object",
"additionalProperties": false,
"properties": {
"name": { "type": "string" }
}
}
},
"livenessProbeTimeoutSeconds": {
"type": "integer"
},
"nameOverride": {
"type": "string"
},
"nodeSelector": {
"properties": {},
"type": "object"
},
"podAnnotations": {
"type": "array",
"items": {
"type": "object",
"properties": {}
}
},
"podSecurityContext": {
"properties": {},
"type": "object"
},
"priorityClassName": {
"type": "string"
},
"readinessProbeTimeoutSeconds": {
"type": "integer"
},
"replicaCount": {
"type": "integer"
},
"resources": {
"properties": {
"limits": {
"properties": {
"cpu": {
"type": "string"
},
"memory": {
"type": "string"
}
},
"type": "object"
},
"requests": {
"properties": {
"cpu": {
"type": "string"
},
"memory": {
"type": "string"
}
},
"type": "object"
}
},
"type": "object"
},
"securityContext": {
"properties": {},
"type": "object"
},
"service": {
"properties": {
"annotations": {
"properties": {},
"type": "object"
},
"nodePort": {
"type": "integer"
},
"port": {
"type": "integer"
},
"portName": {
"type": "string"
},
"targetPort": {
"type": "integer"
},
"type": {
"type": "string"
}
},
"type": "object"
},
"serviceAccount": {
"properties": {
"annotations": {
"properties": {},
"type": "object"
},
"create": {
"type": "boolean"
},
"imagePullSecrets": {
"type": "array",
"items": {
"type": "object",
"properties": {
"name": { "type": "string" }
}
}
},
"name": {
"type": "string"
}
},
"type": "object"
},
"serviceMonitor": {
"properties": {
"additionalLabels": {
"properties": {},
"type": "object"
},
"bearerTokenFile": {
"type": "string"
},
"enabled": {
"type": "boolean"
},
"interval": {
"type": "string"
},
"jobLabel": {
"type": "string"
},
"metricRelabelings": {
"type": "array"
},
"namespace": {
"type": "string"
},
"proxyUrl": {
"type": "string"
},
"relabelings": {
"type": "array"
},
"scheme": {
"type": "string"
},
"scrapeTimeout": {
"type": "string"
},
"selectorOverride": {
"properties": {},
"type": "object"
},
"tlsConfig": {
"properties": {},
"type": "object"
}
},
"type": "object"
},
"tolerations": {
"type": "array",
"items": {
"type": "object",
"properties": {}
}
},
"updateStrategy": {
"type": "string"
}
},
"type": "object"
}
15 changes: 13 additions & 2 deletions charts/docker-hub-rate-limit-exporter-chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ serviceMonitor:
jobLabel: ""

scheme: http
bearerTokenFile:
bearerTokenFile: ""
tlsConfig: {}

## proxyUrl: URL of a proxy that should be used for scraping.
Expand Down Expand Up @@ -73,9 +73,9 @@ service:
type: ClusterIP
port: 9100
targetPort: 9100
nodePort:
portName: metrics
annotations: {}
# nodePort:

livenessProbeTimeoutSeconds: 5

Expand All @@ -96,3 +96,14 @@ tolerations: []
priorityClassName: ""

affinity: {}

podAnnotations: []

# Only relevant for `deployment.enabled: true`
replicaCount: 1

# Only relevant for `daemonset.enabled: true`
updateStrategy: ""

# hostNetwork: false
# hostPID: false