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

Delete controllers package #270

Merged
merged 14 commits into from
Apr 27, 2020
Merged

Delete controllers package #270

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ad4a68a
rename root fs check
rbren Mar 30, 2020
1a3b864
speed up docker build
rbren Mar 30, 2020
0f38d84
refactor webhook to be more generic
rbren Mar 30, 2020
1eec31d
delete controllers pkg
rbren Mar 30, 2020
727ef41
revert deploy
rbren Mar 30, 2020
2dd26a9
fix example config
rbren Mar 30, 2020
cd9c519
remove controllersToScan config
rbren Mar 30, 2020
073d3fa
fix lint error
rbren Mar 30, 2020
1c4048e
fix webhook name
rbren Mar 30, 2020
c03ce93
FileSystem -> Filesystem
rbren Apr 10, 2020
71be455
update deps
rbren Apr 24, 2020
d9ca8c9
skip node owners
rbren Apr 24, 2020
15de959
clean up meta tracking
rbren Apr 27, 2020
c203cb6
Merge branch 'master' into rb/refactor
rbren Apr 27, 2020
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
Prev Previous commit
Next Next commit
fix lint error
  • Loading branch information
@rbren
rbren committed Apr 24, 2020
commit 073d3fa580daea4d94688efa094c68642a6d9a54
6 changes: 4 additions & 2 deletions pkg/kube/resources.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ type k8sResource struct {
Kind string `yaml:"kind"`
}

var podSpecFields = []string{"jobTemplate", "spec", "template"}

// CreateResourceProvider returns a new ResourceProvider object to interact with k8s resources
func CreateResourceProvider(directory string) (*ResourceProvider, error) {
if directory != "" {
Expand Down Expand Up @@ -180,9 +182,9 @@ func deduplicateControllers(inputControllers []GenericWorkload) []GenericWorkloa
return results
}

// GetPodSpec looks inside arbitrary YAML for a PodSpec
func GetPodSpec(yaml map[string]interface{}) interface{} {
allowedChildren := []string{"jobTemplate", "spec", "template"}
for _, child := range allowedChildren {
for _, child := range podSpecFields {
if childYaml, ok := yaml[child]; ok {
return GetPodSpec(childYaml.(map[string]interface{}))
}
Expand Down