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

Fixing values.yaml docs for schema generation, corrected values.schema.json #474

Merged
merged 2 commits into from
Oct 31, 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
8 changes: 7 additions & 1 deletion charts/k6-operator/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,13 @@ spec:
{{- if .Values.manager.env }}
env:
{{- with .Values.manager.env }}
{{- toYaml . | nindent 10 }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- end }}
{{- if .Values.manager.envFrom }}
envFrom:
{{- with .Values.manager.envFrom }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- end }}
{{- if .Values.manager.containerSecurityContext }}
Expand Down
127 changes: 42 additions & 85 deletions charts/k6-operator/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"additionalProperties": false,
"properties": {
"affinity": {
"additionalProperties": false,
"additionalProperties": true,
"description": "affinity -- Affinity to be applied on all containers",
"title": "affinity",
"type": "object"
Expand All @@ -11,7 +11,7 @@
"additionalProperties": false,
"properties": {
"containerSecurityContext": {
"additionalProperties": false,
"additionalProperties": true,
"description": "authProxy.containerSecurityContext -- A security context defines privileges and access control settings for the container.",
"title": "containerSecurityContext",
"type": "object"
Expand Down Expand Up @@ -51,48 +51,38 @@
}
},
"title": "image",
"type": "object",
"required": [
"registry",
"repository",
"tag",
"pullPolicy"
]
"type": "object"
},
"livenessProbe": {
"additionalProperties": false,
"additionalProperties": true,
"description": "authProxy.livenessProbe -- Liveness probe in Probe format",
"title": "livenessProbe",
"type": "object"
},
"readinessProbe": {
"additionalProperties": false,
"additionalProperties": true,
"description": "authProxy.readinessProbe -- Readiness probe in Probe format",
"title": "readinessProbe",
"type": "object"
},
"resources": {
"additionalProperties": false,
"additionalProperties": true,
"description": "authProxy.resources -- rbac-proxy resource limitation/request",
"title": "resources",
"type": "object"
}
},
"title": "authProxy",
"type": "object",
"required": [
"enabled",
"image"
]
"type": "object"
},
"customAnnotations": {
"additionalProperties": false,
"additionalProperties": true,
"description": "customAnnotations -- Custom Annotations to be applied on all resources",
"title": "customAnnotations",
"type": "object"
},
"customLabels": {
"additionalProperties": false,
"additionalProperties": true,
"description": "customLabels -- Custom Label to be applied on all resources",
"title": "customLabels",
"type": "object"
Expand All @@ -116,15 +106,13 @@
"type": "string"
}
},
"description": "global.image -- Global image configuration",
"title": "image",
"type": "object"
}
},
"title": "global",
"type": "object",
"required": [
"image"
]
"type": "object"
},
"installCRDs": {
"default": true,
Expand All @@ -136,16 +124,22 @@
"additionalProperties": false,
"properties": {
"containerSecurityContext": {
"additionalProperties": false,
"additionalProperties": true,
"description": "manager.containerSecurityContext -- A security context defines privileges and access control settings for the container.",
"title": "containerSecurityContext",
"type": "object"
},
"env": {
"additionalProperties": false,
"description": "manager.env -- Environment variables to be applied on the controller",
"items": {},
"description": "manager.env -- List of environment variables to set in the controller",
"title": "env",
"type": "object"
"type": "array"
},
"envFrom": {
"items": {},
"description": "manager.envFrom -- List of sources to populate environment variables in the controller",
"title": "envFrom",
"type": "array"
},
"image": {
"additionalProperties": false,
Expand All @@ -169,29 +163,24 @@
"type": "string"
},
"tag": {
"default": "controller-v0.0.15",
"default": "controller-v0.0.17",
"description": "manager.image.tag -- controller-manager image tag",
"title": "tag",
"type": "string"
}
},
"description": "manager.image -- controller-manager image configuration",
"title": "image",
"type": "object",
"required": [
"registry",
"repository",
"tag",
"pullPolicy"
]
"type": "object"
},
"livenessProbe": {
"additionalProperties": false,
"additionalProperties": true,
"description": "manager.livenessProbe -- Liveness probe in Probe format",
"title": "livenessProbe",
"type": "object"
},
"readinessProbe": {
"additionalProperties": false,
"additionalProperties": true,
"description": "manager.readinessProbe -- Readiness probe in Probe format",
"title": "readinessProbe",
"type": "object"
Expand Down Expand Up @@ -221,12 +210,9 @@
"type": "string"
}
},
"description": "manager.resources.limits -- controller-manager Resources limits",
"title": "limits",
"type": "object",
"required": [
"cpu",
"memory"
]
"type": "object"
},
"requests": {
"additionalProperties": false,
Expand All @@ -244,21 +230,14 @@
"type": "string"
}
},
"description": "manager.resources.requests -- controller-manager Resources requests",
"title": "requests",
"type": "object",
"required": [
"cpu",
"memory"
]
"type": "object"
}
},
"description": "manager.resources -- controller-manager Resources definition",
"title": "resources",
"type": "object",
"required": [
"limits",
"requests"
]
"type": "object"
},
"serviceAccount": {
"additionalProperties": false,
Expand All @@ -277,21 +256,12 @@
}
},
"title": "serviceAccount",
"type": "object",
"required": [
"name",
"create"
]
"type": "object"
}
},
"description": "manager -- controller-manager configuration",
"title": "manager",
"type": "object",
"required": [
"replicas",
"serviceAccount",
"image",
"resources"
]
"type": "object"
},
"namespace": {
"additionalProperties": false,
Expand All @@ -303,26 +273,24 @@
"type": "boolean"
}
},
"description": "namespace -- Namespace creation",
"title": "namespace",
"type": "object",
"required": [
"create"
]
"type": "object"
},
"nodeSelector": {
"additionalProperties": false,
"additionalProperties": true,
"description": "nodeSelector -- Node Selector to be applied on all containers",
"title": "nodeSelector",
"type": "object"
},
"podAnnotations": {
"additionalProperties": false,
"additionalProperties": true,
"description": "podAnnotations -- Custom Annotations to be applied on all pods",
"title": "podAnnotations",
"type": "object"
},
"podLabels": {
"additionalProperties": false,
"additionalProperties": true,
"description": "podLabels -- Custom Label to be applied on all pods",
"title": "podLabels",
"type": "object"
Expand All @@ -338,26 +306,15 @@
}
},
"title": "prometheus",
"type": "object",
"required": [
"enabled"
]
"type": "object"
},
"tolerations": {
"additionalProperties": false,
"additionalProperties": true,
"description": "tolerations -- Tolerations to be applied on all containers",
"title": "tolerations",
"type": "object"
}
},
"$schema": "http://json-schema.org/draft-07/schema#",
"type": "object",
"required": [
"global",
"installCRDs",
"namespace",
"prometheus",
"authProxy",
"manager"
]
"type": "object"
}
Loading
Loading