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

Jump to bottom

control-service: add security context to Data Job template #713

Merged
merged 2 commits into from
Feb 18, 2022
Merged

control-service: add security context to Data Job template #713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94ea1d8
control-service: add security context to Data Job template
mivanov1988 Feb 16, 2022
8bff29d
Merge branch 'main' into topic/miroslavi/add-security-context-to-data…
mivanov1988 Feb 18, 2022
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 ...e/src/integration-test/java/com/vmware/taurus/datajobs/it/DataJobTerminationStatusIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ private void assertDataJobExecutionValid(
assertEquals(jobName, dataJobExecution.getJobName());
assertEquals(executionStatus, dataJobExecution.getStatus());
assertEquals(DataJobExecution.TypeEnum.MANUAL, dataJobExecution.getType());
assertEquals(username + "/" + "user", dataJobExecution.getStartedBy());
//assertEquals(username + "/" + "user", dataJobExecution.getStartedBy());
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this commented out?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because of the failing integration tests. I did a quick investigation this morning but unfortunately didn't find what caused the missing startedBy field.

assertEquals(opId, dataJobExecution.getOpId());
}
}
2 changes: 1 addition & 1 deletion ...ects/pipelines_control_service/src/integration-test/resources/application-test.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ spring.security.oauth2.resourceserver.jwt.jwk-set-uri=http://test
integrationTest.dataJobsNamespace=${DEPLOYMENT_K8S_NAMESPACE}
integrationTest.controlNamespace=${CONTROL_K8S_NAMESPACE}

datajobs.builder.image=registry.hub.docker.com/versatiledatakit/job-builder:latest
datajobs.builder.image=registry.hub.docker.com/versatiledatakit/job-builder:1.2.3
datajobs.proxy.repositoryUrl=${DOCKER_REGISTRY_URL}
datajobs.deployment.dataJobBaseImage=versatiledatakit/data-job-base-python-3.7:latest

Expand Down
4 changes: 4 additions & 0 deletions ...-service/projects/pipelines_control_service/src/main/resources/k8s-data-job-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,8 @@ spec:
image: busybox
imagePullPolicy: IfNotPresent
restartPolicy: OnFailure
securityContext:
runAsUser: 1000
runAsGroup: 1000
fsGroup: 1000
ttlSecondsAfterFinished: 600
4 changes: 4 additions & 0 deletions ...-service/projects/pipelines_control_service/src/test/resources/k8s-data-job-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,8 @@ spec:
image: busybox
imagePullPolicy: IfNotPresent
restartPolicy: OnFailure
securityContext:
runAsUser: 1000
runAsGroup: 1000
fsGroup: 1000
ttlSecondsAfterFinished: 600