Skip to content

Admission Control: validate path #11

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

Merged
merged 4 commits into from
Feb 9, 2024
Merged

Admission Control: validate path #11

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3b8e6b2
Admission Control: validate path
dgrove-oss Feb 8, 2024
bdb021f
minor cleanups
dgrove-oss Feb 9, 2024
7e6551e
review comment: fix spelling error in comments
dgrove-oss Feb 9, 2024
4c0f3f6
tweak PodTemplateSpec construction to be less terse
dgrove-oss Feb 9, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
tweak PodTemplateSpec construction to be less terse
  • Loading branch information
@dgrove-oss
dgrove-oss committed Feb 9, 2024
commit 4c0f3f65a259faca8431ad66913564bb486eefd7
11 changes: 6 additions & 5 deletions internal/controller/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,19 @@ func getPodTemplateSpec(raw []byte, path string) (*v1.PodTemplateSpec, error) {
}
}

// Extract the PodSpec that should be at spec
// Extract the PodSpec that should be at candidatePTS.spec
candidatePTS := p
spec, ok := candidatePTS["spec"].(map[string]interface{})
if !ok {
return nil, fmt.Errorf("content at %v does not contain a spec", path)
}
var template v1.PodTemplateSpec
if err := runtime.DefaultUnstructuredConverter.FromUnstructuredWithValidation(spec, &template.Spec, true); err != nil {
podSpec := &v1.PodSpec{}
if err := runtime.DefaultUnstructuredConverter.FromUnstructuredWithValidation(spec, podSpec, true); err != nil {
return nil, fmt.Errorf("content at %v.spec not parseable as a v1.PodSpec: %w", path, err)
}

// Add in the annotations and labels (if any)
// Construct the filtered PodTemplateSpec, copying only the metadata expected by Kueue
template := &v1.PodTemplateSpec{Spec: *podSpec}
if metadata, ok := candidatePTS["metadata"].(map[string]interface{}); ok {
if labels, ok := metadata["labels"].(map[string]string); ok {
template.ObjectMeta.Labels = labels
Expand All @@ -64,5 +65,5 @@ func getPodTemplateSpec(raw []byte, path string) (*v1.PodTemplateSpec, error) {
}
}

return &template, nil
return template, nil
}