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.

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

fix: missing podAnnotations #2138

Merged
merged 2 commits into from
Sep 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion chart/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ README.md: .bin/helm-docs
.phony: values.schema.deref.json
values.schema.deref.json: values.schema.json
npm i @apidevtools/json-schema-ref-parser
npx @digitak/esrun deref.ts
npx @digitak/esrun deref.ts | jq > values.schema.deref.json


.PHONY: lint
Expand Down
8 changes: 8 additions & 0 deletions chart/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ Kubernetes native, multi-tenant synthetic monitoring system
| global.imageRegistry | string | `"docker.io"` | |
| global.labels | object | `{}` | |
| global.nodeSelector | object | `{}` | node's labels for the pod to be scheduled on that node. See [Node Selector](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/) |
| global.podAnnotations | object | `{}` | |
| global.tolerations | list | `[]` | |
| grafanaDashboards | bool | `false` | |
| image.name | string | `"{{.Values.global.imagePrefix}}/canary-checker"` | |
Expand All @@ -63,15 +64,22 @@ Kubernetes native, multi-tenant synthetic monitoring system
| ingress.host | string | `"canary-checker"` | |
| ingress.tls | list | `[]` | |
| jsonLogs | bool | `true` | |
| livenessProbe.httpGet.path | string | `"/health"` | |
| livenessProbe.httpGet.port | int | `8080` | |
| logLevel | string | `""` | |
| nameOverride | string | `""` | |
| nodeSelector | object | `{}` | node's labels for the pod to be scheduled on that node. See [Node Selector](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/) |
| otel.collector | string | `""` | OpenTelemetry gRPC collector endpoint in host:port format |
| otel.labels | string | `""` | labels in "a=b,c=d" format @schema required: false @schema |
| otel.serviceName | string | `"canary-checker"` | |
| pingMode | string | `"unprivileged"` | set the mechanism for pings - either privileged, unprivileged or none |
| podAnnotations | object | `{}` | |
| prometheusURL | string | `""` | Default Prometheus URL to use in prometheus checks |
| properties | object | `{}` | A map of properties to update on startup |
| readinessProbe.failureThreshold | int | `6` | |
| readinessProbe.httpGet.path | string | `"/health"` | |
| readinessProbe.httpGet.port | int | `8080` | |
| readinessProbe.timeoutSeconds | int | `30` | |
| replicas | int | `1` | |
| resources.limits.memory | string | `"2Gi"` | |
| resources.requests.cpu | string | `"200m"` | |
Expand Down
7 changes: 7 additions & 0 deletions chart/ci/full-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

global:
imageRegistry: private-repo
podAnnotations:
b: "c"

image:
name: "{{.Values.global.imagePrefix}}/canary-checker"
Expand Down Expand Up @@ -92,6 +94,11 @@ volumeMounts:
- name: test
mountPath: /test

podAnnotations:
b: "c-override"
d: "e"


nodeSelector:
sample: a

Expand Down
6,113 changes: 6,112 additions & 1 deletion chart/values.schema.deref.json

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions chart/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,10 @@
"title": "nodeSelector",
"type": "object"
},
"podAnnotations": {
"additionalProperties": true,
"title": "podAnnotations"
},
"tolerations": {
"items": {
"$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.Toleration"
Expand Down Expand Up @@ -305,6 +309,9 @@
"default": "true",
"title": "jsonLogs"
},
"livenessProbe": {
"$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.Probe"
},
"logLevel": {
"default": "",
"title": "logLevel"
Expand Down Expand Up @@ -355,6 +362,10 @@
"none"
]
},
"podAnnotations": {
"additionalProperties": true,
"title": "podAnnotations"
},
"prometheusURL": {
"default": "",
"description": "Default Prometheus URL to use in prometheus checks",
Expand All @@ -365,6 +376,9 @@
"description": "A map of properties to update on startup",
"title": "properties"
},
"readinessProbe": {
"$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.Probe"
},
"replicas": {
"default": 1,
"title": "replicas"
Expand Down
32 changes: 32 additions & 0 deletions chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ global:
name: mission-control-connection-pooler
key: DB_URL

# @schema
# additionalProperties: true
# required: false
# @schema
podAnnotations: {}

# @schema
# required: false
# additionalProperties: true
Expand Down Expand Up @@ -444,6 +450,12 @@ extraArgs:
# @schema
extra: {}

# @schema
# additionalProperties: true
# required: false
# @schema
podAnnotations: {}

# @schema
# required: false
# type: array
Expand Down Expand Up @@ -481,3 +493,23 @@ tolerations: []
# $ref: https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.Affinity
# @schema
affinity: {}

# @schema
# required: false
# $ref: https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.Probe
# @schema
livenessProbe:
httpGet:
path: /health
port: 8080

# @schema
# required: false
# $ref: https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.30.0/_definitions.json#/definitions/io.k8s.api.core.v1.Probe
# @schema
readinessProbe:
failureThreshold: 6
timeoutSeconds: 30
httpGet:
path: /health
port: 8080
Loading