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

feat: slave pod spec #674

Merged
merged 10 commits into from
Nov 27, 2023
Merged

feat: slave pod spec #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2d26730
feat: slave pod spec
vsukhin Nov 17, 2023
f2c8503
feat: add template enum
vsukhin Nov 17, 2023
ebcbe46
feat: slave pod template
vsukhin Nov 20, 2023
fa543fb
fix: pod loop
vsukhin Nov 23, 2023
5822333
fix: rename containers
vsukhin Nov 23, 2023
4349028
fix: remove spaces
vsukhin Nov 23, 2023
783b9d4
Merge branch 'develop' into vsukhin/feature/slave-pod-spec
vsukhin Nov 24, 2023
7389889
fix: rename file
vsukhin Nov 24, 2023
0dbeb55
fix: remove tab
vsukhin Nov 24, 2023
5ed8c97
fix: template indent
vsukhin Nov 24, 2023
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
1 change: 1 addition & 0 deletions charts/testkube-api/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ A Helm chart for Testkube api
| templates.jobContainer | string | `""` | |
| templates.pvcContainer | string | `""` | |
| templates.scraperContainer | string | `""` | |
| templates.slavePod | string | `""` | |
| testConnection.enabled | bool | `false` | |
| testServiceAccount.annotations | object | `{}` | |
| testServiceAccount.create | bool | `true` | |
Expand Down
147 changes: 147 additions & 0 deletions charts/testkube-api/slave-pod-template.yml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
apiVersion: v1
kind: Pod
metadata:
name: "{{ .Name }}"
namespace: {{ .Namespace }}
ownerReferences:
- apiVersion: batch/v1
kind: job
name: {{ .JobName }}
uid: {{ .JobUID }}
spec:
{{- if gt .ActiveDeadlineSeconds 0 }}
activeDeadlineSeconds: {{ .ActiveDeadlineSeconds }}
{{- end }}
initContainers:
- name: init
{{- if .Registry }}
image: {{ .Registry }}/{{ .InitImage }}
{{- else }}
image: {{ .InitImage }}
{{- end }}
imagePullPolicy: IfNotPresent
command:
- "/bin/runner"
- '{{ .Jsn }}'
volumeMounts:
- name: data-volume
mountPath: /data
{{- if .CertificateSecret }}
- name: {{ .CertificateSecret }}
mountPath: /etc/certs
{{- end }}
{{- range $configmap := .EnvConfigMaps }}
{{- if and $configmap.Mount $configmap.Reference }}
- name: {{ $configmap.Reference.Name }}
mountPath: {{ $configmap.MountPath }}
{{- end }}
{{- end }}
{{- range $secret := .EnvSecrets }}
{{- if and $secret.Mount $secret.Reference }}
- name: {{ $secret.Reference.Name }}
mountPath: {{ $secret.MountPath }}
{{- end }}
{{- end }}
containers:
- name: main
{{- if .Registry }}
image: {{ .Registry }}/{{ .Image }}
{{- else }}
image: {{ .Image }}
{{- end }}
imagePullPolicy: IfNotPresent
ports:
{{- range $port := .Ports }}
- name: {{ $port.Name }}
containerPort: {{ $port.ContainerPort }}
{{- end}}
{{- range $port := .Ports }}
{{- if eq $port.Name "server-port" }}
livenessProbe:
tcpSocket:
port: {{ $port.ContainerPort }}
failureThreshold: 3
periodSeconds: 5
successThreshold: 1
timeoutSeconds: 1
readinessProbe:
tcpSocket:
port: {{ $port.ContainerPort }}
failureThreshold: 3
initialDelaySeconds: 10
periodSeconds: 5
timeoutSeconds: 1
{{- end }}
{{- end }}
{{- if .Resources }}
resources:
{{- if .Resources.Limits }}
limits:
{{- if .Resources.Limits.Cpu }}
cpu: {{ .Resources.Limits.Cpu }}
{{- end }}
{{- if .Resources.Limits.Memory }}
memory: {{ .Resources.Limits.Memory }}
{{- end }}
{{- end }}
{{- if .Resources.Requests }}
requests:
{{- if .Resources.Requests.Cpu }}
cpu: {{ .Resources.Requests.Cpu }}
{{- end }}
{{- if .Resources.Requests.Memory }}
memory: {{ .Resources.Requests.Memory }}
{{- end }}
{{- end }}
{{- end }}
volumeMounts:
- name: data-volume
mountPath: /data
{{- if .CertificateSecret }}
- name: {{ .CertificateSecret }}
mountPath: /etc/certs
{{- end }}
{{- range $configmap := .EnvConfigMaps }}
{{- if and $configmap.Mount $configmap.Reference }}
- name: {{ $configmap.Reference.Name }}
mountPath: {{ $configmap.MountPath }}
{{- end }}
{{- end }}
{{- range $secret := .EnvSecrets }}
{{- if and $secret.Mount $secret.Reference }}
- name: {{ $secret.Reference.Name }}
mountPath: {{ $secret.MountPath }}
{{- end }}
{{- end }}
volumes:
- name: data-volume
emptyDir: {}
{{- if .CertificateSecret }}
- name: {{ .CertificateSecret }}
secret:
secretName: {{ .CertificateSecret }}
{{- end }}
{{- range $configmap := .EnvConfigMaps }}
{{- if and $configmap.Mount $configmap.Reference }}
- name: {{ $configmap.Reference.Name }}
configmap:
name: {{ $configmap.Reference.Name }}
{{- end }}
{{- end }}
{{- range $secret := .EnvSecrets }}
{{- if and $secret.Mount $secret.Reference }}
- name: {{ $secret.Reference.Name }}
secret:
secretName: {{ $secret.Reference.Name }}
{{- end }}
{{- end }}
restartPolicy: Always
{{- if .ServiceAccountName }}
serviceAccountName: {{ .ServiceAccountName }}
{{- end }}
{{- if gt (len .ImagePullSecrets) 0 }}
imagePullSecrets:
{{- range $secret := .ImagePullSecrets }}
- name: {{ $secret -}}
{{- end }}
{{- end }}
2 changes: 2 additions & 0 deletions charts/testkube-api/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,5 @@ data:
{{- end }}
slack-template.json: |-
{{ .Files.Get "slack-template.json.tmpl" | indent 4 }}
slave-pod-template.yml: |-
{{ .Files.Get "slave-pod-template.yml.tmpl" | indent 4 }}
4 changes: 4 additions & 0 deletions charts/testkube-api/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,10 @@ spec:
- name: TESTKUBE_CONTAINER_TEMPLATE_PVC
value: "{{ .Values.templates.pvcContainer }}"
{{- end }}
{{- if .Values.templates.slavePod }}
- name: TESTKUBE_TEMPLATE_SLAVE_POD
value: "{{ .Values.templates.slavePod }}"
{{- end }}
- name: TESTKUBE_NAMESPACE
value: "{{ .Release.Namespace }}"
- name: JOB_SERVICE_ACCOUNT_NAME
Expand Down
2 changes: 2 additions & 0 deletions charts/testkube-api/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ templates:
scraperContainer: ""
## Base64 encoded PVC Container template
pvcContainer: ""
## Base64 encoded Slave Pod template
slavePod: ""

## base64 encoded executors.json alike data
executors: ""
Expand Down
1 change: 1 addition & 0 deletions charts/testkube-operator/templates/tests.testkube.io_templates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ spec:
- scraper
- pvc
- webhook
- pod
type: string
required:
- body
Expand Down
68 changes: 68 additions & 0 deletions charts/testkube-operator/templates/tests.testkube.io_testexecutions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,40 @@ spec:
description: 'Execution variables passed to executor from secrets.
Deprecated: use Secret Variables instead'
type: object
slavePodRequest:
description: pod request body
properties:
podTemplate:
description: pod template extensions
type: string
podTemplateReference:
description: name of the template resource
type: string
resources:
description: pod resources request specification
properties:
limits:
description: resource request specification
properties:
cpu:
description: requested cpu units
type: string
memory:
description: requested memory units
type: string
type: object
requests:
description: resource request specification
properties:
cpu:
description: requested cpu units
type: string
memory:
description: requested memory units
type: string
type: object
type: object
type: object
sync:
description: whether to start execution sync or async
type: boolean
Expand Down Expand Up @@ -630,6 +664,40 @@ spec:
required:
- type
type: object
slavePodRequest:
description: pod request body
properties:
podTemplate:
description: pod template extensions
type: string
podTemplateReference:
description: name of the template resource
type: string
resources:
description: pod resources request specification
properties:
limits:
description: resource request specification
properties:
cpu:
description: requested cpu units
type: string
memory:
description: requested memory units
type: string
type: object
requests:
description: resource request specification
properties:
cpu:
description: requested cpu units
type: string
memory:
description: requested memory units
type: string
type: object
type: object
type: object
startTime:
description: test start time
format: date-time
Expand Down
34 changes: 34 additions & 0 deletions charts/testkube-operator/templates/tests.testkube.io_tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,6 +625,40 @@ spec:
description: 'Execution variables passed to executor from secrets.
Deprecated: use Secret Variables instead'
type: object
slavePodRequest:
description: pod request body
properties:
podTemplate:
description: pod template extensions
type: string
podTemplateReference:
description: name of the template resource
type: string
resources:
description: pod resources request specification
properties:
limits:
description: resource request specification
properties:
cpu:
description: requested cpu units
type: string
memory:
description: requested memory units
type: string
type: object
requests:
description: resource request specification
properties:
cpu:
description: requested cpu units
type: string
memory:
description: requested memory units
type: string
type: object
type: object
type: object
sync:
description: whether to start execution sync or async
type: boolean
Expand Down
68 changes: 68 additions & 0 deletions charts/testkube-operator/templates/tests.testkube.io_testsuiteexecutions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,40 @@ spec:
required:
- type
type: object
slavePodRequest:
description: pod request body
properties:
podTemplate:
description: pod template extensions
type: string
podTemplateReference:
description: name of the template resource
type: string
resources:
description: pod resources request specification
properties:
limits:
description: resource request specification
properties:
cpu:
description: requested cpu units
type: string
memory:
description: requested memory units
type: string
type: object
requests:
description: resource request specification
properties:
cpu:
description: requested cpu units
type: string
memory:
description: requested memory units
type: string
type: object
type: object
type: object
startTime:
description: test start time
format: date-time
Expand Down Expand Up @@ -1055,6 +1089,40 @@ spec:
required:
- type
type: object
slavePodRequest:
description: pod request body
properties:
podTemplate:
description: pod template extensions
type: string
podTemplateReference:
description: name of the template resource
type: string
resources:
description: pod resources request specification
properties:
limits:
description: resource request specification
properties:
cpu:
description: requested cpu units
type: string
memory:
description: requested memory units
type: string
type: object
requests:
description: resource request specification
properties:
cpu:
description: requested cpu units
type: string
memory:
description: requested memory units
type: string
type: object
type: object
type: object
startTime:
description: test start time
format: date-time
Expand Down